Merge branch 'master' of github.com:shmibs/dotfiles

4 files changed, 39 insertions, 13 deletions

diff --git a/.config/init/funcs/mpd-filetypes b/.config/init/funcs/mpd-filetypes
index 0bc93d2..3015676 100755
--- a/.config/init/funcs/mpd-filetypes
+++ b/.config/init/funcs/mpd-filetypes
@@ -5,7 +5,6 @@
 local pattern
 
 # if args exist, read them as file extensions in a pattern
-if 
 if [[ ! -z "$@" ]]; then
 	pattern=$(echo "$@" | sed -e 's/\s/|/g' -e 's/\(.*\)/(\1)/')
 else
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/init.sh b/.config/init/init.sh
index 6a21763..fa9f9d2 100755
--- a/.config/init/init.sh
+++ b/.config/init/init.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 source $HOME/.config/init/vars
 
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"