diff options
| -rw-r--r-- | Xdefaults | 2 | ||||
| -rw-r--r-- | bspwm/01-fix-polybar-rounding.patch | 97 | ||||
| -rwxr-xr-x | bspwm/deploy.sh | 5 | ||||
| -rwxr-xr-x | config/bspwm/bspwmrc | 11 | ||||
| -rw-r--r-- | config/gtk-3.0/bookmarks | 1 | ||||
| -rw-r--r-- | config/mimeapps.list | 4 | ||||
| -rw-r--r-- | config/polybar/config | 118 | ||||
| -rwxr-xr-x | config/polybar/launch.sh | 6 | ||||
| -rwxr-xr-x | config/sx/sxrc | 1 | ||||
| -rw-r--r-- | config/sxhkd/sxhkdrc | 3 | ||||
| -rw-r--r-- | profile | 2 | ||||
| -rwxr-xr-x | scripts/a | 10 | ||||
| -rwxr-xr-x | scripts/aa | 10 | ||||
| -rwxr-xr-x | scripts/color-test.sh | 19 | ||||
| -rwxr-xr-x | scripts/dmenukaomoji | 7 | ||||
| -rwxr-xr-x | scripts/memeselector | 6 | ||||
| -rwxr-xr-x | scripts/mpd-zscroll | 5 | ||||
| -rw-r--r-- | scripts/record_window_hd.sh | 19 | ||||
| -rwxr-xr-x | scripts/toggle-gap.sh | 2 | ||||
| -rwxr-xr-x | scripts/z | 10 | ||||
| -rw-r--r-- | sh_aliases | 4 | ||||
| -rwxr-xr-x | st/deploy.sh | 1 |
22 files changed, 285 insertions, 58 deletions
@@ -61,7 +61,7 @@ URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold,font4 URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic,font4 URxvt.boldItalicfont: font1:style=bolditalic,font2:style=bolditalic,font3:style=bolditalic,font4 -*.borderpx: 20 +*.borderpx: 32 URxvt.internalBorder: 20 *.cursorBlink: true URxvt.cursorUnderline: true diff --git a/bspwm/01-fix-polybar-rounding.patch b/bspwm/01-fix-polybar-rounding.patch new file mode 100644 index 0000000..c1eaba8 --- /dev/null +++ b/bspwm/01-fix-polybar-rounding.patch @@ -0,0 +1,97 @@ +diff --git a/src/tree.c b/src/tree.c +index 9e0a6dd..49c46bc 100644 +--- a/src/tree.c ++++ b/src/tree.c +@@ -82,6 +82,7 @@ void apply_layout(monitor_t *m, desktop_t *d, node_t *n, xcb_rectangle_t rect, x + draw_presel_feedback(m, d, n); + } + ++ + if (is_leaf(n)) { + unsigned int br = 0; + +@@ -136,7 +137,7 @@ void apply_layout(monitor_t *m, desktop_t *d, node_t *n, xcb_rectangle_t rect, x + + if (!rect_eq(r, cr)) { + window_move_resize(n->id, r.x, r.y, r.width, r.height); +- window_rounded_border(n); ++ window_rounded_border(n, br); + if (!grabbing) { + put_status(SBSC_MASK_NODE_GEOMETRY, "node_geometry 0x%08X 0x%08X 0x%08X %ux%u+%i+%i\n", m->id, d->id, n->id, r.width, r.height, r.x, r.y); + } +@@ -145,7 +146,7 @@ void apply_layout(monitor_t *m, desktop_t *d, node_t *n, xcb_rectangle_t rect, x + window_border_width(n->id, bw); + + n->client->drawn_border_radius = br; +- window_rounded_border(n); ++ window_rounded_border(n, br); + + } else { + xcb_rectangle_t first_rect; +diff --git a/src/window.c b/src/window.c +index 8058fa5..1931352 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -91,6 +91,8 @@ bool manage_window(xcb_window_t win, rule_consequence_t *csq, int fd) + free(csq->layer); + free(csq->state); + window_show(win); ++ node_t *n = make_node(win); ++ window_rounded_border(n, d->border_radius); + return false; + } + +@@ -229,7 +231,7 @@ bool manage_window(xcb_window_t win, rule_consequence_t *csq, int fd) + draw_border(n, false, (m == mon)); + } + +- window_rounded_border(n); ++ window_rounded_border(n, n->client->drawn_border_radius); + free(csq->layer); + free(csq->state); + +@@ -335,7 +337,7 @@ void draw_presel_feedback(monitor_t *m, desktop_t *d, node_t *n) + + window_move_resize(p->feedback, n->rectangle.x + presel_rect.x, n->rectangle.y + presel_rect.y, + presel_rect.width, presel_rect.height); +- window_rounded_border(n); ++ window_rounded_border(n, n->client->drawn_border_radius); + + if (!exists && m->desk == d) { + window_show(p->feedback); +@@ -429,12 +431,9 @@ void draw_border(node_t *n, bool focused_node, bool focused_monitor) + } + } + +-void window_rounded_border(node_t *n) ++void window_rounded_border(node_t *n, unsigned int radius) + { + xcb_window_t win = n->id; +- unsigned int radius = n->client->drawn_border_radius; +- +- if (n->client->sets_own_shape) return; + + // get geometry + xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply(dpy, xcb_get_geometry(dpy, win), NULL); +@@ -720,7 +719,7 @@ bool resize_client(coordinates_t *loc, resize_handle_t rh, int dx, int dy, bool + n->client->floating_rectangle = (xcb_rectangle_t) {x, y, width, height}; + if (n->client->state == STATE_FLOATING) { + window_move_resize(n->id, x, y, width, height); +- window_rounded_border(n); ++ window_rounded_border(n, n->client->drawn_border_radius); + + if (!grabbing) { + put_status(SBSC_MASK_NODE_GEOMETRY, "node_geometry 0x%08X 0x%08X 0x%08X %ux%u+%i+%i\n", loc->monitor->id, loc->desktop->id, loc->node->id, width, height, x, y); +diff --git a/src/window.h b/src/window.h +index 79805cb..77da863 100644 +--- a/src/window.h ++++ b/src/window.h +@@ -44,7 +44,7 @@ void hide_presel_feedbacks(monitor_t *m, desktop_t *d, node_t *n); + void update_colors(void); + void update_colors_in(node_t *n, desktop_t *d, monitor_t *m); + void draw_border(node_t *n, bool focused_node, bool focused_monitor); +-void window_rounded_border(node_t *n); ++void window_rounded_border(node_t *n, unsigned int radius); + void window_draw_border(xcb_window_t win, uint32_t border_color_pxl); + void adopt_orphans(void); + uint32_t get_border_color(bool focused_node, bool focused_monitor); diff --git a/bspwm/deploy.sh b/bspwm/deploy.sh index 65b9fd1..31e0ebf 100755 --- a/bspwm/deploy.sh +++ b/bspwm/deploy.sh @@ -5,9 +5,10 @@ wd="$HOME/.local/src/bspwm" [ ! -d "$HOME/.local/src" ] && mkdir -p "$wd" rm -rf "$wd" -git clone https://github.com/baskerville/bspwm "$wd" +git clone https://github.com/phuhl/bspwm-rounded "$wd" +git -C "$wd" checkout 8b6e8f065d5667728f4f58c06f4f65f790c04a66 -patch -d "$wd" -p1 -i $(realpath change_update_order.patch) +patch -d "$wd" -p1 -i $(realpath 01-fix-polybar-rounding.patch) make -C "$wd" doas make -C "$wd" install PREFIX=/usr diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 24a2743..c138806 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -29,6 +29,8 @@ for m in $(bspc query -M --names); do bspc monitor $m -d ${m}1 ${m}2 ${m}3 ${m}4 ${m}5 ${m}6 ${m}7 ${m}8 ${m}9 done +bspc config border_radius 16 + $HOME/.config/polybar/launch.sh & bspc config border_width $BORDER @@ -47,11 +49,10 @@ bspc config focused_border_color "$COLOR_PRIMARY" # fix java programs that get confused on a missing name property wmname LG3D +while ! pgrep dbus-daemon > /dev/null; do sleep 1; done -sleep 1 - -#pgrep -x pipewire > /dev/null || pipewire & -#pgrep -x pipewire-pulse > /dev/null || pipewire-pulse & -#pgrep -x wireplumber > /dev/null || wireplumber & +pgrep -x pipewire > /dev/null || pipewire & +pgrep -x pipewire-pulse > /dev/null || pipewire-pulse & +pgrep -x wireplumber > /dev/null || wireplumber & $HOME/.scripts/start-mpd diff --git a/config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks index d6229a6..05ff29f 100644 --- a/config/gtk-3.0/bookmarks +++ b/config/gtk-3.0/bookmarks @@ -1,3 +1,4 @@ +file:///home/david/docs/astronovus file:///home/david/docs/lmms file:///home/david/docs docs file:///home/david/pics pics diff --git a/config/mimeapps.list b/config/mimeapps.list index 05ad961..533bf40 100644 --- a/config/mimeapps.list +++ b/config/mimeapps.list @@ -13,6 +13,8 @@ application/x-extension-shtml=userapp-Firefox-PCQJ91.desktop application/xhtml+xml=userapp-Firefox-PCQJ91.desktop application/x-extension-xhtml=userapp-Firefox-PCQJ91.desktop application/x-extension-xht=userapp-Firefox-PCQJ91.desktop +x-scheme-handler/discord-1216669957799018608=discord-1216669957799018608.desktop +application/octet-stream=lmms.desktop [Added Associations] x-scheme-handler/http=userapp-Firefox-AK3I01.desktop;userapp-Firefox-PCQJ91.desktop; @@ -28,3 +30,5 @@ application/x-extension-xht=userapp-Firefox-AK3I01.desktop;userapp-Firefox-PCQJ9 image/gif=nsxiv.desktop; image/png=gimp.desktop; image/jpeg=gimp.desktop; +application/octet-stream=lmms.desktop; +audio/x-vorbis+ogg=audacity.desktop; diff --git a/config/polybar/config b/config/polybar/config index f3a2f6e..88f1d26 100644 --- a/config/polybar/config +++ b/config/polybar/config @@ -4,7 +4,6 @@ offsety = 24 [color] bg = #191919 -bga = #C0191919 fg4= #f58d44 fg2 = #5f819d fg3 = #707880 @@ -22,34 +21,73 @@ font-3 = mononoki:style=Regular:pixelsize=11;3 font-4 = MesloLGM Nerd Font Mono:style=Regular:pixelsize=14;2 font-5 = Noto Sans Mono CJK TC:style=Medium,Regular;pixelsize=10;2 -height = 25 -background = ${color.bga} +height = 32 module-margin = 1 wm-restack = bspwm radius = 0 -foreground = ${color.fg1} +background = ${color.bg} +border-size = 0 +border-color = ${color.fg3} +fg = ${color.fg1} +offset-y = 16 padding-right = 1 -[bar/wsonly] +[bar/time] inherit = bar/base -width = 100% -modules-left = workspaces -modules-right = time +modules-center = time +width = 80 + +[bar/time1920] +inherit = bar/time +offset-x = 1798 + +[bar/time1080] +inherit = bar/time +offset-x = 958 + +[bar/time2560] +inherit = bar/time +offset-x = 2438 [bar/ws] inherit = bar/base -width = 2510 -offset-x = 25 -offset-y = 10 -modules-left = workspaces xwindow -modules-right = mpd temperature memory network battery pulseaudio microphone time +width = 245 +offset-x = 32 +modules-left = workspaces tray-position = right -background = ${color.bga} -border-size = 0 -border-color = ${color.fg3} -fg = ${color.fg1} + +[bar/right] +inherit = bar/base +width = 400 +modules-center = temperature memory network battery pulseaudio vpn microphone time +tray-position = right + +[bar/mpd] +inherit = bar/base +width = 250 +fixed-center = true +modules-right = mpdctrls +modules-left = mpdsong +padding = 2 + +[bar/right2560] +inherit = bar/right +offset-x = 2118 + +[bar/mpd2560] +inherit = bar/mpd +offset-x = 1836 + +[bar/right1920] +inherit = bar/right +offset-x = 1478 + +[bar/mpd1920] +inherit = bar/mpd +offset-x = 1046 + [module/wsnumber] @@ -75,16 +113,16 @@ enable-click = true enable-scroll = true format = <label-state> -format-padding = 0 -label-monitor = %name% -label-active = %{T2}雷%{T-} -label-active-padding = 1 +format-padding = 0 +label-monitor = %name% +label-active = %{T2}雷%{T-} +label-active-padding = 1 label-occupied = %{T2}ﲭ%{T-} label-occupied-padding = 1 label-empty = %{T2}ﱤ%{T-} label-empty-padding = 1 -label-urgent = %{T2}ﲭ%{T-} -label-urgent-padding = 1 +label-urgent = %{T2}ﲭ%{T-} +label-urgent-padding = 1 [module/time] @@ -95,15 +133,25 @@ date = "%d %b" label = %{T2}◷%{T-} %time% label-padding = 0 -[module/mpd] +[module/mpdctrls] type = internal/mpd host = 127.0.0.1 port = 6600 +format-online = <icon-prev> <toggle> <icon-next> -format-online = <label-song> <icon-prev> <toggle> <icon-next> <bar-progress> -label-song = %title% +icon-play = +icon-pause = +icon-prev = +icon-next = -bar-progress-width = 12 +[module/mpdprogress] +type = internal/mpd +host = 127.0.0.1 +port = 6600 + +format-online = <bar-progress> + +bar-progress-width = 13 bar-progress-indicator = | bar-progress-fill = ─ bar-progress-empty = ─ @@ -112,14 +160,13 @@ format-online-padding = 0 format-offline-padding = 0 -label-song-maxlen = 80 -label-song-ellipsis = true - -icon-play = bar-empty = ─ -icon-pause = -icon-prev = -icon-next = + +[module/mpdsong] +type = custom/script +exec = ~/.scripts/mpd-zscroll +tail = true +interval = 0.3 [module/pulseaudio] @@ -203,5 +250,6 @@ format-disconnected = <label-disconnected> format-packetloss = <label-connected> -label-connected = +label-connected = +label-disconnected = diff --git a/config/polybar/launch.sh b/config/polybar/launch.sh index 33b6531..a8d55f3 100755 --- a/config/polybar/launch.sh +++ b/config/polybar/launch.sh @@ -15,7 +15,11 @@ polybar -m | while read -r mon; do export MONITOR=$(echo $mon | cut -d: -f1) echo $mon | grep -q "(primary)" && { polybar ws & + + polybar right2560 & + polybar mpd2560 & } || { - polybar wsonly & + polybar ws & + polybar time1080 & } done diff --git a/config/sx/sxrc b/config/sx/sxrc index ee19f27..c04b1bc 100755 --- a/config/sx/sxrc +++ b/config/sx/sxrc @@ -1,4 +1,5 @@ setxkbmap -option caps:backspace xmodmap -e "clear Lock" +xterm -e "xinput list" & exec bspwm diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index d8811c5..f9ef280 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -118,9 +118,6 @@ super + ctrl + t dmenu -p "toilet" | toilet --font mono12 | sed 's/ /_ _ /g' | xclip -selection clipboard super + ctrl + b dmenu -p "eminem says" | xargs /usr/bin/eminem -# memes -super + ctrl + alt + c - $HOME/.scripts/memeselector # iocane super + shift + Return @@ -1,4 +1,4 @@ - +export $(dbus-launch) [ -n "$BASH_VERSION" ] && [ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" [ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH" diff --git a/scripts/a b/scripts/a new file mode 100755 index 0000000..37a384f --- /dev/null +++ b/scripts/a @@ -0,0 +1,10 @@ +#!/bin/sh + +printf " + ╱|、 +(˚ˎ。7 +|、˜〵 +じしˍ,)ノ + +" + diff --git a/scripts/aa b/scripts/aa new file mode 100755 index 0000000..fa2b8ed --- /dev/null +++ b/scripts/aa @@ -0,0 +1,10 @@ +#!/bin/sh + +printf " + へ ♡ ╱|、 + ૮ - ՛) (\` - 7 + / ៸| |、⁻〵 +乀(ˍ,ل ل じしˍ,)ノ + +" + diff --git a/scripts/color-test.sh b/scripts/color-test.sh new file mode 100755 index 0000000..5c21fa1 --- /dev/null +++ b/scripts/color-test.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# This file echoes a bunch of color codes to the terminal to demonstrate +# what's available. Each line is the color code of one forground color, +# out of 17 (default + 16 escapes), followed by a test use of that color +# on all nine background colors (default + 8 escapes). +# +T='gYw' # The test text +echo -e "\n 40m 41m 42m 43m 44m 45m 46m 47m"; +for FGs in ' m' ' 1m' ' 30m' '1;30m' ' 31m' '1;31m' ' 32m' '1;32m' ' 33m' '1;33m' ' 34m' '1;34m' ' 35m' '1;35m' ' 36m' '1;36m' ' 37m' '1;37m'; + do FG=${FGs// /} + echo -en " $FGs \033[$FG $T " + for BG in 40m 41m 42m 43m 44m 45m 46m 47m; + do echo -en "$EINS \033[$FG\033[$BG $T \033[0m\033[$BG \033[0m"; + done + echo; +done +echo + diff --git a/scripts/dmenukaomoji b/scripts/dmenukaomoji index 8af99b3..90cd3ec 100755 --- a/scripts/dmenukaomoji +++ b/scripts/dmenukaomoji @@ -12,13 +12,14 @@ if [ -n "$1" ]; then if [[ "$WINDOW" =~ .*"$SUB".* ]]; then xdotool key "ctrl+v" else - xdotool key Shift+Insert + xdotool key "ctrl+v" + #xdotool key Shift+Insert fi -# xdotool type --delay 1 $chosen +#xdotool type --delay 1 $chosen # VAR=$(xclip -o) -# xdotool type $chosen + #xdotool type $chosen else notify-send "'$chosen' copied to clipboard." & fi diff --git a/scripts/memeselector b/scripts/memeselector deleted file mode 100755 index d6121a1..0000000 --- a/scripts/memeselector +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -FOLDER=/home/david/docs/proj/davidovski.xyz/f/meme -cd $FOLDER -xdotool type "https://davidovski.xyz/f/meme/$(ls -1 | dmenu)" - diff --git a/scripts/mpd-zscroll b/scripts/mpd-zscroll new file mode 100755 index 0000000..eba586b --- /dev/null +++ b/scripts/mpd-zscroll @@ -0,0 +1,5 @@ +#!/bin/sh + +zscroll -l 17 --before-text "♪ " --delay 0.3 \ + --update-check true "mpc current" & +wait diff --git a/scripts/record_window_hd.sh b/scripts/record_window_hd.sh new file mode 100644 index 0000000..f732fb7 --- /dev/null +++ b/scripts/record_window_hd.sh @@ -0,0 +1,19 @@ +#!/bin/sh +info=/tmp/wminfo + +xwininfo > /tmp/wminfo + +geom=$(cat $info | grep "geometry" | cut -d' ' -f4) + +width=$(cat $info | grep Width | cut -d' ' -f4) +height=$(cat $info | grep Height | cut -d' ' -f4) + +size="${width}x${height}" +position=+$(echo $geom | cut -d'+' -f2- | sed "s/+/,/g") + +filename=$(date +"$HOME/pics/screenshot/%F_%T.mp4") + +echo $size and $position +ffmpeg -y -f x11grab -video_size $size -i $position -f pulse -i default $filename + +rm $info diff --git a/scripts/toggle-gap.sh b/scripts/toggle-gap.sh index fbdb992..4216af5 100755 --- a/scripts/toggle-gap.sh +++ b/scripts/toggle-gap.sh @@ -1,3 +1,3 @@ #!/bin/sh -GAP=25; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP +GAP=32; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP diff --git a/scripts/z b/scripts/z new file mode 100755 index 0000000..25957aa --- /dev/null +++ b/scripts/z @@ -0,0 +1,10 @@ +#!/bin/sh + +printf " +\e[1;36mZzzzz \e[0;33m|\ _,,,--,,_ + /\e[1;37m,\e[0;33m \`.-'\`' ._ \-;;, + |\e[1;37m,3\e[0;33m- \e[0;33m) )_ .;.( \e[0;33m\`'-' + \e[0;33m '---''(_/._)-'(_\_) \e[0;m + +" + @@ -73,3 +73,7 @@ passthrough_enable () { } alias links="links -g -html-g-text-color 0xfefefe -html-g-background-color 0x191919 -font /home/david/.fonts/ttf-mononoki/mononoki-Regular.ttf" alias weechat="weechat -d ~/.weechat" + +alias glibc="LANG=en_US.UTF-8 bwrap --bind /var/chroots/debian / --dev-bind /dev /dev --proc /proc --bind /sys /sys --bind /run /run --bind /home /home --ro-bind /etc/resolv.conf /etc/resolv.conf --ro-bind /etc/passwd /etc/passwd --ro-bind /etc/group /etc/group" + +alias glibcX11="xhost + local: ; LANG=en_US.UTF-8 bwrap --bind /var/chroots/debian / --dev-bind /dev /dev --proc /proc --bind /sys /sys --bind /run /run --bind /home /home --ro-bind /etc/resolv.conf /etc/resolv.conf --ro-bind /etc/passwd /etc/passwd --ro-bind /etc/group /etc/group --bind /tmp/.X11-unix/X1 /tmp/.X11-unix/X1 --setenv DISPLAY $DISPLAY --ro-bind \"${XDG_RUNTIME_DIR}/pulse\" \"${XDG_RUNTIME_DIR}/pulse\" " diff --git a/st/deploy.sh b/st/deploy.sh index aeb65e6..0532924 100755 --- a/st/deploy.sh +++ b/st/deploy.sh @@ -6,6 +6,7 @@ wd="$HOME/.local/src/st" rm -rf "$wd" git clone https://git.suckless.org/st "$wd" +git -C "$wd" checkout 9846a56bd7fdc86bf788db04bbbcbde7b7eb9952 patch -d "$wd" -p1 -i $(realpath davidovski.patch) |