diff --git a/configurations/nixos/vixen/default.nix b/configurations/nixos/vixen/default.nix index 95fcf69..c7b6b38 100644 --- a/configurations/nixos/vixen/default.nix +++ b/configurations/nixos/vixen/default.nix @@ -21,6 +21,7 @@ in services.fprintd.enable = true; programs.nix-ld.enable = true; # for vscode server + programs.zsh.enable = true; # Workaround the annoying `Failed to start Network Manager Wait Online` error on switch. # https://github.com/NixOS/nixpkgs/issues/180175 diff --git a/modules/home/all/zsh.nix b/modules/home/all/zsh.nix index beac06a..59adb01 100644 --- a/modules/home/all/zsh.nix +++ b/modules/home/all/zsh.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { - home.sessionPath = [ + home.sessionPath = lib.mkIf pkgs.stdenv.isDarwin [ "/etc/profiles/per-user/$USER/bin" "/nix/var/nix/profiles/system/sw/bin" "/usr/local/bin" @@ -18,7 +18,7 @@ } ]; - envExtra = '' + envExtra = lib.mkIf pkgs.stdenv.isDarwin '' # Because, adding it in .ssh/config is not enough. # cf. https://developer.1password.com/docs/ssh/get-started#step-4-configure-your-ssh-or-git-client export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock diff --git a/modules/home/linux-only.nix b/modules/home/linux-only.nix index d636ebd..08e6d85 100644 --- a/modules/home/linux-only.nix +++ b/modules/home/linux-only.nix @@ -1,6 +1,7 @@ { imports = [ ./all/bash.nix + ./all/zsh.nix ./all/vscode-server.nix ./all/rio.nix ];