From a129df16dc14e64b812f922277907ef620d9bb5b Mon Sep 17 00:00:00 2001 From: Kabbone Date: Fri, 23 Sep 2022 18:41:16 +0200 Subject: [PATCH] shift shellinit to zsh config --- hosts/q920/home.nix | 6 ------ modules/shell/zsh.nix | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hosts/q920/home.nix b/hosts/q920/home.nix index 8588812..bf99cab 100644 --- a/hosts/q920/home.nix +++ b/hosts/q920/home.nix @@ -37,12 +37,6 @@ alacritty.settings.font.size = 11; }; - environment.shellInit = '' - export GPG_TTY="$(tty)" - gpg-connect-agent /bye - export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" - ''; - services = { # Applets blueman-applet.enable = true; # Bluetooth network-manager-applet.enable = true; # Network diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 0467f46..b9ba319 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -18,7 +18,11 @@ plugins = [ "git" ]; custom = "$HOME/.config/zsh_nix/custom"; }; - + shellInit = '' + export GPG_TTY="$(tty)" + gpg-connect-agent /bye + export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh" + ''; initExtra = '' # Zsh theme # Spaceship source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup