refactor

flake.nix

@@ -42,7 +42,7 @@
         Skipper = lib.nixosSystem {
           specialArgs = inputs;
           modules = [
-            ./system/nix.nix
+            ./nix.nix
 
             {
               nixpkgs.overlays = [ (import ./packages) ];

system/default.nix

@@ -1,10 +1,6 @@
-{ config
-, lib
-, pkgs
-, ...
-}: {
+{ config, lib, pkgs, ... }: {
   imports = [
-    ./hardware.nix
+    ./hardware
     ./packages.nix
     ./persistence.nix
     ./plymouth.nix

system/packages.nix

@@ -14,7 +14,7 @@
 
   hardware.gpgSmartcards.enable = true;
   programs = {
-  dconf.enable = true;
+    dconf.enable = true;
     git.enable = true;
     gnupg.agent = {
       enable = true;
@@ -28,7 +28,7 @@
       viAlias = true;
       vimAlias = true;
     };
-  seahorse.enable = true;
+    seahorse.enable = true;
     xwayland.enable = true;
     zsh.enable = true;
   };

system/services.nix

@@ -24,7 +24,9 @@
     udev.packages = [ pkgs.yubikey-personalization ];
     udisks2.enable = true;
   };
-  security.pam.services.passwd.enableGnomeKeyring = true;
-  security.pam.services.login.enableGnomeKeyring = true;
-  security.pam.services.swaylock = { };
+  security.pam.services = {
+    passwd.enableGnomeKeyring = true;
+    login.enableGnomeKeyring = true;
+    swaylock = { };
+  };
 }