diff --git a/flake.nix b/flake.nix index b8e59e5..934b325 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,14 @@ outputs = { self, nypkgs, nixpkgs, home-manager, ... } @ inputs: let + user = { + username = "josh"; + git = { + + email = "ringofstorms@gmail.com"; + name = "RingOfStorms (Joshua Bell)"; + }; + }; myHosts = [ { name = "gpdPocket3"; @@ -32,13 +40,7 @@ system = "x86_64-linux"; }; settings = { - user = { - username = "josh"; - git = { - email = "ringofstorms@gmail.com"; - name = "RingOfStorms (Joshua Bell)"; - }; - }; + inherit user; }; } { @@ -47,13 +49,7 @@ system = "x86_64-linux"; }; settings = { - user = { - username = "josh"; - git = { - email = "ringofstorms@gmail.com"; - name = "RingOfStorms (Joshua Bell)"; - }; - }; + inherit user; }; } ]; @@ -73,7 +69,8 @@ acc // { "${nixConfig.name}" = nixpkgs.lib.nixosSystem { - modules = [./hosts/_common/configuration.nix ./hosts/${nixConfig.name}/configuration.nix ]; + # module = nixConfig.overrides.modules or [...] + modules = [ ./hosts/_common/configuration.nix ]; specialArgs = inputs // { ylib = nypkgs.legacyPackages.${nixConfig.opts.system}.lib; settings = directories // nixConfig.settings // { diff --git a/hosts/_common/configuration.nix b/hosts/_common/configuration.nix index bb11bff..0eee4f3 100644 --- a/hosts/_common/configuration.nix +++ b/hosts/_common/configuration.nix @@ -22,6 +22,8 @@ in networking.hostName = settings.system.hostname; # TODO do I want this dynamic at all? Roaming? time.timeZone = "America/Chicago"; + + # nix helper programs.nh = { enable = true; clean.enable = true;