From 5adec3b1d3915a96266f1f820a359af33b0e14df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Tue, 24 Feb 2026 14:22:16 -0300
Subject: [PATCH 1/2] monolith: cleanup host-specific modules

---
 flake.nix                                     |  3 --
 hosts/monolith/default.nix                    |  2 ++
 .../monolith}/monolith-forgejo-runner.nix     |  0
 .../monolith}/monolith-gitlab-runner.nix      | 29 +++++++------------
 system/nix-serve.nix                          | 14 ---------
 5 files changed, 12 insertions(+), 36 deletions(-)
 rename {system => hosts/monolith}/monolith-forgejo-runner.nix (100%)
 rename {system => hosts/monolith}/monolith-gitlab-runner.nix (65%)
 delete mode 100644 system/nix-serve.nix

diff --git a/flake.nix b/flake.nix
index 8569f0e..beb7cdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,9 +125,6 @@
           inherit specialArgs;
           modules = common_modules ++ [
             ./hosts/monolith
-            ./system/monolith-gitlab-runner.nix
-            ./system/monolith-forgejo-runner.nix
-            ./system/nix-serve.nix
           ];
         };
         double-rainbow = lib.nixosSystem {
diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix
index 0ce3b79..da69746 100644
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -27,6 +27,8 @@ in
     ./factorio-server.nix
     ./nebula-vpn.nix
     ./minio.nix
+    ./monolith-forgejo-runner.nix
+    ./monolith-gitlab-runner.nix
   ];
   boot.initrd.availableKernelModules = [
     "nvme"
diff --git a/system/monolith-forgejo-runner.nix b/hosts/monolith/monolith-forgejo-runner.nix
similarity index 100%
rename from system/monolith-forgejo-runner.nix
rename to hosts/monolith/monolith-forgejo-runner.nix
diff --git a/system/monolith-gitlab-runner.nix b/hosts/monolith/monolith-gitlab-runner.nix
similarity index 65%
rename from system/monolith-gitlab-runner.nix
rename to hosts/monolith/monolith-gitlab-runner.nix
index e70fd8c..b8eb3df 100644
--- a/system/monolith-gitlab-runner.nix
+++ b/hosts/monolith/monolith-gitlab-runner.nix
@@ -5,7 +5,10 @@
   ...
 }:
 let
-  inherit (pkgs.callPackage ./gitlab-runner.nix { inherit inputs; }) mkNixRunner mkNixRunnerFull;
+  inherit (pkgs.callPackage ../../system/gitlab-runner.nix { inherit inputs; })
+    mkNixRunner
+    mkNixRunnerFull
+    ;
 in
 {
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
@@ -38,23 +41,11 @@ in
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;
 
   sops.secrets = {
-    "gitlab-runners/thoreb-telemetria-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/thoreb-itinerario-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/docker-images-token" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-gitlab-nix" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pk" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
-    "gitlab-runners/wopus-ssh-nix-cache-pub" = {
-      sopsFile = ../secrets/monolith/default.yaml;
-    };
+    "gitlab-runners/thoreb-telemetria-nix" = { };
+    "gitlab-runners/thoreb-itinerario-nix" = { };
+    "gitlab-runners/docker-images-token" = { };
+    "gitlab-runners/wopus-gitlab-nix" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pk" = { };
+    "gitlab-runners/wopus-ssh-nix-cache-pub" = { };
   };
 }
diff --git a/system/nix-serve.nix b/system/nix-serve.nix
deleted file mode 100644
index 9bf9814..0000000
--- a/system/nix-serve.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  services.nix-serve = {
-    enable = true;
-    secretKeyFile = config.sops.secrets."nix-serve/private-key".path;
-  };
-
-  sops.secrets."nix-serve/private-key" = { };
-}

From 5bee0c6f2ba87efeaa16bd2fe2d66d173b9a69d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Tue, 24 Feb 2026 21:30:55 -0300
Subject: [PATCH 2/2] system: cleanup deprecated xserver displaManager configs

---
 system/gnome.nix | 20 +++++++++-----------
 system/kde.nix   |  4 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/system/gnome.nix b/system/gnome.nix
index 6b82916..e662581 100644
--- a/system/gnome.nix
+++ b/system/gnome.nix
@@ -8,18 +8,16 @@
   options.my.gnome.enable = lib.mkEnableOption { };
 
   config = lib.mkIf config.my.gnome.enable {
-    services.xserver = {
+    services.xserver.enable = true;
+    services.displayManager.gdm.enable = true;
+    services.desktopManager.gnome = {
       enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome = {
-        enable = true;
-        # Enable VRR (Variable Refresh Rate)
-        extraGSettingsOverridePackages = with pkgs; [ mutter ];
-        extraGSettingsOverrides = ''
-          [org.gnome.mutter]
-          experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-        '';
-      };
+      # Enable VRR (Variable Refresh Rate)
+      extraGSettingsOverridePackages = with pkgs; [ mutter ];
+      extraGSettingsOverrides = ''
+        [org.gnome.mutter]
+        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
+      '';
     };
 
     # Workaround for https://github.com/NixOS/nixpkgs/issues/103746
diff --git a/system/kde.nix b/system/kde.nix
index 27533ec..4dea6ec 100644
--- a/system/kde.nix
+++ b/system/kde.nix
@@ -11,8 +11,8 @@
     # Enable the X11 windowing system.
     services.xserver.enable = true;
     # Enable the KDE Desktop Environment.
-    services.xserver.displayManager.sddm.enable = true;
-    services.xserver.desktopManager.plasma5.enable = true;
+    services.displayManager.sddm.enable = true;
+    services.desktopManager.plasma6.enable = true;
     # services.xserver.displayManager.autologin.user = "lelgenio";
     programs.dconf.enable = true;
   };