diff --git a/flake.nix b/flake.nix
index 658f2e0..d6b771c 100755
--- a/flake.nix
+++ b/flake.nix
@@ -26,9 +26,10 @@
   };
 
   outputs = inputs: let
+    lib = inputs.nixpkgs.lib;
     dirUtils = {
       opt = inputs.nixpkgs.lib.optionals;
-      dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir));
+      dirFiles = type: dir: lib.filter (lib.hasSuffix type) (lib.filesystem.listFilesRecursive dir);
     };
     system = hostname: isDesktop:
       inputs.nixpkgs.lib.nixosSystem {
@@ -43,10 +44,10 @@
             inputs.agenix.nixosModules.default
             inputs.nix-gaming.nixosModules.pipewireLowLatency
           ]
-          ++ dirFiles "${inputs.self}/${hostname}"
-          ++ dirFiles ./modules/common
+          ++ dirFiles ".nix" "${inputs.self}/${hostname}"
+          ++ dirFiles ".nix" ./modules/common
           ++ opt isDesktop (
-            (dirFiles ./modules/common-desktop)
+            (dirFiles ".nix" ./modules/common-desktop)
             ++ [
               inputs.stylix.nixosModules.stylix
               ./stylix.nix
diff --git a/home-manager.nix b/home-manager.nix
index 20218cc..8ef8e30 100755
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -13,6 +13,6 @@
     };
     sharedModules =
       [{home.stateVersion = "23.11";}]
-      ++ dirUtils.dirFiles ./home-manager;
+      ++ dirUtils.dirFiles ".nix" ./home-manager;
   };
 }
diff --git a/modules/common/agenix.nix b/modules/common/agenix.nix
index 20e580c..e1f1e06 100644
--- a/modules/common/agenix.nix
+++ b/modules/common/agenix.nix
@@ -3,13 +3,16 @@
   inputs,
   lib,
   ...
-}: let
-  secretsPath = ../../secrets;
-in {
+}: {
   environment.systemPackages = [inputs.agenix.packages.x86_64-linux.default]; # TODO: USE WRAPPER
 
-  age.secrets = lib.listToAttrs (map (name: _: {
-    name = name;
-    value.file = "${secretsPath}/${name}";
-  }) (lib.filter (name: lib.hasSuffix ".age" name) (dirUtils.dirFiles secretsPath)));
+  age = {
+    identityPaths = [
+      "/home/quadradical/.ssh/id_ed25519"
+    ];
+    secrets = lib.listToAttrs (map (path: {
+      name = lib.last (builtins.split "/" (toString path));
+      value.file = path;
+    }) (dirUtils.dirFiles ".age" ../../secrets));
+  };
 }
diff --git a/wrappers/default.nix b/wrappers/default.nix
index c80b3dd..1065a5a 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -8,7 +8,7 @@
   environment.systemPackages = with dirUtils; [
     (inputs.wrapper-manager.lib.build {
       inherit pkgs;
-      modules = dirFiles ./common ++ opt isDesktop (dirFiles ./common-desktop);
+      modules = dirFiles ".nix" ./common ++ opt isDesktop (dirFiles ".nix" ./common-desktop);
     })
   ];
 }