refactor

flake.nix

@@ -31,7 +31,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, hyprland, impermanence, lanzaboote, nixvim, }@inputs:
+  outputs = { self, nixpkgs, home-manager, hyprland, impermanence, lanzaboote, nixvim }@inputs:
     let
       system = "x86_64-linux";
       lib = nixpkgs.lib;

system/default.nix

@@ -4,8 +4,6 @@
 , ...
 }: {
   imports = [
-    ./filesystem.nix
-    ./gnome-keyring.nix
     ./gtk.nix
     ./hardware.nix
     ./packages.nix
@@ -13,7 +11,6 @@
     ./plymouth.nix
     ./secureboot.nix
     ./services.nix
-    ./swaylock.nix
     ./virtualisation.nix
   ];
 

system/disk.nix

@@ -1,15 +0,0 @@
-{ ... }: {
-  boot = {
-    resumeDevice = "/dev/vg0/swap";
-    initrd.luks.devices = {
-      luks0 = {
-        allowDiscards = true;
-        bypassWorkqueues = true;
-        device = "/dev/disk/by-partlabel/CRYPT";
-        preLVM = true;
-      };
-    };
-  };
-
-  swapDevices = [{ device = "/dev/vg0/swap"; }];
-}

system/gnome-keyring.nix

@@ -1,6 +0,0 @@
-{ ... }: {
-  programs.seahorse.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.passwd.enableGnomeKeyring = true;
-  security.pam.services.login.enableGnomeKeyring = true;
-}

system/gtk.nix

@@ -1,3 +1,7 @@
 { ... }: {
   programs.dconf.enable = true;
+  programs.seahorse.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+  security.pam.services.passwd.enableGnomeKeyring = true;
+  security.pam.services.login.enableGnomeKeyring = true;
 }

system/hardware.nix

@@ -3,9 +3,21 @@
 , config
 , ...
 }: {
-  imports = [ ./disk.nix ./kernel.nix ];
+  imports = [ ./kernel.nix ./filesystem.nix ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  boot = {
+    resumeDevice = "/dev/vg0/swap";
+    initrd.luks.devices = {
+      luks0 = {
+        allowDiscards = true;
+        bypassWorkqueues = true;
+        device = "/dev/disk/by-partlabel/CRYPT";
+        preLVM = true;
+      };
+    };
+  };
+
+  swapDevices = [{ device = "/dev/vg0/swap"; }];
 
   hardware.opengl = {
     enable = true;

system/nix.nix

@@ -1,4 +1,4 @@
-{ ... }: {
+{ lib, ... }: {
   nix.settings = {
     substituters = [
       "https://nix-community.cachix.org/"
@@ -10,4 +10,5 @@
     experimental-features = [ "nix-command" "flakes" ];
   };
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

system/packages.nix

@@ -31,4 +31,5 @@
     zsh.enable = true;
   };
   environment.pathsToLink = [ "/share/zsh" ];
+  security.pam.services.swaylock = { };
 }

system/secureboot.nix

@@ -1,7 +1,4 @@
-{ lib
-, pkgs
-, ...
-}: {
+{ lib, pkgs, ... }: {
   boot.bootspec.enable = true;
   boot.loader.systemd-boot.enable = lib.mkForce false;
   boot.lanzaboote = {

system/swaylock.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  security.pam.services.swaylock = { };
-}