diff options
| author | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-03-07 21:54:35 +0100 |
|---|---|---|
| committer | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-03-07 21:54:35 +0100 |
| commit | c1f9f264733be71b51301f6b8516d78c18e111c9 (patch) | |
| tree | 03076a9594697ff0e980eef638fa13d84c1c77c3 /config | |
| parent | 1585b4226b9fe55d0a8dd2db7bbd61cf454a4c9d (diff) | |
| parent | b2f58f47e5d87cb9ad0f1c06b043b669706a2353 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/main'
Diffstat (limited to 'config')
| -rwxr-xr-x | config/X/x11/xinitrc | 3 | ||||
| -rw-r--r-- | config/zshrc/.zshrc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index 2a6fc05..00fc41c 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -30,8 +30,9 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then fi xcompmgr & -feh --bg-scale ~/pics/wallpaper +feh --no-fehbg --bg-scale ~/pics/wallpaper setxkbmap -option ctrl:nocaps +xmodmap -e "keycode 135 = Super_L" xautolock -time 5 -locker slock & redshift & slstatus & diff --git a/config/zshrc/.zshrc b/config/zshrc/.zshrc index 8b83663..c917169 100644 --- a/config/zshrc/.zshrc +++ b/config/zshrc/.zshrc @@ -10,6 +10,7 @@ export VISUAL="nvim" export TERMINAL="st" export BROWSER="firefox" +export CARGO_HOME=~/.config/cargo export GNUPGHOME="$HOME/.config/gnupg" export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" export QT_QPA_PLATFORMTHEME="qt5ct" @@ -19,8 +20,8 @@ export PASSWORD_STORE_CLIP_TIME=5 if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ] then clear - eval `keychain --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2>/dev/null` - eval `keychain --noask --eval --quiet --agents ssh 2>/dev/null` + eval "$(keychain --dir "$HOME/.config/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" + eval "$(keychain --dir "$HOME/.config/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" clear startx 2&> /dev/null exit |