From ebae3707b36e9a83014ef08271d75bd9826bb999 Mon Sep 17 00:00:00 2001 From: ensa Date: Thu, 16 Sep 2021 17:37:41 -0700 Subject: organization and replacements, fixes bin/ bother, mbsync-cron, rsschk: notify-send switched to notif catgirl-open.sh: simplified comm-sel: removed cordless kbsetup: sets up keyboard stuff lh: cleanup added mov and wav support audio files now create a terminal mpv notif: sends notification to xnotify config/ X11/ xprofile: replaced keyboard lines with kbsetup replaced dunst with xnotify/tiramisu added a line for cleaning up catgirl-open.sh xresources: xnotify resources betteresc: xmodmap file for easy-to-access hyper key color/colors.sh: cleaned up dunst/dunstrc: removed lf/lfrc: fixed prompt replaced notify-send with notif shrc: moved MEDNAFEN_HOME to $HOME_EXT vis/visrc.lua: add ctags, fix hyper|esc issue --- config/X11/xprofile | 18 ++++++---- config/X11/xresources | 9 +++++ config/betteresc | 2 ++ config/color/colors.sh | 36 ++++++++++---------- config/dunst/dunstrc | 91 -------------------------------------------------- config/lf/lfrc | 4 +-- config/ncmpcpp/config | 2 +- config/shrc | 2 +- config/vis/visrc.lua | 2 ++ 9 files changed, 47 insertions(+), 119 deletions(-) create mode 100644 config/betteresc delete mode 100644 config/dunst/dunstrc (limited to 'config') diff --git a/config/X11/xprofile b/config/X11/xprofile index eb89ed0..058f55b 100644 --- a/config/X11/xprofile +++ b/config/X11/xprofile @@ -2,25 +2,31 @@ . $HOME/etc/shrc # set caps to escape when pressed and super when held # also sets dvorak programmer layout -setxkbmap -option caps:super -layout us -variant dvp && xcape -e 'Super_L=Escape' +kbsetup ## detect if laptop has other display connected, kills builtin if so #[ $(xrandr -q|grep -cE '^(DP|VGA|HDMI)-[[:digit:]] connected') -gt 0 ] && monitor # disables the beeper xset b off -# increases kbd repeat on hold -xset r rate 300 50 # enables x colorscheme xrdb -load $HOME_ETC/X11/xresources # set background xbg & # notification daemon -dunst & +# setup xnotify +export XNOTIFY_FIFO="$HOME_CACHE/xnotify$DISPLAY.fifo" +rm -f $XNOTIFY_FIFO +mkfifo $XNOTIFY_FIFO +xnotify 0<>$XNOTIFY_FIFO & +# start tiramisu +tiramisu -j | jq --raw-output --unbuffered '.summary + "\t" + .body' > $XNOTIFY_FIFO & +# status bar +bar.sh & # mouse vanishes when typing xbanish & # activate mpd scrobbler mpdas -c $HOME_ETC/mpdasrc & -# status bar -bar.sh & # remind user of important tasks bother & +# cleanup tabbed +rm $HOME_CACHE/catgirl/tabbed-catgirl.xid diff --git a/config/X11/xresources b/config/X11/xresources index a56f91c..e7a69b2 100644 --- a/config/X11/xresources +++ b/config/X11/xresources @@ -50,6 +50,7 @@ ! XTerm config. xterm*termName: xterm-16color xterm*metaSendsEscape: true +xterm*font: -xos4-terminus-medium-r-normal--12-120-72-72-c-60-iso10646-1 xterm*faceName: Hermit:style=regular:size=10 xterm*cursorColor: curs xterm*boldMode: false @@ -86,3 +87,11 @@ Sxiv*foreground: fg ! xlock settings XLock.mode: random XLock.font: -*-terminus-medium-r-*--12-*-*-*-*-*-iso10646-1 + +! xnotify settings +xnotify.title.font: Hermit:style=bold:size=10 +xnotify.body.font: Hermit:style=regular:size=10 +xnotify.border: ligreen +xnotify.geometry: -10+23 +xnotify.gravity: NE +xnotify.alignment: right diff --git a/config/betteresc b/config/betteresc new file mode 100644 index 0000000..3c84ed1 --- /dev/null +++ b/config/betteresc @@ -0,0 +1,2 @@ +keycode 9 = Hyper_L +keycode any = Escape diff --git a/config/color/colors.sh b/config/color/colors.sh index 7fbb314..dd8c49a 100755 --- a/config/color/colors.sh +++ b/config/color/colors.sh @@ -1,22 +1,22 @@ #!/bin/sh TMP=$(mktemp) xrdb -query>$TMP -foreground=$(grep -F '*foreground:' < $TMP | cut -f 2 | head -1) -background=$(grep -F '*background:' < $TMP | cut -f 2 | head -1) -color0=$(grep -F '*color0:' < $TMP | cut -f 2 | head -1) -color1=$(grep -F '*color1:' < $TMP | cut -f 2 | head -1) -color2=$(grep -F '*color2:' < $TMP | cut -f 2 | head -1) -color3=$(grep -F '*color3:' < $TMP | cut -f 2 | head -1) -color4=$(grep -F '*color4:' < $TMP | cut -f 2 | head -1) -color5=$(grep -F '*color5:' < $TMP | cut -f 2 | head -1) -color6=$(grep -F '*color6:' < $TMP | cut -f 2 | head -1) -color7=$(grep -F '*color7:' < $TMP | cut -f 2 | head -1) -color8=$(grep -F '*color8:' < $TMP | cut -f 2 | head -1) -color9=$(grep -F '*color9:' < $TMP | cut -f 2 | head -1) -color10=$(grep -F '*color10:' < $TMP | cut -f 2 | head -1) -color11=$(grep -F '*color11:' < $TMP | cut -f 2 | head -1) -color12=$(grep -F '*color12:' < $TMP | cut -f 2 | head -1) -color13=$(grep -F '*color13:' < $TMP | cut -f 2 | head -1) -color14=$(grep -F '*color14:' < $TMP | cut -f 2 | head -1) -color15=$(grep -F '*color15:' < $TMP | cut -f 2 | head -1) +foreground=$(grep -F -m 1 '*foreground:' < $TMP | cut -f 2) +background=$(grep -F -m 1 '*background:' < $TMP | cut -f 2) +color0=$(grep -F -m 1 '*color0:' < $TMP | cut -f 2) +color1=$(grep -F -m 1 '*color1:' < $TMP | cut -f 2) +color2=$(grep -F -m 1 '*color2:' < $TMP | cut -f 2) +color3=$(grep -F -m 1 '*color3:' < $TMP | cut -f 2) +color4=$(grep -F -m 1 '*color4:' < $TMP | cut -f 2) +color5=$(grep -F -m 1 '*color5:' < $TMP | cut -f 2) +color6=$(grep -F -m 1 '*color6:' < $TMP | cut -f 2) +color7=$(grep -F -m 1 '*color7:' < $TMP | cut -f 2) +color8=$(grep -F -m 1 '*color8:' < $TMP | cut -f 2) +color9=$(grep -F -m 1 '*color9:' < $TMP | cut -f 2) +color10=$(grep -F -m 1 '*color10:' < $TMP | cut -f 2) +color11=$(grep -F -m 1 '*color11:' < $TMP | cut -f 2) +color12=$(grep -F -m 1 '*color12:' < $TMP | cut -f 2) +color13=$(grep -F -m 1 '*color13:' < $TMP | cut -f 2) +color14=$(grep -F -m 1 '*color14:' < $TMP | cut -f 2) +color15=$(grep -F -m 1 '*color15:' < $TMP | cut -f 2) rm $TMP diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc deleted file mode 100644 index 3dd8610..0000000 --- a/config/dunst/dunstrc +++ /dev/null @@ -1,91 +0,0 @@ -[colors] - background = "#4c4635" - foreground = "#ccbc8e" - -[global] - ### Display ### - - monitor = 0 - follow = mouse - - geometry = "540x5-10+32" - indicate_hidden = yes - shrink = yes - transparency = 0 - notification_height = 0 - separator_height = 3 - padding = 12 - horizontal_padding = 12 - frame_width = 3 - - frame_color = "#8e991e" - separator_color = auto - sort = yes - idle_threshold = 120 - - ### Text ### - font = Hermit Regular 10 - line_height = 0 - - markup = full - - # The format of the message. Possible variables are: - # %a appname - # %s summary - # %b body - # %i iconname (including its path) - # %I iconname (without its path) - # %p progress value if set ([ 0%] to [100%]) or nothing - # %n progress value if set without any extra characters - # %% Literal % - # Markup is allowed - format = "%s \n%b" - alignment = left - show_age_threshold = 60 - word_wrap = yes - ellipsize = middle - ignore_newline = no - stack_duplicates = true - hide_duplicate_count = false - show_indicators = yes - - ### Icons ### - icon_position = off - - ### History ### - sticky_history = yes - history_length = 20 - - ### Misc/Advanced ### - dmenu = /usr/local/bin/dmenu -p dunst: - browser = /usr/local/bin/firefox -new-tab - always_run_script = true - title = Dunst - class = Dunst - startup_notification = false - force_xinerama = false - -[experimental] - per_monitor_dpi = false - -[shortcuts] - close = ctrl+space - close_all = ctrl+shift+space - context = ctrl+shift+period - -[urgency_low] - background = colors.background - foreground = colors.foreground - timeout = 10 - -[urgency_normal] - background = colors.background - foreground = colors.foreground - timeout = 10 - -[urgency_critical] - background = colors.background - foreground = colors.foreground - frame_color = "#cc3214" - timeout = 0 -# vim: ft=cfg diff --git a/config/lf/lfrc b/config/lf/lfrc index edefc84..2b2ff1f 100644 --- a/config/lf/lfrc +++ b/config/lf/lfrc @@ -3,13 +3,13 @@ set shell sh set shellopts '-eu' set ifs "\n" -set promptfmt "\033[1;31m%u\033[0;32m@\033[1;34m%h\033[0m\033[0;36m▐\033[7m%w/f\033[0;36m▍\033[0m" +set promptfmt "\033[1;31m%u\033[0;32m@\033[1;34m%h\033[0m\033[0;36m▐\033[7m%w/%f\033[0;36m▍\033[0m" # cmds cmd ttmsh ${{ TTMURL="$(curl -F 'file=@'$f https://ttm.sh)" if [ -n "$TTMURL" ]; then echo "$TTMURL"|tee "$HOME/ttmsh"|xclip -r - notify-send 'successfully uploaded to ttm!' 'link copied to selection, backup is in $HOME/ttmsh' + notif 'successfully uploaded to ttm!' 'link copied to selection, backup is in $HOME/ttmsh' fi }} diff --git a/config/ncmpcpp/config b/config/ncmpcpp/config index c19ea83..de62252 100644 --- a/config/ncmpcpp/config +++ b/config/ncmpcpp/config @@ -258,7 +258,7 @@ current_item_inactive_column_suffix = $/r$(end) ## Note: Custom command that will be executed each time song changes. Useful for ## notifications etc. ## -execute_on_song_change = "notify-send --expire-time=3500 "MPD: Now Playing" "$(mpc current)"" +execute_on_song_change = "notif -t mpd -s 3 "MPD: Now Playing" "$(mpc current)"" # ## ## Note: Custom command that will be executed each time player state diff --git a/config/shrc b/config/shrc index a85bbb7..d3b05fb 100644 --- a/config/shrc +++ b/config/shrc @@ -50,7 +50,7 @@ export GOCACHE="$HOME_CACHE/go" export GOBIN="$HOME_EXT_BIN" export CARGO_HOME="$HOME_EXT/rust" export PYTHONUSERBASE="$HOME_EXT/python" -export MEDNAFEN_HOME="$HOME_ETC/mednafen" +export MEDNAFEN_HOME="$HOME_EXT/mednafen" export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$HOME_ETC/java" export TERMINFO="$HOME_DATA/terminfo" export MAILCAPS="$HOME_ETC/mailcap" diff --git a/config/vis/visrc.lua b/config/vis/visrc.lua index d153cab..569e482 100644 --- a/config/vis/visrc.lua +++ b/config/vis/visrc.lua @@ -1,9 +1,11 @@ -- load standard vis module, providing parts of the Lua API require('vis') +require('ctags') vis.events.subscribe(vis.events.INIT, function() -- Your global configuration options vis:command('set theme causalagency') + vis:command('map insert ') end) vis.events.subscribe(vis.events.WIN_OPEN, function(win) -- cgit 1.4.1-2-gfad0