diff --git a/configuration.nix b/configuration.nix index c03b0c9..7d25ed7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,4 +32,5 @@ }; time.timeZone = "${systemSettings.timeZone}"; + networking.hostName = systemSettings.hostname; } diff --git a/flake.nix b/flake.nix index e163ce0..c3abeb7 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ }; pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system}; + pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${systemSettings.system}; in { @@ -64,10 +65,18 @@ homeConfigurations = { useGlobalPkgs = true; - user = home-manager.lib.homeManagerConfiguration { + "${userSettings.username}" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - extraSpecialArgs = {inherit inputs outputs pkgs;}; - modules = [ ./homeManagerModules/home.nix ]; + specialArgs = { + inherit inputs; + inherit outputs; + inherit userSettings; + inherit systemSettings; + }; + modules = [ + ./homeManagerModules/home.nix + ({...}: {home.stateVersion = "${stateVersion}";}) + ]; }; }; }; diff --git a/homeManagerModules/home.nix b/homeManagerModules/home.nix index 4da89a2..5e340c0 100644 --- a/homeManagerModules/home.nix +++ b/homeManagerModules/home.nix @@ -1,8 +1,8 @@ { - inputs, lib, config, pkgs, + inputs, ... }: let @@ -12,10 +12,10 @@ in imports = [ ./git.nix ]; programs.git.extraConfig.safe.directory = "${homePath}"; + nixpkgs.config.allowUnfree = true; + programs.home-manager.enable = true; home = { - stateVersion = "24.05"; - # username = "${user}"; homeDirectory = "${homePath}"; packages = [ (pkgs.writeShellScriptBin "nfs" ''