diff options
Diffstat (limited to 'config')
| -rwxr-xr-x | config/X/x11/xinitrc | 34 | ||||
| -rw-r--r-- | config/essentials/shell/aliases.sh | 2 | ||||
| -rw-r--r-- | config/essentials/shell/functions.sh | 4 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | config/home/.zshenv | 2 |
5 files changed, 27 insertions, 17 deletions
diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index 507af92..86ab9dc 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -20,17 +20,25 @@ fi export MENUCMD="dmenu" export IMAGE="feh" -xcompmgr & -feh --no-fehbg --bg-scale ~/pics/wallpaper -setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win -# xautolock -locker slock & -gammastep -m randr & -ntfy transmission & -# dunst & -slstatus & -upds & -eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" -unclutter --timeout 3 --jitter 50 -b -herbimisu & -202020 & +# Autostart these programs +{ + xcompmgr & + feh --no-fehbg --bg-scale ~/pics/wallpaper + setxkbmap colemak -option ctrl:swapcaps,altwin:menu_win + # xautolock -locker slock & + gammastep -m randr & + ntfy transmission & + # dunst & + slstatus & + upds & + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" + unclutter --timeout 3 --jitter 50 -b + herbimisu & + 202020 & + + signal-desktop & + discord & + st -e "sh" "-c" "pgrep tmux && tmux a || tmux" & +} + exec startdwm diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh index 509a3fe..b05f67f 100644 --- a/config/essentials/shell/aliases.sh +++ b/config/essentials/shell/aliases.sh @@ -139,7 +139,7 @@ alias ss4='ss -tln4p' alias mdb='mariadb -u admin -ppass admindb' alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb' alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb' -alias tmux='pgrep tmux && tmux attach || tmux new-session' +alias tmux='tmux list-sessions && tmux attach || tmux new-session' # ssh alias sha='ssh-add' diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh index 0f12206..030778f 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -350,13 +350,13 @@ nvim_bindings() { prj() { pfx="$HOME/proj" d="$(find "$pfx" -mindepth 1 -maxdepth 1 -type d | sed "s@$pfx/@@" |fzf)" - [ -d "$pfx/$d" ] || return 1 + { [ "$d" ] && [ -d "$pfx/$d" ]; } || return 1 cd "$pfx/$d" } prje() { prj || return 1 f="$(git ls-files | fzf)" - [ "$f" ] || exit 1 + [ "$f" ] || return 1 if [ -f "$f" ] then "$EDITOR" "$f" diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 878f04d..91fef35 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -6,7 +6,7 @@ if [ "$(id -u)" -ne 0 ] then [ "${TTY%%tty*}" = '/dev/' ] && clear case "${TTY#/dev/tty}" in - 1) exec startx > /dev/null 2>&1 ;; + 2) exec startx > /dev/null 2>&1 ;; *) false ;; esac && exit fi diff --git a/config/home/.zshenv b/config/home/.zshenv index c0c4344..a2f26ed 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -5,6 +5,8 @@ export VISUAL="nvim" export BROWSER="zen-browser" export VIEWER="zathura" export PLAYER="mpv" +export MENUCMD="dmenu" +export IMAGE="feh" export XDG_CONFIG_HOME="$HOME"/.config export XDG_CACHE_HOME="$HOME"/.cache |