diff --git a/home/extras/printer.nix b/builds/printer.nix
similarity index 100%
rename from home/extras/printer.nix
rename to builds/printer.nix
diff --git a/builds/sops.nix b/builds/sops.nix
new file mode 100644
index 0000000..46dcdad
--- /dev/null
+++ b/builds/sops.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  sops = {
+    defaultSopsFile = ../secrets/secrets.yaml;
+    defaultSopsFormat = "yaml";
+    age.keyFile = "/etc/sops/keys.txt";
+    secrets."user_password".neededForUsers = true;
+    # secrets."git/email" = { };
+  };
+}
diff --git a/builds/steam/default.nix b/builds/steam.nix
similarity index 100%
rename from builds/steam/default.nix
rename to builds/steam.nix
diff --git a/configuration.nix b/configuration.nix
index ae2dd2c..7ea5e73 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,9 +6,9 @@ in
 {
   # ── Steam & Printer ───────────────────────────────────────────────────
   imports = [
-    ./builds/steam/default.nix
-    ./home/extras/printer.nix
-    ./home/extras/sops.nix
+    ./builds/steam.nix
+    ./builds/printer.nix
+    ./builds/sops.nix
   ];
 
   # ── Use the systemd-boot EFI boot loader. ─────────────────────────────
@@ -99,7 +99,7 @@ in
         "render"
         "adbusers"
       ];
-      hashedPassword = config.sops.secrets.user_password.path;
+      hashedPassword = config.sops.secrets."user_password".path;
     };
   };
 
diff --git a/flake.nix b/flake.nix
index e4df975..aa8e138 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,9 +69,6 @@
                   ./home/default-laptop.nix
                   catppuccin.homeModules.catppuccin
                 ];
-                sharedModules = [
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
               };
               nixpkgs.overlays = [
                 # (import ./overlays/river-status.nix)
@@ -98,33 +95,6 @@
                 users.elias.imports = [
                   ./home/default-desktop.nix
                   catppuccin.homeModules.catppuccin
-                  sops-nix.homeManagerModules.sops
-                ];
-              };
-              nixpkgs.overlays = [
-                inputs.nur.overlays.default
-                inputs.nix-vscode-extensions.overlays.default
-              ];
-            }
-          ];
-        };
-        nixos = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ./machines/configuration-desktop.nix
-            ./home/services/pipewire.nix
-            nur.modules.nixos.default
-            catppuccin.nixosModules.catppuccin
-            home-manager.nixosModules.home-manager
-            # impermanence.nixosModules.impermanence
-            {
-              home-manager = {
-                useUserPackages = true;
-                extraSpecialArgs = { inherit inputs; };
-                users.elias.imports = [
-                  ./home/default-desktop.nix
-                  catppuccin.homeModules.catppuccin
-                  sops-nix.homeManagerModules.sops
                 ];
               };
               nixpkgs.overlays = [
diff --git a/home/default.nix b/home/default.nix
index 225fb58..1ad21bc 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -46,9 +46,9 @@
       firefox
       bitwarden-desktop
 
-      # sops
-      sops
+      # Sops
       age
+      sops
     ];
 
     stateVersion = "23.11";
diff --git a/home/extras/sops-HM.nix b/home/extras/sops-HM.nix
deleted file mode 100644
index 480cb89..0000000
--- a/home/extras/sops-HM.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-
-{
-  sops = {
-    defaultSopsFile = "./secrets/secrets.yaml";
-    defaultSopsFormat = "yaml";
-    age.keyFile = "/etc/sops/keys.txt";
-  };
-}
diff --git a/home/extras/sops.nix b/home/extras/sops.nix
deleted file mode 100644
index 9daabd6..0000000
--- a/home/extras/sops.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, ... }:
-
-{
-  sops = {
-    defaultSopsFile = "./secrets/secrets.yaml";
-    defaultSopsFormat = "yaml";
-    age.keyFile = "/etc/sops/keys.txt";
-    secrets.user_password.neededForUsers = true;
-  };
-}
diff --git a/home/programs/git.nix b/home/programs/git.nix
index 00afcae..cfc32d9 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -1,5 +1,4 @@
 {
-  config,
   lib,
   pkgs,
   ...
@@ -20,12 +19,12 @@
           defaultBranch = "main";
         };
         user = {
-          email = config.sops.secrets.git.email.path;
-          name = config.sops.secrets.git.name.path;
+          email = "elias.schroeter@e.email";
+          name = "Elias Schröter";
         };
       };
       signing = {
-        key = config.sops.secrets.git.signingkey.path;
+        key = "04F3A2ED4B33F254";
         format = lib.mkForce "openpgp";
         signByDefault = true;
       };