diff --git a/flake.nix b/flake.nix index d4ff1ccf..8f4be256 100644 --- a/flake.nix +++ b/flake.nix @@ -31,9 +31,20 @@ hosts = builtins.filter (host: builtins.pathExists ./hosts/${host}/configuration.nix) (builtins.attrNames (builtins.readDir ./hosts)); - mkHostConfig = host: + mkHostConfig = host: let + defaultConf = rec { + hostname = host; + + uid = 1000; + user = "lilith"; + home = /home/${user}; + }; + in nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + specialArgs = { + inherit inputs outputs; + conf = defaultConf; + }; modules = [ ./hosts/${host}/configuration.nix ./hosts/${host}/hardware-configuration.nix diff --git a/home/persist.nix b/home/persist.nix new file mode 100644 index 00000000..64629674 --- /dev/null +++ b/home/persist.nix @@ -0,0 +1 @@ +{...}: {} diff --git a/hosts/lilith-pad/configuration.nix b/hosts/lilith-pad/configuration.nix index 3947369f..a64892d7 100644 --- a/hosts/lilith-pad/configuration.nix +++ b/hosts/lilith-pad/configuration.nix @@ -1,3 +1,3 @@ {...}: { - import = ["../system"]; + imports = [../../system]; } diff --git a/system/default.nix b/system/default.nix index efe04648..245d854e 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,15 +1,15 @@ {...}: { - import = [ - "./audio.nix" - "./boot.nix" - "./env.nix" - "./networking.nix" - "./persistence.nix" - "./bluetooth.nix" - "./btrfs.nix" - "./fonts.nix" - "./nix.nix" - "./steam.nix" + imports = [ + ./audio.nix + ./boot.nix + ./env.nix + ./networking.nix + # ./persistence.nix + ./bluetooth.nix + ./btrfs.nix + ./fonts.nix + # ./nix.nix + # ./steam.nix ]; system.stateVersion = "24.11"; diff --git a/system/nix.nix b/system/nix.nix index 747a2ab0..7b1ee48b 100644 --- a/system/nix.nix +++ b/system/nix.nix @@ -1,10 +1,11 @@ {nixpkgs, ...}: { - nixPath = ["nixpkgs=${nixpkgs}"]; - gc = { - automatic = true; - dates = "05:30"; - options = "--delete-older-than 7d"; - + nix = { + nixPath = ["nixpkgs=${nixpkgs}"]; + gc = { + automatic = true; + dates = "05:30"; + options = "--delete-older-than 7d"; + }; settings = { keep-outputs = true; auto-optimise-store = true;