diff options
| -rw-r--r-- | .config/beets/config.yaml | 15 | ||||
| -rwxr-xr-x | .config/herbstluftwm/autostart | 5 | ||||
| -rwxr-xr-x | .config/herbstluftwm/panel.sh | 2 | ||||
| -rwxr-xr-x | .config/herbstluftwm/pvol.sh | 20 | ||||
| -rwxr-xr-x | .config/init/funcs/scap | 2 | ||||
| -rw-r--r-- | .config/init/vars | 47 | ||||
| -rw-r--r-- | .config/ranger/rifle.conf | 4 | ||||
| -rw-r--r-- | .vimrc | 5 | ||||
| -rw-r--r-- | .xinitrc | 18 | ||||
| -rw-r--r-- | .zprofile | 4 | ||||
| -rw-r--r-- | .zshrc | 23 |
11 files changed, 110 insertions, 35 deletions
diff --git a/.config/beets/config.yaml b/.config/beets/config.yaml index 358a73a..f697fad 100644 --- a/.config/beets/config.yaml +++ b/.config/beets/config.yaml @@ -22,19 +22,30 @@ match: # PLUGINS # ############# -plugins: convert chroma discogs fetchart fuzzy info mpdupdate scrub +plugins: acousticbrainz absubmit convert chroma discogs fetchart fuzzy info mpdupdate scrub edit zero convert: auto: no copy_album_art: no embed: no - never_convert_lossy_files: yes + never_convert_lossy_files: no + format: opus chroma: auto: yes fetchart: auto: yes + +acousticbrainz: + auto: yes + +absubmit: + auto: yes + +zero: + auto: yes + fields: comment description fuzzy: prefix: '@' diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index 8e86ccc..d3b2746 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -172,6 +172,11 @@ hc keybind Mod4-r spawn dmenu_run -fn "${bfont}:size=${bfont_size}" \ hc keybind Mod4-g spawn ~/.config/herbstluftwm/switcher.sh # hc keybind Mod4-8 spawn ~/.config/herbstluftwm/calc.sh +hc keybind XF86AudioLowerVolume spawn ~/.config/herbstluftwm/pvol.sh down +hc keybind XF86AudioRaiseVolume spawn ~/.config/herbstluftwm/pvol.sh up +hc keybind XF86AudioMute spawn ~/.config/herbstluftwm/pvol.sh mute +hc keybind XF86AudioMicMute spawn ~/.config/herbstluftwm/pvol.sh + # tunes hc keybind Mod4-Up spawn ~/.config/herbstluftwm/mpc-status.sh hc keybind Mod4-Down spawn mpc toggle diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh index 285270e..057245a 100755 --- a/.config/herbstluftwm/panel.sh +++ b/.config/herbstluftwm/panel.sh @@ -300,7 +300,7 @@ event_when() { # pass the events into bar } 2> /dev/null | lemonbar -f "$ifont" -o "$ifont_off" \ -f "${bfont}:size=${bfont_size}" -o "$bfont_off" \ - -f "${jfont}:size=${jfont_size}" -o "$jfont_off" \ + -f "${bjfont}:size=${bjfont_size}" -o "$bjfont_off" \ -g${width}x${bheight}+${xpos}+${ypos} \ -B ${bg_normal} -F ${fg_normal} | \ { diff --git a/.config/herbstluftwm/pvol.sh b/.config/herbstluftwm/pvol.sh new file mode 100755 index 0000000..5c7b351 --- /dev/null +++ b/.config/herbstluftwm/pvol.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# i patched dunst to clear all on SIGUSR1 +killall -SIGUSR1 dunst + +# race condition, obvs, but this is hopefully time enough +case "$1" in + down) + pavolume voldown --quiet 2 + ;; + up) + pavolume volup --quiet 2 + ;; + mute) + pavolume mutetoggle --quiet + ;; + *) + pavolume show + ;; +esac diff --git a/.config/init/funcs/scap b/.config/init/funcs/scap index bf9c66d..85a083f 100755 --- a/.config/init/funcs/scap +++ b/.config/init/funcs/scap @@ -13,6 +13,6 @@ fi echo 'recording...' -ffmpeg -v panic -video_size 1920x1080 -framerate 30 -f x11grab -i :0.0 \ +ffmpeg -v panic -video_size 1920x1080 -framerate 20 -f x11grab -i :0.0 \ -f pulse -ac 2 -i default -af aresample=async=1 \ -c:v libx264 -q 0 -preset ultrafast '/tmp/cap.mp4' diff --git a/.config/init/vars b/.config/init/vars index ac51b97..1ae4675 100644 --- a/.config/init/vars +++ b/.config/init/vars @@ -324,34 +324,61 @@ bheight=20 ifont='-*-stlarch-medium-r-*-*-*-*-*-*-*-*-*-*' ifont_off='-4' -# bar font -bfont='Droid Sans Mono Dotted' -bfont_size='9' -bfont_off='-3' - # jp font jfont='Noto Sans Mono CJK JP Regular' jfont_size='10' -jfont_off='-1' # c font cfont='Noto Sans Mono CJK SC Regular' cfont_size='10' -cfont_off='-1' # emoji font efont='Noto Emoji' efont_size='10' -efont_off='-1' # backup font bkfont='Fira Mono' -bkfont_size='10' +bkfont_size='9.5' bkfont_off='-3' # main font mfont='Droid Sans Mono Dotted' -mfont_size='10' +mfont_size='9.5' + +# bar font +bfont="$mfont" +bfont_size='8.5' +bfont_off='-3' + +# bar jp font +bjfont="$jfont" +bjfont_size='9.5' +bjfont_off='-1' + +# bar c font +bcfont="$cfont" +bcfont_size='9.5' +bcfont_off='-1' + +# bar emoji font +befont="$efont" +befont_size='9.5' +befont_off='-1' + +# monitor dpi can be on-the-fly overridden by using "startx" instead of alias sx +dpi=92 + +kbrate=25 +kbdelay=300 + +# use overrides, if any +if [ -f ~/.config/init/voverride ]; then + source ~/.config/init/voverride +else + if [ -f /home/shmibs/.config/init/voverride ]; then + source /home/shmibs/.config/init/voverride + fi +fi dmenu_args=( -fn "${bfont}:size=${bfont_size}" -h "$bheight" -nb "$bg_normal" -nf "$fg_normal" -sb "$bg_focus" diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf index 4f1aa8b..7093f3d 100644 --- a/.config/ranger/rifle.conf +++ b/.config/ranger/rifle.conf @@ -128,8 +128,8 @@ mime ^video, terminal, !X, has mpv = mpv -- "$@" #------------------------------------------- ext djvu|pdf|ps, has zathura, X, flag f = zathura -- "$@" -ext tex, has latex = latex -- "-output-format=pdf" "$@" -ext tex, has xelatex = xelatex -- "-output-format=pdf" "$@" +ext tex, has latex = latex "-output-format=pdf" -- "$@" +ext tex, has xelatex = xelatex -- "$@" ext docx?, has catdoc, terminal = catdoc -- "$@" | $PAGER @@ -397,12 +397,13 @@ function! Settings_tex() setlocal shiftwidth=4 setlocal tabstop=4 setlocal softtabstop=4 + setlocal spell "mappings nnoremap <buffer> -- O%<Space> nnoremap <buffer> <Leader>c :!latex -output-format=pdf "%"<CR><CR> nnoremap <buffer> <Leader>C :!latex -output-format=pdf "%"<CR> - nnoremap <buffer> <Leader>x :!xelatex -output-format=pdf "%"<CR><CR> - nnoremap <buffer> <Leader>X :!xelatex -output-format=pdf "%"<CR> + nnoremap <buffer> <Leader>x :!xelatex "%"<CR><CR> + nnoremap <buffer> <Leader>X :!xelatex "%"<CR> nnoremap <buffer> <Leader>w :call Settings_sub_wmodetoggle()<CR> endfunction @@ -1,5 +1,8 @@ #initialise configs to auto-match theme -~/.config/init/init.sh +# ~/.config/init/init.sh + +#pull inna vars +source ~/.config/init/vars #merge Xresources if [ -s ~/.Xresources ] @@ -7,17 +10,17 @@ then xrdb -override ~/.Xresources fi -#merge Xresources if [ -s /tmp/urxvt-theme ] then xrdb -override /tmp/urxvt-theme fi #add compose key -if [ -s ~/.Xmodmap ] -then - xmodmap ~/.Xmodmap -fi +# if [ -s ~/.Xmodmap ] +# then +# xmodmap ~/.Xmodmap +# fi +setxkbmap -option compose:caps #input! export GTK_IM_MODULE=fcitx @@ -25,6 +28,9 @@ export QT_IM_MODULE=fcitx export XMODIFIERS="@im=fcitx" fcitx & +#keyrate +xset r rate $kbdelay $kbrate + #store sxiv cache in ram export XDG_CACHE_HOME=/home/shmibs/.cache if [ -d /tmp/ ]; then @@ -10,6 +10,10 @@ export QT_STYLE_OVERRIDE=gtk [[ -d ~/.cabal/bin ]] && \ PATH=$PATH:~/.cabal/bin +############# INITIALISE CONFIGS ############## +[[ -f ~/.config/init/init.sh ]] && \ + ~/.config/init/init.sh + ########## MAKE USER FUNCS AVAILABLE ########## func_init_checkreq() { local func_init_state=0 @@ -124,16 +124,17 @@ key[Down]='^[[B' key[Right]='^[[C' bindkey ${key[Backspace]} backward-delete-char -bindkey ${key[Insert]} overwrite-mode -bindkey ${key[Home]} beginning-of-line -bindkey ${key[Delete]} delete-char -bindkey ${key[End]} end-of-line -bindkey ${key[Up]} up-line-or-search -bindkey ${key[Left]} backward-char -bindkey ${key[Down]} down-line-or-search -bindkey ${key[Right]} forward-char -bindkey ${key[PageUp]} history-beginning-search-backward -bindkey ${key[PageDown]} history-beginning-search-forward +bindkey ${key[Insert]} overwrite-mode +bindkey ${key[Home]} beginning-of-line +bindkey ${key[Delete]} delete-char +bindkey ${key[End]} end-of-line +bindkey ${key[Up]} up-line-or-search +bindkey ${key[Left]} backward-char +bindkey ${key[Down]} down-line-or-search +bindkey ${key[Right]} forward-char +bindkey ${key[PageUp]} history-beginning-search-backward +bindkey ${key[PageDown]} history-beginning-search-forward + bindkey '^W' backward-kill-word bindkey '^U' backward-kill-line bindkey '^P' up-history @@ -162,7 +163,7 @@ fi [[ ! -z $(whence aiksaurus) ]] && alias thesaurus='aiksaurus' [[ ! -z $(whence ag) ]] && alias ag='ag --color-match "1;34"' [[ ! -z $(whence latex) ]] && alias latex='latex -output-format=pdf' -[[ ! -z $(whence startx) ]] && alias sx='startx' +[[ ! -z $(whence startx) ]] && alias sx="startx -dpi $dpi" if [[ ! -z $(whence udevil) ]] then alias vmount='udevil mount' |