diff options
| author | Franck Cuny <franck@fcuny.net> | 2022-02-16 17:46:31 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2022-02-16 17:46:31 -0800 |
| commit | 0c622aa0c7f3046f86de11f905aa96f70eeff81b (patch) | |
| tree | cd3bab23db231830df0afa8ae10ea3c4165ae6d7 | |
| parent | mpd: add configuration to the module itself (diff) | |
| download | infra-0c622aa0c7f3046f86de11f905aa96f70eeff81b.tar.gz | |
home-manager: move activate logic in users' config
| -rw-r--r-- | hosts/common/desktop/xserver.nix | 5 | ||||
| -rw-r--r-- | users/fcuny/cli/zsh.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hosts/common/desktop/xserver.nix b/hosts/common/desktop/xserver.nix index 3b61e02..58f0578 100644 --- a/hosts/common/desktop/xserver.nix +++ b/hosts/common/desktop/xserver.nix @@ -35,10 +35,7 @@ security.pam.services = { login.enableGnomeKeyring = true; }; environment = { - # Activate home-manager environment, if not already enabled - loginShellInit = '' - [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null - ''; + pathsToLink = [ "/libexec" ]; homeBinInPath = true; localBinInPath = true; }; diff --git a/users/fcuny/cli/zsh.nix b/users/fcuny/cli/zsh.nix index be827b4..3358e50 100644 --- a/users/fcuny/cli/zsh.nix +++ b/users/fcuny/cli/zsh.nix @@ -16,6 +16,8 @@ }; initExtra = '' source ${config.xdg.configHome}/zsh/personal/init.zsh + # Activate home-manager environment, if not already enabled + [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null ''; }; } |