Revert "move devices into modules"

This reverts commit cfb1e3e727.

.sops.yaml

@@ -9,42 +9,42 @@ keys: # cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age
   - &xmupc2 age1l4stuz0vr7gs7pqwjrmezam44702jp2vmqaqyxw0l0r42kf9updq4dfhrw
   - &pi3b age1yjgswvexp0x0de0sw4u6hamruzeluxccmx2enxazl6pwhhsr2s9qlxdemq
 creation_rules:
-  - path_regex: modules/devices/pc/.*$
+  - path_regex: devices/pc/.*$
     key_groups:
     - age:
       - *chn
       - *pc
-  - path_regex: modules/devices/vps6/.*$
+  - path_regex: devices/vps6/.*$
     key_groups:
     - age:
       - *chn
       - *vps6
-  - path_regex: modules/devices/vps7/.*$
+  - path_regex: devices/vps7/.*$
     key_groups:
     - age:
       - *chn
       - *vps7
-  - path_regex: modules/devices/nas/.*$
+  - path_regex: devices/nas/.*$
     key_groups:
     - age:
       - *chn
       - *nas
-  - path_regex: modules/devices/surface/.*$
+  - path_regex: devices/surface/.*$
     key_groups:
     - age:
       - *chn
       - *surface
-  - path_regex: modules/devices/xmupc1/.*$
+  - path_regex: devices/xmupc1/.*$
     key_groups:
     - age:
       - *chn
       - *xmupc1
-  - path_regex: modules/devices/xmupc2/.*$
+  - path_regex: devices/xmupc2/.*$
     key_groups:
     - age:
       - *chn
       - *xmupc2
-  - path_regex: modules/devices/pi3b/.*$
+  - path_regex: devices/pi3b/.*$
     key_groups:
     - age:
       - *chn

flake.nix

@@ -73,7 +73,7 @@
   outputs = inputs:
     let
       localLib = import ./local/lib inputs.nixpkgs.lib;
-      devices = builtins.attrNames (builtins.readDir ./modules/devices);
+      devices = builtins.attrNames (builtins.readDir ./devices);
     in
     {
       packages.x86_64-linux =
@@ -111,7 +111,7 @@
                   # replace pkgs with final to avoid infinite recursion
                   { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
                 ./modules
-                ./modules/devices/${system}
+                ./devices/${system}
               ];
             };
           })
@@ -127,7 +127,7 @@
                 # replace pkgs with final to avoid infinite recursion
                 { localPackages = import ./local/pkgs (moduleInputs // { pkgs = final; }); })]; })
               ./modules
-              ./modules/devices/pi3b
+              ./devices/pi3b
             ];
           };
         }

modules/system/sops.nix

@@ -14,7 +14,7 @@ inputs:
       sops =
       {
         defaultSopsFile =
-          let deviceDir = "${inputs.topInputs.self}/modules/devices/${inputs.config.nixos.system.networking.hostname}";
+          let deviceDir = "${inputs.topInputs.self}/devices/${inputs.config.nixos.system.networking.hostname}";
           in mkIf
             (
               builtins.pathExists "${deviceDir}/secrets.yaml"