diff --git a/home-manager/modules/misc/gaming.nix b/home-manager/modules/misc/gaming.nix
index 0dbedaa..b588c59 100755
--- a/home-manager/modules/misc/gaming.nix
+++ b/home-manager/modules/misc/gaming.nix
@@ -2,7 +2,6 @@
   home.packages = builtins.attrValues {
     inherit
       (pkgs)
-      lutris
       prismlauncher
       ;
   };
diff --git a/home-manager/modules/steam/default.nix b/home-manager/modules/steam/default.nix
old mode 100644
new mode 100755
diff --git a/nixos/default.nix b/nixos/default.nix
index 6000dcf..879c422 100755
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -24,8 +24,11 @@ let
   plasma = import ./modules/plasma.nix;
   printing = import ./modules/printing.nix;
   regreet = import ./modules/regreet.nix;
+  sddm = import ./modules/sddm.nix;
+  ssh = import ./modules/ssh.nix;
   steam = import ./modules/steam.nix;
   syncthing = import ./modules/syncthing.nix;
+  sops = import ./modules/sops.nix;
   sysstat = import ./modules/sysstat.nix;
   system = import ./modules/system.nix;
   virtualization = import ./modules/virtualization.nix;
@@ -53,10 +56,13 @@ in {
         network
         nix
         ollama
+        ssh
         plasma
         printing
         regreet
+        sddm
         services
+        sops
         steam
         syncthing
         sysstat
@@ -76,6 +82,8 @@ in {
           fonts
           plasma
           printing
+          regreet
+          sddm
           steam
           sysstat
           virtualization
@@ -101,7 +109,9 @@ in {
           home-manager
           locale
           nix
+          ssh
           system
+          sops
           xserver
         ];
       };
diff --git a/nixos/modules/plasma.nix b/nixos/modules/plasma.nix
index 2fe307b..cb04e82 100755
--- a/nixos/modules/plasma.nix
+++ b/nixos/modules/plasma.nix
@@ -1,12 +1,6 @@
 {pkgs, ...}: {
   services = {
     desktopManager.plasma6.enable = true;
-    displayManager = {
-      sddm = {
-        enable = true;
-        wayland.enable = true;
-      };
-    };
   };
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
     plasma-browser-integration
diff --git a/nixos/modules/sddm.nix b/nixos/modules/sddm.nix
new file mode 100755
index 0000000..31fd7d8
--- /dev/null
+++ b/nixos/modules/sddm.nix
@@ -0,0 +1,10 @@
+{
+  services = {
+    displayManager = {
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+      };
+    };
+  };
+}
diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix
new file mode 100755
index 0000000..bef5945
--- /dev/null
+++ b/nixos/modules/sops.nix
@@ -0,0 +1,26 @@
+{flake, ...}: let
+  inherit (flake.config.people) user0;
+in {
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    validateSopsFiles = false;
+    age = {
+      keyFile = "/var/lib/sops-nix/key.txt";
+      generateKey = false;
+    };
+    secrets = {
+      "ssh/private" = {
+        path = "/home/${user0}/.ssh/id_ed25519";
+        owner = user0;
+      };
+      "ssh/public" = {
+        path = "/home/${user0}/.ssh/id_ed25519.pub";
+        owner = user0;
+      };
+      "ssh/hosts" = {
+        path = "/home/${user0}/.ssh/known_hosts";
+        owner = user0;
+      };
+    };
+  };
+}
diff --git a/systems/desktop/ssh.nix b/nixos/modules/ssh.nix
similarity index 100%
rename from systems/desktop/ssh.nix
rename to nixos/modules/ssh.nix
diff --git a/systems/desktop/default.nix b/systems/desktop/default.nix
index 1a2e251..e457f72 100755
--- a/systems/desktop/default.nix
+++ b/systems/desktop/default.nix
@@ -6,7 +6,6 @@
     ./hardware.nix
     ./networking.nix
     ./sops.nix
-    ./ssh.nix
   ];
   nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
   system.stateVersion = lib.mkForce "24.05";
