commit 23239767dfc62afe6cab9c1c029c83bfa0dd136f
parent 8663df3b6647246595fc9a88ea11c5cf64ceb1e6
Author: Riaz <riaz@riazj.com>
Date: Mon, 28 Jul 2025 09:08:47 -0700
Switch from dwm to wmutils
Diffstat:
8 files changed, 63 insertions(+), 162 deletions(-)
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
@@ -4,13 +4,29 @@ XF86Audio{Raise,Lower}Volume
XF86AudioMute
wpctl set-mute @DEFAULT_SINK@ toggle
+ctrl + Return
+ st
+
+alt + Tab
+ focus prev
+
+alt + BackSpace
+ killw $(pfw)
+
+alt + p
+ dmenu_run
+
+alt + t
+ todo
+
alt + w
st w3m -v
-alt + shift + t
- todo
+alt + m
+ page="$(:|dmenu -p "Man page:")"; \
+ man "$page" > /dev/null 2>&1 && st man "$page"
-alt + shift + d
+alt + d
definition="$XDG_RUNTIME_DIR/dmenu_dict"; \
dict "$(dmenu -i -l 10 < $XDG_STATE_HOME/wn.index)" > "$definition"; \
- [ -s "$definition" ] && st less -+F -c "$definition"
+ [ -s "$definition" ] && st less "$definition"
diff --git a/.config/xinitrc b/.config/xinitrc
@@ -1,3 +1,3 @@
-while xsetroot -name "$(cat /sys/class/power_supply/BAT0/capacity)% | $(date +%I:%M) | $(uptime -p)"; do sleep 1m; done &
-clipmenud & xhidecursor & setxkbmap -option 'compose:menu' -option 'caps:swapescape' & sxhkd &
-/usr/bin/pipewire & /usr/bin/pipewire-pulse & /usr/bin/wireplumber & exec dwm
+while status; do sleep 1m; done | lemonbar -d -F '#ccc' &
+setxkbmap -option 'compose:menu' -option 'caps:swapescape' & sxhkd &
+winwatch & xhidecursor & clipmenud
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
@@ -14,5 +14,5 @@ export HISTFILE="$XDG_STATE_HOME/zsh"
export HISTSIZE=500
export SAVEHIST=500
export LESSHISTFILE=-
-export LESS="-iRF"
+export LESS="-ciR"
export EDITOR="vis"
diff --git a/.local/bin/focus b/.local/bin/focus
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+CURWIN=$(pfw || echo NONE)
+
+case "$1" in
+ next) wid=$(lsw|grep -v "$CURWIN"|sed '1p;d') ;;
+ prev) wid=$(lsw|grep -v "$CURWIN"|sed '$p;d') ;;
+ 0x*) wattr "$1" && wid="$1" ;;
+ *) echo "usage: focus <next|prev|wid>"; exit 1 ;;
+esac
+
+[ -z "$wid" ] && { echo "focus: can't find a window to focus" >&2; exit 1; }
+
+chwso -r "$wid"
+wtf "$wid"
diff --git a/.local/bin/fullscreen b/.local/bin/fullscreen
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+BAROFF=16
+
+[ -z "$1" ] && { echo "usage: fullscreen <wid>"; exit 1; }
+
+wh="$(wattr wh "$(lsw -r)")"
+w="${wh% *}"
+h="${wh#* }"
+h=$((h-BAROFF))
+wtp 0 "$BAROFF" "$w" "$h" "$1"
+
+focus "$1"
diff --git a/.local/bin/status b/.local/bin/status
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+echo "%{r} $(cat /sys/class/power_supply/BAT0/capacity)% | $(date +%I:%M) | $(uptime -p)"
diff --git a/.local/bin/winwatch b/.local/bin/winwatch
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+wew | while read ev wid; do
+ case "$ev" in
+ MAP) wattr o "$wid" || fullscreen "$wid" ;;
+ DESTROY) wattr "$(pfw)" || focus prev ;;
+ esac
+done
diff --git a/.local/src/dwm/config.h b/.local/src/dwm/config.h
@@ -1,154 +0,0 @@
-/*
- * MIT/X Consortium License
- *
- * © 2006-2019 Anselm R Garbe <anselm@garbe.ca>
- * © 2006-2009 Jukka Salmi <jukka at salmi dot ch>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
- * © 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
- * © 2007-2009 Christof Musik <christof at sendfax dot de>
- * © 2007-2009 Premysl Hruby <dfenze at gmail dot com>
- * © 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
- * © 2008 Martin Hurton <martin dot hurton at gmail dot com>
- * © 2008 Neale Pickett <neale dot woozle dot org>
- * © 2009 Mate Nagy <mnagy at port70 dot net>
- * © 2010-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
- * © 2010-2012 Connor Lane Smith <cls@lubutu.com>
- * © 2011 Christoph Lohmann <20h@r-36.net>
- * © 2015-2016 Quentin Rameau <quinq@fifth.space>
- * © 2015-2016 Eric Pruitt <eric.pruitt@gmail.com>
- * © 2016-2017 Markus Teich <markus.teich@stusta.mhn.de>
- * © 2020-2022 Chris Down <chris@chrisdown.name>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/* appearance */
-static const unsigned int borderpx = 1; /* border pixel of windows */
-static const unsigned int snap = 32; /* snap pixel */
-static const int showbar = 1; /* 0 means no bar */
-static const int topbar = 1; /* 0 means bottom bar */
-static const char *fonts[] = { "monospace:size=10" };
-static const char dmenufont[] = "monospace:size=10";
-static const char col_gray1[] = "#000000";
-static const char col_gray2[] = "#444444";
-static const char col_gray3[] = "#ffffff";
-static const char col_cyan[] = "#005577";
-static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
- [SchemeSel] = { col_gray3, col_cyan, col_cyan },
-};
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
- /* xprop(1):
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
- /* class instance title tags mask isfloating monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
-};
-
-/* layout(s) */
-static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster = 1; /* number of clients in master area */
-static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
-static const Layout layouts[] = {
- /* symbol arrange function */
- { "[M]", monocle },
- { "[]=", tile }, /* first entry is default */
- { "><>", NULL }, /* no layout function means floating behavior */
-};
-
-/* key definitions */
-#define MODKEY Mod1Mask
-#define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray3, NULL };
-static const char *termcmd[] = { "st", NULL };
-
-static const Key keys[] = {
- /* modifier key function argument */
- { ControlMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
- { MODKEY, XK_k, focusstack, {.i = -1 } },
- { MODKEY, XK_i, incnmaster, {.i = +1 } },
- { MODKEY, XK_d, incnmaster, {.i = -1 } },
- { MODKEY, XK_h, setmfact, {.f = -0.05} },
- { MODKEY, XK_l, setmfact, {.f = +0.05} },
- { MODKEY, XK_Return, zoom, {0} },
- { MODKEY, XK_Tab, view, {0} },
- { MODKEY, XK_BackSpace, killclient, {0} },
- { MODKEY, XK_m, setlayout, {.v = &layouts[0]} },
- { MODKEY, XK_t, setlayout, {.v = &layouts[1]} },
- { MODKEY, XK_f, setlayout, {.v = &layouts[2]} },
- { MODKEY, XK_space, setlayout, {0} },
- { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
- { MODKEY, XK_0, view, {.ui = ~0 } },
- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
- { MODKEY, XK_comma, focusmon, {.i = -1 } },
- { MODKEY, XK_period, focusmon, {.i = +1 } },
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
- TAGKEYS( XK_4, 3)
- TAGKEYS( XK_5, 4)
- TAGKEYS( XK_6, 5)
- TAGKEYS( XK_7, 6)
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY|ShiftMask, XK_q, quit, {0} },
-};
-
-/* button definitions */
-/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static const Button buttons[] = {
- /* click event mask button function argument */
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
- { ClkWinTitle, 0, Button2, zoom, {0} },
- { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
- { ClkClientWin, MODKEY, Button1, movemouse, {0} },
- { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
- { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
- { ClkTagBar, 0, Button1, view, {0} },
- { ClkTagBar, 0, Button3, toggleview, {0} },
- { ClkTagBar, MODKEY, Button1, tag, {0} },
- { ClkTagBar, MODKEY, Button3, toggletag, {0} },
-};
-