working

flake.nix

@@ -45,7 +45,7 @@
       extraConfig = {};
     };
 
-    hosts = builtins.filter (host: builtins.pathExists ./hosts/${host}/configuration.nix) (builtins.attrNames (builtins.readDir ./hosts));
+    hosts = builtins.filter (host: builtins.pathExists ./hosts/${host}/default.nix) (builtins.attrNames (builtins.readDir ./hosts));
 
     importHostConf = host:
       lib.recursiveUpdate defaultConf (import ./hosts/${host} inputs

home/helix.nix

@@ -7,7 +7,6 @@
     enable = true;
     package = helix.packages.${pkgs.system}.default;
     settings = {
-      theme = "gruvbox_dark_hard";
       editor = {
         line-number = "relative";
         mouse = false;

home/packages.nix

@@ -1,5 +1,5 @@
 {
-  config,
+  system-config,
   pkgs,
   lib,
   ...
@@ -32,5 +32,5 @@
       lutris
     ];
   in
-    common ++ (lib.optionals config.gaming.enable gaming);
+    common ++ (lib.optionals system-config.gaming.enable gaming);
 }

hosts/lilith-pad/default.nix

@@ -1,4 +1,6 @@
 {...}: {
+  system = "x86_64-linux";
+
   extraConfig = {
     config.gaming.enable = false;
   };

system/default.nix

@@ -6,15 +6,12 @@
 } @ inputs: let
   inherit (conf) system;
 
-  pkgs = import nixpkgs {
+  pkgs = import ./nixpkgs.nix {inherit system nixpkgs;};
-    inherit (conf) system;
-    config.allowUnfree = true;
-  };
 
   specialArgs = inputs;
 in {
   build = nixpkgs.lib.nixosSystem {
-    inherit system pkgs specialArgs;
+    inherit system specialArgs;
 
     modules = [
       ./base.nix
@@ -32,6 +29,7 @@ in {
       ./fonts.nix
       ./nix.nix
       ./users.nix
+      ./sops.nix
       ./ssh.nix
       ./steam.nix
       ./stylix.nix

system/nixpkgs.nix

@@ -0,0 +1,8 @@
+{
+  nixpkgs,
+  system,
+}:
+import nixpkgs {
+  inherit system;
+  config.allowUnfree = true;
+}

system/persistence.nix

@@ -1,4 +1,6 @@
-{conf, ...}: {
+{impermanence, ...}: {
+  imports = [impermanence.nixosModule];
+
   environment.persistence."/persist/data" = {
     hideMounts = true;
     directories = [

system/sops.nix

@@ -1,2 +1,3 @@
-{...}: {
+{sops-nix, ...}: {
+  imports = [sops-nix.nixosModules.sops];
 }

system/stylix.nix

@@ -1,4 +1,6 @@
-{...}: {
+{stylix, ...}: {
+  imports = [stylix.nixosModules.stylix];
+
   stylix.image = ../wallpapers/default.png;
   stylix.polarity = "dark";
 }

system/users.nix

@@ -13,17 +13,6 @@
     };
   };
 
-  home-manager = {
-    extraSpecialArgs = {
-      inherit inputs;
-      conf = conf;
-      config = config;
-      sops-nix = inputs.inputs.sops-nix;
-    };
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
-
   home-manager.users = let
     hm = import ../home;
   in {