diff --git a/modules/core/user.nix b/modules/core/user.nix index 57c6e0a..3313d3c 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -4,7 +4,7 @@ home-manager = { useUserPackages = true; useGlobalPkgs = true; - extraSpecialArgs = { inherit inputs username; }; + extraSpecialArgs = { inherit inputs username host; }; users.${username} = { imports = if (host == "desktop") then diff --git a/modules/home/default.desktop.nix b/modules/home/default.desktop.nix index 302c7ce..e1917be 100644 --- a/modules/home/default.desktop.nix +++ b/modules/home/default.desktop.nix @@ -1,4 +1,4 @@ -{inputs, username, ...}: { +{inputs, username, host, ...}: { imports = [(import ./default.nix)] ++ [(import ./rider.nix)] # C# JetBrain editor diff --git a/modules/home/default.nix b/modules/home/default.nix index 9a6ea4d..47ddf8e 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,4 +1,4 @@ -{inputs, username, ...}: { +{inputs, username, host, ...}: { imports = [(import ./aseprite/aseprite.nix)] # pixel art editor ++ [(import ./audacious/audacious.nix)] # music player diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index e1c5cc6..8b94ac1 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -1,4 +1,4 @@ -{ hostname, config, pkgs, ...}: +{ hostname, config, pkgs, host, ...}: { programs.zsh = { enable = true; @@ -35,8 +35,8 @@ cdnix = "cd ~/nixos-config && codium ~/nixos-config"; ns = "nix-shell --run zsh"; nix-shell = "nix-shell --run zsh"; - nix-switch = "sudo nixos-rebuild switch --flake ~/nixos-config#nixos"; - nix-switchu = "sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#nixos"; + nix-switch = "sudo nixos-rebuild switch --flake ~/nixos-config#${host}"; + nix-switchu = "sudo nixos-rebuild switch --upgrade --flake ~/nixos-config#${host}"; nix-flake-update = "sudo nix flake update ~/nixos-config#"; nix-clean = "sudo nix-collect-garbage && sudo nix-collect-garbage -d && sudo rm /nix/var/nix/gcroots/auto/* && nix-collect-garbage && nix-collect-garbage -d";