diff options
| -rwxr-xr-x | .config/herbstluftwm/autostart | 42 | ||||
| -rwxr-xr-x | .config/herbstluftwm/mpc-status.sh | 6 | ||||
| -rwxr-xr-x | .config/herbstluftwm/pvol.sh | 2 | ||||
| -rwxr-xr-x | .config/init/funcs/srcopen | 4 | ||||
| -rw-r--r-- | .config/init/gen/cava.sh | 14 | ||||
| -rw-r--r-- | .config/init/gen/dunstrc.sh | 2 | ||||
| -rw-r--r-- | .config/qmk_firmware/keyboards/keebio/nyquist/keymaps/ageha/keymap.c | 24 | ||||
| -rw-r--r-- | .config/ranger/rifle.conf | 10 | ||||
| -rw-r--r-- | .vim/spell/en.utf-8.add | 1 | ||||
| -rw-r--r-- | .zprofile | 4 |
10 files changed, 77 insertions, 32 deletions
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart index d2c1d1f..d7a1617 100755 --- a/.config/herbstluftwm/autostart +++ b/.config/herbstluftwm/autostart @@ -34,7 +34,7 @@ xset -dpms xset s off #daemons -picom -b --backend glx --vsync --glx-no-stencil --glx-no-rebind-pixmap +picom -b --backend glx --vsync fcitx5 & @@ -173,38 +173,38 @@ hc keybind Mod4-Print spawn ~/.config/herbstluftwm/maim.sh -m send hc keybind Mod4-Shift-Print spawn ~/.config/herbstluftwm/maim.sh -s -m send # ranger -hc keybind Mod4-Shift-Control-Return spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~ -hc keybind Mod4-Shift-Control-a spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/audio -hc keybind Mod4-Shift-Control-b spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/documents/books -hc keybind Mod4-Shift-Control-c spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/documents/comics -hc keybind Mod4-Shift-Control-d spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/downloads -hc keybind Mod4-Shift-Control-g spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/games -hc keybind Mod4-Shift-Control-i spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/images -hc keybind Mod4-Shift-Control-m spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/music -hc keybind Mod4-Shift-Control-n spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/documents/manga -hc keybind Mod4-Shift-Control-p spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/projects -hc keybind Mod4-Shift-Control-s spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/desktop -hc keybind Mod4-Shift-Control-r spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/work -hc keybind Mod4-Shift-Control-t spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/thcool -hc keybind Mod4-Shift-Control-v spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/videos -hc keybind Mod4-Shift-Control-w spawn ~/.config/herbstluftwm/alacritty.sh -e ranger ~/projects/writing +hc keybind Mod4-Shift-Control-Return spawn aty -e ranger ~ +hc keybind Mod4-Shift-Control-a spawn aty -e ranger ~/audio +hc keybind Mod4-Shift-Control-b spawn aty -e ranger ~/documents/books +hc keybind Mod4-Shift-Control-c spawn aty -e ranger ~/documents/comics +hc keybind Mod4-Shift-Control-d spawn aty -e ranger ~/downloads +hc keybind Mod4-Shift-Control-g spawn aty -e ranger ~/games +hc keybind Mod4-Shift-Control-i spawn aty -e ranger ~/images +hc keybind Mod4-Shift-Control-m spawn aty -e ranger ~/music +hc keybind Mod4-Shift-Control-n spawn aty -e ranger ~/documents/manga +hc keybind Mod4-Shift-Control-p spawn aty -e ranger ~/projects +hc keybind Mod4-Shift-Control-s spawn aty -e ranger ~/desktop +hc keybind Mod4-Shift-Control-r spawn aty -e ranger ~/work +hc keybind Mod4-Shift-Control-t spawn aty -e ranger ~/thcool +hc keybind Mod4-Shift-Control-v spawn aty -e ranger ~/videos +hc keybind Mod4-Shift-Control-w spawn aty -e ranger ~/projects/writing # grab colour to clipboard hc keybind Mod4-c spawn ~/.config/herbstluftwm/colourgrab.sh # spawn -hc keybind Mod4-Return spawn ~/.config/herbstluftwm/alacritty.sh +hc keybind Mod4-Return spawn aty hc keybind Mod4-Shift-f spawn firejail --netfilter=/etc/firejail/nolocal.net firefox hc keybind Mod4-Shift-g spawn gimp hc keybind Mod4-Shift-i spawn krita hc keybind Mod4-Shift-m spawn ~/.config/herbstluftwm/kanjidraw.sh -hc keybind Mod4-Shift-n spawn ~/.config/herbstluftwm/alacritty.sh -t "notes" -e pass edit notes +hc keybind Mod4-Shift-n spawn aty -t "notes" -e pass edit notes hc keybind Mod4-Shift-o spawn ~/yolo/tor/start-tor-browser hc keybind Mod4-Shift-s spawn inkscape -hc keybind Mod4-Shift-r spawn ~/.config/herbstluftwm/alacritty.sh -t "recall" -e pass edit recall +hc keybind Mod4-Shift-r spawn aty -t "recall" -e pass edit recall hc keybind Mod4-Shift-t spawn transmission-gtk -hc keybind Mod4-Shift-v spawn ~/.config/herbstluftwm/alacritty.sh -e $EDITOR -hc keybind Mod4-Shift-w spawn ~/.config/herbstluftwm/alacritty.sh -t "weechat" -e weechat +hc keybind Mod4-Shift-v spawn aty -e $EDITOR +hc keybind Mod4-Shift-w spawn aty -t "weechat" -e weechat # dmenu hc keybind Mod4-r spawn dmenu_run -fn "${bfont}:size=${bfont_size}" \ diff --git a/.config/herbstluftwm/mpc-status.sh b/.config/herbstluftwm/mpc-status.sh index f1c8130..221b0a9 100755 --- a/.config/herbstluftwm/mpc-status.sh +++ b/.config/herbstluftwm/mpc-status.sh @@ -15,12 +15,12 @@ esac mpc status >/dev/null 2>&1 if [[ $? -ne 0 ]]; then - dunstify -r 109112100 "mpd disconnected" + dunstify -h string:x-dunst-stack-tag:mpd "mpd disconnected" exit fi if [[ -z $(mpc status | grep -E '\[(playing|paused)\]') ]]; then - dunstify -r 109112100 "mpd stopped" + dunstify -h string:x-dunst-stack-tag:mpd "mpd stopped" exit fi @@ -30,4 +30,4 @@ message="$(mpc current -f '##%track% %title% (%date%)\n%artist% - %album%') $(mpc status | tail -n -2 | sed -re 's/volume.*repeat/\nrepeat/' -e 's/( ){3,4}/\n/g' -e '/volume: /d')" -dunstify -t 4000 -r 109112100 --icon="$HOME/music/$dir/cover-small.png" $message +dunstify -t 4000 -h string:x-dunst-stack-tag:mpd --icon="$HOME/music/$dir/cover-small.png" $message diff --git a/.config/herbstluftwm/pvol.sh b/.config/herbstluftwm/pvol.sh index 8d5984e..4d08ff1 100755 --- a/.config/herbstluftwm/pvol.sh +++ b/.config/herbstluftwm/pvol.sh @@ -18,4 +18,4 @@ esac pactl get-sink-volume @DEFAULT_SINK@ | sed -e N -e 's/\n//g' -e 's/.* \([0-9]\{1,2\}%\).*/\1/' } | read body -dunstify -r 118111108 $body +dunstify -h string:x-dunst-stack-tag:pvol $body diff --git a/.config/init/funcs/srcopen b/.config/init/funcs/srcopen index f4bd773..46fec5f 100755 --- a/.config/init/funcs/srcopen +++ b/.config/init/funcs/srcopen @@ -21,9 +21,11 @@ search_map=( "elixir" "\.(ex|exs)" "go" "\.go" "html" "\.(html|xhtml)" + "lua" "\.lua" "markdown" "\.md" "ocaml" "\.(ml|mli)" - "js" "\.js" + "js" "\.(js|jsx)" + "shell" "\.sh" "tex" "\.tex" "vim" "\.vim" ) diff --git a/.config/init/gen/cava.sh b/.config/init/gen/cava.sh new file mode 100644 index 0000000..42efe1b --- /dev/null +++ b/.config/init/gen/cava.sh @@ -0,0 +1,14 @@ +echo "\ +[input] +method = pulse +source = auto + +[color] +gradient = 1 +gradient_color_1 = '$std_blue' +gradient_color_2 = '$std_cyan' +gradient_color_3 = '$std_green' +gradient_color_4 = '$std_yellow' +gradient_color_5 = '$std_red' +gradient_color_6 = '$std_magenta' +" > $tmpdir/cava diff --git a/.config/init/gen/dunstrc.sh b/.config/init/gen/dunstrc.sh index 99a7993..d436954 100644 --- a/.config/init/gen/dunstrc.sh +++ b/.config/init/gen/dunstrc.sh @@ -5,7 +5,7 @@ echo "\ width = (0, 1000) # height = 300 origin = top-right - offset = 4x$(($bheight + 4)) + offset = (4, $(($bheight + 4))) scale = 0 notification_limit = 0 progress_bar = true diff --git a/.config/qmk_firmware/keyboards/keebio/nyquist/keymaps/ageha/keymap.c b/.config/qmk_firmware/keyboards/keebio/nyquist/keymaps/ageha/keymap.c index 48ef150..8b1f82c 100644 --- a/.config/qmk_firmware/keyboards/keebio/nyquist/keymaps/ageha/keymap.c +++ b/.config/qmk_firmware/keyboards/keebio/nyquist/keymaps/ageha/keymap.c @@ -4,6 +4,7 @@ #define _QWERTY 1 #define _FN 2 #define _MOUSE 3 +#define _NUMPAD 4 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -91,17 +92,40 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), +/* NUMPAD + * ,------------------------------------------ ------------------------------------------. + * | | | / | * | Bksp | | | | | | | | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | 7 | 8 | 9 | + | | | | | | | | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | 4 | 5 | 6 | - | | | | | | | | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | 1 | 2 | 3 |Enter | | | | | | | | | + * |------+------+------+------+------+------+ +------+------+------+------+------+------| + * | | 0 | | . | | | | | | | | + * `------------------------------------------ ------------------------------------------' + */ +[_NUMPAD] = LAYOUT( + _______, _______, KC_PSLS, KC_PAST, KC_BSPC, _______, _______, _______, _______, _______, _______, _______, + _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, + _______, KC_P4, KC_P5, KC_P6, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, + _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, _______, _______, + _______, KC_P0, _______, KC_PDOT, _______, _______, _______, _______, _______, _______, _______, _______ +), + }; const uint16_t PROGMEM combo_qwerty[] = { KC_LCTL, KC_RCTL, COMBO_END }; const uint16_t PROGMEM combo_fn[] = { KC_LALT, KC_RALT, COMBO_END }; const uint16_t PROGMEM combo_mouse[] = { KC_LSFT, KC_RSFT, COMBO_END }; +const uint16_t PROGMEM combo_numpad[] = { KC_TAB, KC_BSPC, COMBO_END }; combo_t key_combos[] = { COMBO(combo_qwerty, TG(_QWERTY)), COMBO(combo_fn, TG(_FN)), COMBO(combo_mouse, TG(_MOUSE)), + COMBO(combo_numpad, TG(_NUMPAD)), }; uint16_t COMBO_LEN = sizeof(key_combos) / sizeof(combo_t); diff --git a/.config/ranger/rifle.conf b/.config/ranger/rifle.conf index 08d6aee..9000b3a 100644 --- a/.config/ranger/rifle.conf +++ b/.config/ranger/rifle.conf @@ -51,11 +51,13 @@ ext 1|2|3|4|5|6|7|8|9 = man "$@" # editor for text files mime ^text, label editor = "$EDITOR" -- "$@" -mime ^text, label weditor X, flag f t = "$EDITOR" -- "$@" +mime ^text, label weditor, X, flag f t = "$EDITOR" -- "$@" !mime ^text, ext xml|html|xhtml|csv|tex|py|pl|rb|sh|php = "$EDITOR" -- "$@" !mime ^text, ext xml|html|xhtml|csv|tex|py|pl|rb|sh|php, X, flag f t = "$EDITOR" -- "$@" +ext srt|ass, has aegisub, X, flag f = aegisub -- "$@" + # websites ext x?html?, has firefox, X, flag f = firefox -- "$@" ext x?html?, has qutebrowser, X, flag f = qutebrowser -- "$@" @@ -74,14 +76,14 @@ ext php, hash php = php -- "$1" # audio / video mime ^audio, terminal, has mpv = mpv --no-video -- "$@" -mime ^audio, !terminal, has mpv, X, flag f = mpv --force-window=yes -- "$@" +mime ^audio, !terminal, has mpv, X, flag f = mpv --force-window -- "$@" mime ^audio, terminal, has audio-convert = audio-convert -d converted -c vorbis -q 10 "$@" mime ^audio, terminal, has audio-convert = audio-convert -d converted -m true -c opus "$@" mime ^audio, terminal, has audio-concat = audio-concat -o concatenated.opus "$@" mime ^audio, terminal, has audio-concat = audio-concat -o concatenated.flac "$@" -mime ^video, has mpv, X, flag f = mpv -- "$@" +mime ^video, has mpv, X, flag f = mpv --force-window -- "$@" mime ^video, has mpv, terminal, !X = mpv --vo=tct -- "$@" # documents @@ -89,7 +91,7 @@ ext djvu|pdf|ps, has zathura, X, flag f = zathura -- "$@" ext djvu|pdf, has evince, X, flag f = evince -- "$@" ext djvu|pdf, has inkscape, X, flag f = inkscape -- "$@" -ext epub, has bk, flag f = alacritty -o "font.size=12" -e bk "$@" +ext epub, has bk, flag f = "$TERMCMD" -o "font.size=12" -e bk "$@" ext epub, has foliate, X, flag f = foliate -- "$@" ext epub, has calibre, X, flag f = calibre -- "$@" ext epub, has sigil, X, flag f = sigil "$@" diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add index 197a757..d17b1d6 100644 --- a/.vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -233,6 +233,7 @@ polyploid polyploidy polysemy poset +predates preemptive proactively projectives @@ -4,7 +4,9 @@ source "$HOME/.config/init/vars" ################# SET TERMCMD ################# -if [[ ! -z $(whence alacritty) ]] then +if [[ ! -z $(whence aty) ]] then + export TERMCMD=aty +elif [[ ! -z $(whence alacritty) ]] then export TERMCMD=alacritty elif [[ ! -z $(whence urxvt) ]] then export TERMCMD=urxvt |