diff options
| -rwxr-xr-x | Scripts/.config/Scripts/autostart.sh | 8 | ||||
| -rwxr-xr-x | Scripts/.config/Scripts/setbg | 11 | ||||
| -rwxr-xr-x | Scripts/.config/Scripts/wp | 2 | ||||
| -rwxr-xr-x | bspwm/.config/bspwm/bspwmrc | 7 | ||||
| -rw-r--r-- | bspwm/.config/sxhkd/sxhkdrc_bspwm | 6 | ||||
| -rw-r--r-- | fonts/.config/fontconfig/fonts.conf | 66 | ||||
| -rw-r--r-- | music/.config/mpd/state | 89 | ||||
| -rw-r--r-- | polybar/.config/polybar/mybar | 3 | ||||
| -rw-r--r-- | profile/.profile | 3 | ||||
| -rw-r--r-- | rofi/.config/rofi/config | 2 | ||||
| -rw-r--r-- | st/st/config.h | 15 | ||||
| -rwxr-xr-x | st/st/st | bin | 115704 -> 115704 bytes | |||
| -rw-r--r-- | st/st/st.c | 11 | ||||
| -rw-r--r-- | st/st/st.h | 1 | ||||
| -rw-r--r-- | st/st/x.c | 4 | ||||
| -rw-r--r-- | sxhkd/.config/sxhkd/sxhkdrc | 2 | ||||
| -rw-r--r-- | zsh/.zshrc | 3 |
17 files changed, 165 insertions, 68 deletions
diff --git a/Scripts/.config/Scripts/autostart.sh b/Scripts/.config/Scripts/autostart.sh index 99d7299..ea4d60b 100755 --- a/Scripts/.config/Scripts/autostart.sh +++ b/Scripts/.config/Scripts/autostart.sh @@ -14,17 +14,19 @@ function run { setxkbmap -layout us -variant altgr-intl -option caps:escape xmodmap -e "keycode 135 = Super_R" xset s off -dpms +run dunst run mpd run nm-applet run compton -run wal -i ~/.config/wall1.jpg +#run wal -i ~/.config/wall1.jpg +run setbg ~/.config/wall.png run synclient TouchpadOff=1 run /usr/bin/xflux -l 43.6404 -g -79.3995 run st -c email -e neomutt -run vivaldi-stable +run brave run keepassxc amixer -c 0 set Headphone 100% unmute -#run dropbox +run dropbox # WM specific if [ $GDMSESSION == "dwm" ]; diff --git a/Scripts/.config/Scripts/setbg b/Scripts/.config/Scripts/setbg index 2487072..5637ca0 100755 --- a/Scripts/.config/Scripts/setbg +++ b/Scripts/.config/Scripts/setbg @@ -8,14 +8,11 @@ # directory as a wallpaper. Be careful that the directory only has images. -WALLPAPER_HOME="$HOME/Pictures/plasma_wal_hack" +WALLPAPER_HOME="$HOME/.config/wall.png" -[ -f "$1" ] && rm -f $WALLPAPER_HOME/* && cp "$1" "$WALLPAPER_HOME" && notify-send -i "$WALLPAPER_HOME/$1" "Wallpaper changed." +[ -f "$1" ] && cp "$1" "$WALLPAPER_HOME" && notify-send -i "$WALLPAPER_HOME" "Wallpaper changed." -[ -d "$1" ] && rm -f $WALLPAPER_HOME/* && cp "$(find "$1" -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -type f | shuf -n 1)" "$WALLPAPER_HOME" && notify-send -i "$WALLPAPER_HOME/$1" "Random Wallpaper chosen." +[ -d "$1" ] && cp "$(find "$1" -name "*.jpg" -o -name "*.jpeg" -o -name "*.png" -type f | shuf -n 1)" "$WALLPAPER_HOME" && notify-send -i "$WALLPAPER_HOME" "Random Wallpaper chosen." # If pywal is installed, use it. -type wal >/dev/null 2>&1 && { wal -c - wal -i "$WALLPAPER_HOME/$i" -n - xsetroot -name "fsignal:xrdb" & } >/dev/null 2>&1 - +wal -c && wal -i "$WALLPAPER_HOME" diff --git a/Scripts/.config/Scripts/wp b/Scripts/.config/Scripts/wp index e36b9e0..bc2ca6d 100755 --- a/Scripts/.config/Scripts/wp +++ b/Scripts/.config/Scripts/wp @@ -1,4 +1,4 @@ #!/bin/sh -find $HOME/Pictures/wallpapers -type f | shuf | sxiv - +find $HOME/Downloads/wallpapers -type f | shuf | sxiv - diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 6110295..df75c57 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -15,8 +15,8 @@ else bspc monitor LVDS-1 -d 1 2 3 4 5 6 7 8 9 10 fi -bspc config border_width 0 -bspc config window_gap 0 +bspc config border_width 3 +bspc config window_gap 3 bspc config split_ratio 0.52 bspc config borderless_monocle true @@ -30,7 +30,8 @@ bspc rule -a Gimp desktop='5' state=floating follow=on bspc rule -a Chromium desktop='10' bspc rule -a Firefox desktop='10' bspc rule -a Vivaldi-stable desktop='10' -bspc rule -a keepassxc desktop='4' +bspc rule -a Brave-browser desktop='10' +bspc rule -a KeePassXC desktop='4' bspc rule -a Zathura state=tiled bspc rule -a dropdown sticky=on state=floating hidden=on bspc rule -a math sticky=on state=floating hidden=on diff --git a/bspwm/.config/sxhkd/sxhkdrc_bspwm b/bspwm/.config/sxhkd/sxhkdrc_bspwm index df43c44..8b4bd17 100644 --- a/bspwm/.config/sxhkd/sxhkdrc_bspwm +++ b/bspwm/.config/sxhkd/sxhkdrc_bspwm @@ -18,13 +18,13 @@ alt + {t,shift + t,shift + f,f} alt + {Escape,semicolon} bspc desktop -f {prev,next}.occupied -# focus the node in the given direction +# focus/swap the node in the given direction alt + {_,shift + }{h,j,k,l} bspc node -{f,s} {west,south,north,east} # focus the next/previous window in the current desktop -alt + super + {j,k} - bspc node -f {prev,next}.local +alt + {_,shift} + n + bspc node -f {next,prev}.local # expand a window by moving one of its side outward alt + ctrl + {h,j,k,l} diff --git a/fonts/.config/fontconfig/fonts.conf b/fonts/.config/fontconfig/fonts.conf index 048d188..2d58803 100644 --- a/fonts/.config/fontconfig/fonts.conf +++ b/fonts/.config/fontconfig/fonts.conf @@ -1,39 +1,35 @@ <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> - <alias> - <family>serif</family> - <prefer> - <family>Linux Libertine</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>Linux Biolinum</family> - </prefer> - </alias> - <alias> - <family>sans</family> - <prefer> - <family>Linux Biolinum</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>Inconsolata</family> - </prefer> - </alias> - <dir>~/.fonts</dir> - <match target="font"> - <edit name="hinting" mode="assign"> - <bool>true</bool> - </edit> - </match> - <match target="font"> - <edit name="hintstyle" mode="assign"> - <const>hintslight</const> - </edit> - </match> + <alias> + <family>serif</family> + <prefer> + <family>Linux Libertine</family> + <family>Joy Pixels</family> + <family>Noto Color Emoji</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> + <family>Linux Biolinum</family> + <family>Joy Pixels</family> + <family>Noto Color Emoji</family> + </prefer> + </alias> + <alias> + <family>sans</family> + <prefer> + <family>Linux Biolinum</family> + <family>Joy Pixels</family> + <family>Noto Color Emoji</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> + <family>Noto Sans Mono</family> + <family>Liberation Mono</family> + </prefer> + </alias> </fontconfig> diff --git a/music/.config/mpd/state b/music/.config/mpd/state index 9088395..b7eeb76 100644 --- a/music/.config/mpd/state +++ b/music/.config/mpd/state @@ -1,9 +1,7 @@ sw_volume: 100 audio_device_state:1:mpd alsamixer-output audio_device_state:1:toggle_visualizer -state: pause -current: 1 -time: 5.281000 +state: stop random: 0 repeat: 0 single: 0 @@ -14,4 +12,89 @@ mixrampdelay: -1.000000 playlist_begin 0:newSchool/A$AP ROCKY - F_kin' Problems ft. Drake, 2 Chainz, Kendrick Lamar-liZm1im2erU.mp3 1:Balmorhea/Balmorhea - March 4, 1831.mp3 +2:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/09 and i love her.mp3 +3:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/14 can't buy me love.mp3 +4:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/24 i'll be back.mp3 +5:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/09 and i love her.mp3 +6:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/14 can't buy me love.mp3 +7:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/24 i'll be back.mp3 +8:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/01 come together.mp3 +9:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/16 here comes the sun.mp3 +10:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/25 she came through the bathroom window.mp3 +11:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/27 golden slumbers.mp3 +12:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/28 ob la di ob la da.mp3 +13:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/30 while my guitar gently weeps.mp3 +14:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/06 no reply.mp3 +15:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/08 rock and roll music.mp3 +16:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/18 eight days a week.mp3 +17:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/03 help!.mp3 +18:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/13 your going to lose that girl.mp3 +19:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/17 ticket to ride.mp3 +20:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/26 yesterday.mp3 +21:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/23 get back.mp3 +22:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/05 magical mystery tour.mp3 +23:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/11 i am the walrus.mp3 +24:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/15 hello goodbye.mp3 +25:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/20 strawberry fields forever.mp3 +26:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/22 penny lane.mp3 +27:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/29 i wanna hold your hand.mp3 +28:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/31 long tall sally.mp3 +29:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/32 lady madonna.mp3 +30:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/33 hey jude.mp3 +31:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/34 revolution.mp3 +32:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/35 don't let me down.mp3 +33:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/36 the ballad of john and yoko.mp3 +34:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/37 let it be.mp3 +35:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/04 i saw her standing there.mp3 +36:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/19 love me do.mp3 +37:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/21 p.s i love you.mp3 +38:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/12 yellow subarine.mp3 +39:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/02 drive my car.mp3 +40:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/38 sgt. peppers lonely hearts club band.mp3 +41:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/39 with a little help from my friends.mp3 +42:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/40 sgt peppers lonely hearts club band (reprise).mp3 +43:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/41 a day in the life.mp3 +44:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/07 all my loving.mp3 +45:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/10 all you need is love.mp3 +46:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/09 and i love her.mp3 +47:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/14 can't buy me love.mp3 +48:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/24 i'll be back.mp3 +49:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/01 come together.mp3 +50:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/16 here comes the sun.mp3 +51:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/25 she came through the bathroom window.mp3 +52:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/27 golden slumbers.mp3 +53:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/28 ob la di ob la da.mp3 +54:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/30 while my guitar gently weeps.mp3 +55:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/06 no reply.mp3 +56:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/08 rock and roll music.mp3 +57:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/18 eight days a week.mp3 +58:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/03 help!.mp3 +59:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/13 your going to lose that girl.mp3 +60:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/17 ticket to ride.mp3 +61:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/26 yesterday.mp3 +62:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/23 get back.mp3 +63:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/05 magical mystery tour.mp3 +64:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/11 i am the walrus.mp3 +65:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/15 hello goodbye.mp3 +66:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/20 strawberry fields forever.mp3 +67:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/22 penny lane.mp3 +68:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/29 i wanna hold your hand.mp3 +69:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/31 long tall sally.mp3 +70:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/32 lady madonna.mp3 +71:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/33 hey jude.mp3 +72:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/34 revolution.mp3 +73:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/35 don't let me down.mp3 +74:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/36 the ballad of john and yoko.mp3 +75:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/37 let it be.mp3 +76:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/04 i saw her standing there.mp3 +77:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/19 love me do.mp3 +78:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/21 p.s i love you.mp3 +79:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/12 yellow subarine.mp3 +80:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/02 drive my car.mp3 +81:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/38 sgt. peppers lonely hearts club band.mp3 +82:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/39 with a little help from my friends.mp3 +83:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/40 sgt peppers lonely hearts club band (reprise).mp3 +84:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/41 a day in the life.mp3 +85:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/07 all my loving.mp3 +86:the Beatles/The Beatles [2009] Greatest Hits CDRip [Remastered][Bubanee]/10 all you need is love.mp3 playlist_end diff --git a/polybar/.config/polybar/mybar b/polybar/.config/polybar/mybar index d9fdcb6..64a3edd 100644 --- a/polybar/.config/polybar/mybar +++ b/polybar/.config/polybar/mybar @@ -74,7 +74,8 @@ font-2 = siji:pixelsize=14;1 modules-left = mpd modules-center = bspwm i3 date -modules-right = filesystem pulseaudio memory wlan eth battery +modules-right = filesystem pulseaudio memory eth battery +;modules-right = filesystem pulseaudio memory wlan eth battery tray-position = right tray-padding = 1 diff --git a/profile/.profile b/profile/.profile index e529e31..798b0eb 100644 --- a/profile/.profile +++ b/profile/.profile @@ -1,7 +1,8 @@ export PATH=$PATH:$HOME/.config/Scripts export XDG_CONFIG_HOME="$HOME/.config" #export BROWSER="firefox" -export BROWSER="vivaldi-stable" +#export BROWSER="vivaldi-stable" +export BROWSER="brave" export EDITOR="nvim" export TERMINAL="st" export READER="zathura" diff --git a/rofi/.config/rofi/config b/rofi/.config/rofi/config index 12028fc..3ca2bbd 100644 --- a/rofi/.config/rofi/config +++ b/rofi/.config/rofi/config @@ -5,7 +5,7 @@ rofi.color-active: #002b37, #008ed4, #003643, #008ed4, #66c6ff rofi.color-urgent: #002b37, #da4281, #003643, #008ed4, #890661 rofi.fake-transparency: true -rofi.lines: 3 +rofi.lines: 10 rofi.bw: 0 rofi.opacity: "10" rofi.hide-scrollbar: true diff --git a/st/st/config.h b/st/st/config.h index 6ee8ea9..0c2115b 100644 --- a/st/st/config.h +++ b/st/st/config.h @@ -53,6 +53,13 @@ static unsigned int actionfps = 30; static unsigned int blinktimeout = 800; /* + * interval (in milliseconds) between each successive call to ximspot. This + * improves terminal performance while not reducing functionality to those + * whom need XIM support. + */ +int ximspot_update_interval = 1000; + +/* * thickness of underline and bar cursors */ static unsigned int cursorthickness = 2; @@ -187,6 +194,7 @@ ResourcePref resources[] = { { "cwscale", FLOAT, &cwscale }, { "chscale", FLOAT, &chscale }, { "alpha", FLOAT, &alpha }, + { "ximspot_update_interval", INTEGER, &ximspot_update_interval }, }; /* @@ -214,11 +222,11 @@ MouseKey mkeys[] = { }; static char *openurlcmd[] = { "/bin/sh", "-c", - "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)'| uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -i -p 'Follow which url?' -l 10 | xargs -r xdg-open", + "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)'| uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -w $(xdotool getactivewindow) -i -p 'Follow which url?' -l 10 | xargs -r xdg-open", "externalpipe", NULL }; static char *copyurlcmd[] = { "/bin/sh", "-c", - "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", + "sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@&%?$#=_-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' | dmenu -w $(xdotool getactivewindow) -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", "externalpipe", NULL }; static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL }; @@ -232,10 +240,9 @@ static Shortcut shortcuts[] = { { TERMMOD, XK_Prior, zoom, {.f = +1} }, { TERMMOD, XK_Next, zoom, {.f = -1} }, { MODKEY, XK_Home, zoomreset, {.f = 0} }, - { ShiftMask, XK_Insert, clippaste, {.i = 0} }, { MODKEY, XK_c, clipcopy, {.i = 0} }, + { ShiftMask, XK_Insert, clippaste, {.i = 0} }, { MODKEY, XK_v, clippaste, {.i = 0} }, - { MODKEY, XK_p, selpaste, {.i = 0} }, { XK_ANY_MOD, Button2, selpaste, {.i = 0} }, { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, { MODKEY, XK_Control_L, iso14755, {.i = 0} }, Binary files differ@@ -14,6 +14,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <termios.h> +#include <time.h> #include <unistd.h> #include <wchar.h> @@ -142,6 +143,7 @@ typedef struct { int charset; /* current charset */ int icharset; /* selected charset for sequence */ int *tabs; + struct timespec last_ximspot_update; } Term; /* CSI Escape sequence structs */ @@ -1056,6 +1058,7 @@ void tnew(int col, int row) { term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; + clock_gettime(CLOCK_MONOTONIC, &term.last_ximspot_update); tresize(col, row); treset(); } @@ -2744,7 +2747,13 @@ draw(void) term.ocx, term.ocy, term.line[term.ocy][term.ocx]); term.ocx = cx, term.ocy = term.c.y; xfinishdraw(); - xximspot(term.ocx, term.ocy); + + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + if (ximspot_update_interval && TIMEDIFF(now, term.last_ximspot_update) > ximspot_update_interval) { + xximspot(term.ocx, term.ocy); + term.last_ximspot_update = now; + } } void @@ -133,3 +133,4 @@ extern unsigned int defaultfg; extern unsigned int defaultbg; extern float alpha; extern MouseKey mkeys[]; +extern int ximspot_update_interval; @@ -661,8 +661,6 @@ setsel(char *str, Time t) XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) selclear(); - - clipcopy(NULL); } void @@ -680,7 +678,7 @@ brelease(XEvent *e) } if (e->xbutton.button == Button2) - clippaste(NULL); + selpaste(NULL); else if (e->xbutton.button == Button1) mousesel(e, 1); } diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index e4d33f6..bb86783 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -9,7 +9,7 @@ super + e $TERMINAL -n email -e neomutt super + r - $TERMINAL -e ranger + $TERMINAL -e lf super + shift + r pcmanfm @@ -148,7 +148,8 @@ alias mkd="mkdir -pv" alias yt="youtube-dl -ic" alias yta="youtube-dl -xic" -alias youtube-mp3="youtube-dl --extract-audio --audio-format mp3 --audio-quality 320k -o '~/Music/recent/%(title)s.%(ext)s'" +alias youtube-mp3="youtube-dl -i --playlist-end 10 --restrict-filenames --extract-audio --audio-format mp3 --audio-quality 320k -o '~/Music/recent/%(autonumber)s-%(title)s.%(ext)s'" +#alias youtube-mp3="youtube-dl --extract-audio --audio-format mp3 --audio-quality 320k -o '~/Music/recent/%(title)s.%(ext)s'" #alias youtube-mp3="youtube-dl -t --extract-audio --audio-format mp3 --audio-quality 320k" alias youtube-video="youtube-dl -i --no-mtime --prefer-free-formats -c -o '~/Videos/recent/%(title)s.%(ext)s'" |