diff --git a/systems/desktop/sops.nix b/systems/desktop/sops.nix
index 87ad35b..b270d19 100755
--- a/systems/desktop/sops.nix
+++ b/systems/desktop/sops.nix
@@ -3,25 +3,7 @@
   inherit (flake.config.people.user.${user0}) git;
 in {
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    validateSopsFiles = false;
-    age = {
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = false;
-    };
     secrets = {
-      "ssh/private" = {
-        path = "/home/${user0}/.ssh/id_ed25519";
-        owner = user0;
-      };
-      "ssh/public" = {
-        path = "/home/${user0}/.ssh/id_ed25519.pub";
-        owner = user0;
-      };
-      "ssh/hosts" = {
-        path = "/home/${user0}/.ssh/known_hosts";
-        owner = user0;
-      };
       "network/synology" = {
         path = "/var/lib/secrets/synology";
         owner = "root";
diff --git a/systems/fallaryn/default.nix b/systems/fallaryn/default.nix
index 1a2e251..e457f72 100755
--- a/systems/fallaryn/default.nix
+++ b/systems/fallaryn/default.nix
@@ -6,7 +6,6 @@
     ./hardware.nix
     ./networking.nix
     ./sops.nix
-    ./ssh.nix
   ];
   nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
   system.stateVersion = lib.mkForce "24.05";
diff --git a/systems/fallaryn/sops.nix b/systems/fallaryn/sops.nix
index 01f8137..e234e30 100755
--- a/systems/fallaryn/sops.nix
+++ b/systems/fallaryn/sops.nix
@@ -1,25 +1,6 @@
-{flake, ...}: let
-  inherit
-    (flake.config.people)
-    user2
-    ;
-in {
+{
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    validateSopsFiles = false;
-    age = {
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = false;
-    };
     secrets = {
-      "ssh/private" = {
-        path = "/home/${user2}/.ssh/id_ed25519";
-        owner = user2;
-      };
-      "ssh/public" = {
-        path = "/home/${user2}/.ssh/id_ed25519.pub";
-        owner = user2;
-      };
       "network/fallaryn" = {
         path = "/etc/fallaryn-synology";
         owner = "root";
diff --git a/systems/fallaryn/ssh.nix b/systems/fallaryn/ssh.nix
deleted file mode 100755
index ebc3b48..0000000
--- a/systems/fallaryn/ssh.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{flake, ...}: let
-  inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) sshKeys;
-in {
-  users.users.${user0} = {
-    openssh.authorizedKeys.keys = sshKeys;
-  };
-}
diff --git a/systems/laptop/default.nix b/systems/laptop/default.nix
index 1a2e251..e457f72 100755
--- a/systems/laptop/default.nix
+++ b/systems/laptop/default.nix
@@ -6,7 +6,6 @@
     ./hardware.nix
     ./networking.nix
     ./sops.nix
-    ./ssh.nix
   ];
   nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
   system.stateVersion = lib.mkForce "24.05";
diff --git a/systems/laptop/sops.nix b/systems/laptop/sops.nix
index a798371..d68bd40 100755
--- a/systems/laptop/sops.nix
+++ b/systems/laptop/sops.nix
@@ -1,26 +1,11 @@
 {flake, ...}: let
   inherit
     (flake.config.people)
-    user0
     user1
     ;
 in {
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    validateSopsFiles = false;
-    age = {
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = false;
-    };
     secrets = {
-      "ssh/private" = {
-        path = "/home/${user0}/.ssh/id_ed25519";
-        owner = user0;
-      };
-      "ssh/public" = {
-        path = "/home/${user0}/.ssh/id_ed25519.pub";
-        owner = user0;
-      };
       "network/synology" = {
         path = "/var/lib/secrets/synology";
         owner = "root";
diff --git a/systems/laptop/ssh.nix b/systems/laptop/ssh.nix
deleted file mode 100755
index ebc3b48..0000000
--- a/systems/laptop/ssh.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{flake, ...}: let
-  inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) sshKeys;
-in {
-  users.users.${user0} = {
-    openssh.authorizedKeys.keys = sshKeys;
-  };
-}
diff --git a/systems/server/default.nix b/systems/server/default.nix
index 1a2e251..e457f72 100755
--- a/systems/server/default.nix
+++ b/systems/server/default.nix
@@ -6,7 +6,6 @@
     ./hardware.nix
     ./networking.nix
     ./sops.nix
-    ./ssh.nix
   ];
   nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
   system.stateVersion = lib.mkForce "24.05";
diff --git a/systems/server/sops.nix b/systems/server/sops.nix
index aec0df8..51df369 100755
--- a/systems/server/sops.nix
+++ b/systems/server/sops.nix
@@ -2,21 +2,7 @@
   inherit (flake.config.people) user0;
 in {
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    validateSopsFiles = false;
-    age = {
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = false;
-    };
     secrets = {
-      "ssh/private" = {
-        path = "/home/${user0}/.ssh/id_ed25519";
-        owner = user0;
-      };
-      "ssh/public" = {
-        path = "/home/${user0}/.ssh/id_ed25519.pub";
-        owner = user0;
-      };
       "discord-token" = {
         path = "/home/${user0}/projects/zookeeper/.env";
         owner = user0;
diff --git a/systems/server/ssh.nix b/systems/server/ssh.nix
deleted file mode 100755
index ebc3b48..0000000
--- a/systems/server/ssh.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{flake, ...}: let
-  inherit (flake.config.people) user0;
-  inherit (flake.config.people.user.${user0}) sshKeys;
-in {
-  users.users.${user0} = {
-    openssh.authorizedKeys.keys = sshKeys;
-  };
-}