diff --git a/flake.nix b/flake.nix
index beb7cdb..8569f0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -125,6 +125,9 @@
           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 da69746..0ce3b79 100644
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -27,8 +27,6 @@ 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/gnome.nix b/system/gnome.nix
index e662581..6b82916 100644
--- a/system/gnome.nix
+++ b/system/gnome.nix
@@ -8,16 +8,18 @@
   options.my.gnome.enable = lib.mkEnableOption { };
 
   config = lib.mkIf config.my.gnome.enable {
-    services.xserver.enable = true;
-    services.displayManager.gdm.enable = true;
-    services.desktopManager.gnome = {
+    services.xserver = {
       enable = true;
-      # Enable VRR (Variable Refresh Rate)
-      extraGSettingsOverridePackages = with pkgs; [ mutter ];
-      extraGSettingsOverrides = ''
-        [org.gnome.mutter]
-        experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
-      '';
+      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']
+        '';
+      };
     };
 
     # Workaround for https://github.com/NixOS/nixpkgs/issues/103746
diff --git a/system/kde.nix b/system/kde.nix
index 4dea6ec..27533ec 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.displayManager.sddm.enable = true;
-    services.desktopManager.plasma6.enable = true;
+    services.xserver.displayManager.sddm.enable = true;
+    services.xserver.desktopManager.plasma5.enable = true;
     # services.xserver.displayManager.autologin.user = "lelgenio";
     programs.dconf.enable = true;
   };
diff --git a/hosts/monolith/monolith-forgejo-runner.nix b/system/monolith-forgejo-runner.nix
similarity index 100%
rename from hosts/monolith/monolith-forgejo-runner.nix
rename to system/monolith-forgejo-runner.nix
diff --git a/hosts/monolith/monolith-gitlab-runner.nix b/system/monolith-gitlab-runner.nix
similarity index 65%
rename from hosts/monolith/monolith-gitlab-runner.nix
rename to system/monolith-gitlab-runner.nix
index b8eb3df..e70fd8c 100644
--- a/hosts/monolith/monolith-gitlab-runner.nix
+++ b/system/monolith-gitlab-runner.nix
@@ -5,10 +5,7 @@
   ...
 }:
 let
-  inherit (pkgs.callPackage ../../system/gitlab-runner.nix { inherit inputs; })
-    mkNixRunner
-    mkNixRunnerFull
-    ;
+  inherit (pkgs.callPackage ./gitlab-runner.nix { inherit inputs; }) mkNixRunner mkNixRunnerFull;
 in
 {
   boot.kernel.sysctl."net.ipv4.ip_forward" = true;
@@ -41,11 +38,23 @@ in
   systemd.services.gitlab-runner.serviceConfig.Nice = 10;
 
   sops.secrets = {
-    "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" = { };
+    "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;
+    };
   };
 }
diff --git a/system/nix-serve.nix b/system/nix-serve.nix
new file mode 100644
index 0000000..9bf9814
--- /dev/null
+++ b/system/nix-serve.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  services.nix-serve = {
+    enable = true;
+    secretKeyFile = config.sops.secrets."nix-serve/private-key".path;
+  };
+
+  sops.secrets."nix-serve/private-key" = { };
+}
diff --git a/user/variables.nix b/user/variables.nix
index b0decc2..65bc69a 100644
--- a/user/variables.nix
+++ b/user/variables.nix
@@ -115,7 +115,7 @@ rec {
   };
 
   dmenu = "bmenu";
-  desktop = "gnome";
+  desktop = "sway";
   browser = "firefox-devedition";
   editor = "kakoune";
 }