diff --git a/X11/.Xresources b/X11/.Xresources index c81900a..bfaf3a8 100644 --- a/X11/.Xresources +++ b/X11/.Xresources @@ -1,5 +1,5 @@ *.termName: xterm-256color -*faceName: FantasqueSansMono Nerd Font:size=16 +*faceName: FantasqueSansMono Nerd Font:size=10 *metaSendsEscape: true *VT100.Translations: #override \n\ @@ -27,13 +27,13 @@ Xcursor.size: 48 ! }}} ! VT Font Menu: Unreadable -*faceSize1: 12 +*faceSize1: 6 ! VT font menu: Tiny -*faceSize2: 14 +*faceSize2: 8 ! VT font menu: Medium -*faceSize3: 16 +*faceSize3: 10 ! VT font menu: Large -*faceSize4: 18 +*faceSize4: 14 ! VT font menu: Huge *faceSize5: 24 diff --git a/bin/conditional-vdirsyncer.sh b/bin/conditional-vdirsyncer.sh deleted file mode 100755 index 80554ac..0000000 --- a/bin/conditional-vdirsyncer.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -if [[ -n $(secret-tool lookup service nextcloud) ]]; then - /usr/bin/vdirsyncer discover - /usr/bin/vdirsyncer sync --force-delete my_contacts/z-app-generated--contactsinteraction--recent -else - echo "Failed to unlock database" -fi diff --git a/xmonad/autostart.sh b/xmonad/autostart.sh index 78f8011..4bcd138 100755 --- a/xmonad/autostart.sh +++ b/xmonad/autostart.sh @@ -6,7 +6,7 @@ sleep 16 # /usr/sbin/qutebrowser --restore home & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" # /usr/sbin/qutebrowser & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" # /usr/sbin/firefox-developer-edition & sleep 5 && sh -c "wmctrl -r firefox -t 2" -/usr/sbin/xterm -fa 'Fantasque Sans Mono:size=12' -e btm --battery --color default-light --dot_marker & sleep 5 && sh -c "wmctrl -r btm -t 1" +/usr/sbin/xterm -fa 'Fantasque Sans Mono:size=6' -e btm --battery --color default-light --dot_marker & sleep 5 && sh -c "wmctrl -r btm -t 1" # /usr/sbin/xterm -e newsboat & sleep 5 && sh -c "wmctrl -r newsboat -t 4" # /usr/sbin/xterm -e joplin & sleep 5 && sh -c "wmctrl -r joplin -t 5" /usr/sbin/cbatticon & diff --git a/zsh/.zshenv b/zsh/.zshenv index b65a83c..b17c485 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -46,4 +46,4 @@ export NAVI_TAG_COLOR=6 export NAVI_COMMENT_COLOR=3 # Consolidate PATH -export PATH="$(consolidate-path "$PATH")" +# export PATH="$(consolidate-path "$PATH")" diff --git a/zsh/.zshrc b/zsh/.zshrc index 3333315..bc8c7e7 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -54,12 +54,12 @@ source ~/.config/zsh/theme-and-appearance.zsh # This version should strip any existing pwd from the command before adding the # current pwd. This eliminates the pileup of these pwd comments when reusing # old commands (e.g., with up-arrow). -function zshaddhistory() { - history_item="${${1%%$'\n'}%%$' ###'*} ### ${PWD}" - print -sr ${(z)history_item} - fc -p - return 1 -} +# function zshaddhistory() { + # history_item="${${1%%$'\n'}%%$' ###'*} ### ${PWD}" + # print -sr ${(z)history_item} + # fc -p + # return 1 +# } # Starship eval "$(starship init zsh)" @@ -117,7 +117,8 @@ eval "$(zoxide init zsh)" eval "$(navi widget zsh)" # tmuxp completion -eval "$(_TMUXP_COMPLETE=source_zsh tmuxp)" +# N.B. This throws a "parse error" as of 2022-10-12 +# eval "$(_TMUXP_COMPLETE=source_zsh tmuxp)" source /home/adam/.cargo/env