fix the hm zsh initshell
This commit is contained in:
parent
87572af7db
commit
0ea8b9ed2c
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
loginShellInit = ''
|
loginShellInit = ''
|
||||||
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
|
if [ -z $DISPLAY ] && [ $UID != 0 ] && [ "$(tty)" = "/dev/tty1" ]; then
|
||||||
exec Hyprland
|
exec Hyprland
|
||||||
fi
|
fi
|
||||||
''; # Will automatically open sway when logged into tty1
|
''; # Will automatically open sway when logged into tty1
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
clock24 = true;
|
clock24 = true;
|
||||||
shortcut = "h";
|
shortcut = "h";
|
||||||
baseIndex = 1;
|
baseIndex = 1;
|
||||||
|
shell = "\${pkgs.zsh}/bin/zsh";
|
||||||
plugins = [ pkgs.tmuxPlugins.dracula ];
|
plugins = [ pkgs.tmuxPlugins.dracula ];
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g @dracula-plugins "cpu-usage ram-usage network-bandwidth time"
|
set -g @dracula-plugins "cpu-usage ram-usage network-bandwidth time"
|
||||||
|
@ -18,12 +18,15 @@
|
|||||||
plugins = [ "git" ];
|
plugins = [ "git" ];
|
||||||
custom = "$HOME/.config/zsh_nix/custom";
|
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
|
initExtra = '' # Zsh theme
|
||||||
|
if [[ $DISPLAY ]]; then
|
||||||
|
[[ $- != *i* ]] && return
|
||||||
|
tmux attach
|
||||||
|
fi
|
||||||
|
export GPG_TTY=$(tty)
|
||||||
|
gpg-connect-agent updatestartuptty /bye >/dev/null
|
||||||
|
unset SSH_AGENT_PID
|
||||||
|
export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
|
||||||
# Spaceship
|
# Spaceship
|
||||||
source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup
|
source ${pkgs.spaceship-prompt}/share/zsh/site-functions/prompt_spaceship_setup
|
||||||
autoload -U promptinit; promptinit
|
autoload -U promptinit; promptinit
|
||||||
|
Loading…
Reference in New Issue
Block a user