diff --git a/flake.nix b/flake.nix index 3d1f00a..b1e778b 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,6 @@ with { hostName = builtins.baseNameOf configDirectory; hostPlatform = import (configDirectory + "/platform.nix"); - userName = import (configDirectory + "/username.nix"); }; { @@ -46,7 +45,7 @@ }; # Helper function for DRY. - homeManagerConfiguration = attrs: { + homeManagerConfiguration = userName: attrs: { home-manager.users.${userName} = attrs; }; }; diff --git a/machines/asus/default.nix b/machines/asus/default.nix index 11c2ab1..785c020 100644 --- a/machines/asus/default.nix +++ b/machines/asus/default.nix @@ -19,6 +19,6 @@ // -(homeManagerConfiguration { +(homeManagerConfiguration "nixos" { home.stateVersion = "22.11"; }) diff --git a/machines/asus/git/default.nix b/machines/asus/git/default.nix index 10a548c..e622872 100644 --- a/machines/asus/git/default.nix +++ b/machines/asus/git/default.nix @@ -1,6 +1,6 @@ { homeManagerConfiguration, ... }: -homeManagerConfiguration { +homeManagerConfiguration "nixos" { programs.git.enable = true; programs.git = { userName = "RGBCube"; diff --git a/machines/asus/neovim/default.nix b/machines/asus/neovim/default.nix index f7a14bb..0b47c58 100644 --- a/machines/asus/neovim/default.nix +++ b/machines/asus/neovim/default.nix @@ -8,7 +8,7 @@ // -(homeManagerConfiguration { +(homeManagerConfiguration "nixos" { programs.neovim.enable = true; programs.neovim = { defaultEditor = true; diff --git a/machines/asus/nushell/default.nix b/machines/asus/nushell/default.nix index 858fcb2..f836e93 100644 --- a/machines/asus/nushell/default.nix +++ b/machines/asus/nushell/default.nix @@ -1,6 +1,6 @@ { homeManagerConfiguration, ... }: -homeManagerConfiguration { +homeManagerConfiguration "nixos" { programs.nushell.enable = true; programs.nushell = { configFile.source = ./config.nu; diff --git a/machines/asus/username.nix b/machines/asus/username.nix deleted file mode 100644 index 5a5aceb..0000000 --- a/machines/asus/username.nix +++ /dev/null @@ -1 +0,0 @@ -"nixos"