diff options
Diffstat (limited to '')
-rw-r--r-- | home/root/common/core/zsh/default.nix | 15 | ||||
-rw-r--r-- | home/root/common/core/zsh/zshrc | 26 |
2 files changed, 0 insertions, 41 deletions
diff --git a/home/root/common/core/zsh/default.nix b/home/root/common/core/zsh/default.nix index 77d4b75..74534f1 100644 --- a/home/root/common/core/zsh/default.nix +++ b/home/root/common/core/zsh/default.nix @@ -7,24 +7,12 @@ export PATH=~/bin:''${PATH} #export PS1="%B%n%b@%U%m%u/%l:%~> " export PAGER=less export EDITOR=vim -export BROWSER=firefox export LC_COLLATE="C" export QUOTING_STYLE="literal" -export IRCNICK="nipsy" -export IRCNAME="Mark Nipper" - -export NNTPSERVER="news.giganews.com" - #export COLORTERM=truecolor export COLORFGBG="green;blue" - -# fix stupid broken Java shit -export _JAVA_AWT_WM_NONREPARENTING=1 - -# enable pass extensions -export PASSWORD_STORE_ENABLE_EXTENSIONS=true ''; history = { save = 100000; @@ -32,13 +20,10 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS=true }; initExtra = (builtins.readFile ./zshrc); shellAliases = { - fixkeyboard = "setxkbmap -layout us -option caps:super -option compose:ralt"; grep = "grep --color=auto"; ip = "ip -c=auto"; la = "ls -aFh --color=auto"; ll = "ls -alF --color=auto"; - lock = "xscreensaver-command -lock"; - steam-no-beta = "steam -clearbeta"; zgrep = "zgrep --color=auto"; }; }; diff --git a/home/root/common/core/zsh/zshrc b/home/root/common/core/zsh/zshrc index cd857e3..890d1f6 100644 --- a/home/root/common/core/zsh/zshrc +++ b/home/root/common/core/zsh/zshrc @@ -2,32 +2,6 @@ umask 022 eval $(dircolors) -# set SWAYSOCK correctly -if pgrep -U nipsy -x sway >/dev/null; then - export SWAYSOCK=/run/user/$(id -u)/sway-ipc.$(id -u).$(pgrep -x sway).sock -fi - -# start sway by default if logging into tty1 -if [[ -z "${DISPLAY}" ]] && [[ $(tty) == "/dev/tty1" ]]; then - - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - - # set some Wayland specific variables - export MOZ_ENABLE_WAYLAND=1 - export GDK_BACKEND=wayland - export QT_QPA_PLATFORM=wayland - export SDL_VIDEODRIVER=wayland - export XDG_SESSION_TYPE=wayland - - exec sway > ~/.sway.log - -fi - -# if already in Wayland, update the GPG TTY so ssh-askpass will work correctly -if [[ -n "${WAYLAND_DISPLAY}" ]]; then - gpg-connect-agent updatestartuptty /bye >/dev/null -fi - # completion options setopt LIST_PACKED MENU_COMPLETE # expansion and globbing options |