diff options
| -rw-r--r-- | config/essentials/shell/functions.sh | 31 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 2 | ||||
| -rwxr-xr-x | config/home/.xprofile | 27 | ||||
| -rw-r--r-- | config/theme/gtk-2.0/gtkfilechooser.ini | 4 |
4 files changed, 31 insertions, 33 deletions
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh index 50ee0aa..7c8c777 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -366,20 +366,23 @@ edit_git_file () { $EDITOR "$1"/"$f" } -# Wrapper to automatically add the key -# could have been alias='SSH_ASKPASS=askpass SSH_ASKPASS_REQUIRE=prefer ssh' -# but this option is very slow for some reason -ssh() { - for arg in $@; do - if grep "Host $arg\s*\$" ~/.ssh/config > /dev/null 2>&1 ; - then - # Disable notification by unsetting the DISPLAY varibles - keyadd "$arg" 2> /dev/null - break - fi - done - /usr/bin/ssh $@ -} +if false +then + # Wrapper to automatically add the key + # could have been alias='SSH_ASKPASS=askpass SSH_ASKPASS_REQUIRE=prefer ssh' + # but this option is very slow for some reason + ssh() { + for arg in $@; do + if grep "Host $arg\s*\$" ~/.ssh/config > /dev/null 2>&1 ; + then + # Disable notification by unsetting the DISPLAY varibles + keyadd "$arg" 2> /dev/null + break + fi + done + /usr/bin/ssh $@ + } +fi ssl_req() { [ "$1" ] || return 1 diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 6b8a910..1204e2c 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -8,7 +8,7 @@ if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents ssh,gpg)" if [ "$(hostname)" = "spring" ] then - keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D #FILTERED + keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg IDENTITY #FILTERED fi exec startx > /dev/null 2>&1 exit diff --git a/config/home/.xprofile b/config/home/.xprofile index e2b9e6c..e616a11 100755 --- a/config/home/.xprofile +++ b/config/home/.xprofile @@ -1,28 +1,29 @@ #!/bin/sh feh --no-fehbg --bg-scale "$HOME"/pics/wallpaper & - setxkbmap us -variant colemak -option ctrl:swapcaps,altwin:menu_win & +xset s off -dpms & -# TODO: check if this is home if [ "$(hostname)" = "winter" ]; then ( CurrentOutput="$(xrandr | grep '\bconnected\b' | awk '{print $1}')" - xrandr --output "$CurrentOutput" --mode 1920x1080 --rate 144 + xrandr --output "$CurrentOutput" --mode "1920x1080" --rate "144" ) & + signal-desktop & + discord & + ~/src/xobs/env/bin/python ~/src/xobs/pulse.py | xob & fi if [ "$(hostname)" = "spring" ] then tail -f ~/src/xob/scripts/volume.pipe | xob & -else - ~/src/xobs/env/bin/python ~/src/xobs/pulse.py | xob & + xautolock -locker slock & + saveself & fi -picom -b & - -# xautolock -locker slock & +st -e "sh" "-c" "pgrep tmux && tmux a || tmux" & +picom -b & gammastep -m randr & ntfy transmission & herbimisu & @@ -31,11 +32,5 @@ slstatus & unclutter --timeout 3 --jitter 50 -b & 202020 & -if [ "$(hostname)" = "winter" ]; then - signal-desktop & - discord & -fi -st -e "sh" "-c" "pgrep tmux && tmux a || tmux" & - -xset s off -dpms & -saveself & +keyadd autumn & +keyadd spacehb.net & diff --git a/config/theme/gtk-2.0/gtkfilechooser.ini b/config/theme/gtk-2.0/gtkfilechooser.ini index bfe91f8..289d0f4 100644 --- a/config/theme/gtk-2.0/gtkfilechooser.ini +++ b/config/theme/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=542 -GeometryY=192 +GeometryX=0 +GeometryY=0 GeometryWidth=836 GeometryHeight=697 SortColumn=name |