summaryrefslogtreecommitdiff
path: root/dwm
diff options
context:
space:
mode:
Diffstat (limited to 'dwm')
-rw-r--r--dwm/config.h.patch47
-rw-r--r--dwm/my.diff168
2 files changed, 118 insertions, 97 deletions
diff --git a/dwm/config.h.patch b/dwm/config.h.patch
deleted file mode 100644
index 44e3b5b..0000000
--- a/dwm/config.h.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-2a3,4
-> #include <X11/XF86keysym.h>
->
-15c17
-< static const char col_cyan[] = "#005577";
----
-> static const char col_cyan[] = "#ad5fed";
-49c51
-< #define MODKEY Mod1Mask
----
-> #define MODKEY Mod4Mask
-62a65,71
-> static const char *browsercmd[] = { "vimb", NULL };
-> static const char *bupcmd[] = { "brightnessup", NULL };
-> static const char *bdowncmd[] = { "brightnessdown", NULL };
-> static const char *bmaxcmd[] = { "brightnessmax", NULL };
-> static const char *upvol[] = { "/usr/bin/amixer", "set", "Master", "5%+", NULL };
-> static const char *downvol[] = { "/usr/bin/amixer", "set", "Master", "5%-", NULL };
-> static const char *mutevol[] = { "/usr/bin/amixer", "set", "Master", "toggle", NULL };
-66,67c75,83
-< { MODKEY, XK_p, spawn, {.v = dmenucmd } },
-< { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
----
-> { MODKEY, XK_d, spawn, {.v = dmenucmd } },
-> { MODKEY, XK_e, spawn, {.v = browsercmd } },
-> { MODKEY, XK_Return, spawn, {.v = termcmd } },
-> { 0, XF86XK_MonBrightnessUp, spawn, {.v = bupcmd } },
-> { 0, XF86XK_MonBrightnessDown, spawn, {.v = bdowncmd } },
-> { 0, XF86XK_Display, spawn, {.v = bmaxcmd} },
-> { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } },
-> { 0, XF86XK_AudioMute, spawn, {.v = mutevol } },
-> { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } },
-72c88
-< { MODKEY, XK_d, incnmaster, {.i = -1 } },
----
-> { MODKEY, XK_o, incnmaster, {.i = -1 } },
-75,77c91,92
-< { MODKEY, XK_Return, zoom, {0} },
-< { MODKEY, XK_Tab, view, {0} },
-< { MODKEY|ShiftMask, XK_c, killclient, {0} },
----
-> { MODKEY, XK_n, zoom, {0} },
-> { MODKEY|ShiftMask, XK_q, killclient, {0} },
-101c116
-< { MODKEY|ShiftMask, XK_q, quit, {0} },
----
-> { MODKEY|ShiftMask, XK_e, quit, {0} },
diff --git a/dwm/my.diff b/dwm/my.diff
index be0f560..52fa8d1 100644
--- a/dwm/my.diff
+++ b/dwm/my.diff
@@ -1,50 +1,118 @@
-diff -urN ../dwm-clean/config.def.h ./config.def.h
---- ../dwm-clean/config.def.h 2025-08-09 06:00:55.740267680 -0700
-+++ ./config.def.h 2025-12-02 22:11:33.586005536 -0800
-@@ -2,7 +2,7 @@
-
- /* appearance */
- static const unsigned int borderpx = 1; /* border pixel of windows */
--static const unsigned int snap = 32; /* snap pixel */
-+static const unsigned int snap = 1; /* 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" };
-@@ -11,11 +11,11 @@
- static const char col_gray2[] = "#444444";
- static const char col_gray3[] = "#bbbbbb";
- static const char col_gray4[] = "#eeeeee";
--static const char col_cyan[] = "#005577";
-+static const char col_purple[] = "#6904f7";
- static const char *colors[][3] = {
- /* fg bg border */
- [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
-+ [SchemeSel] = { col_gray4, col_purple, col_purple },
- };
-
- /* tagging */
-@@ -45,7 +45,7 @@
- };
-
- /* key definitions */
--#define MODKEY Mod1Mask
-+#define MODKEY Mod4Mask
- #define TAGKEYS(KEY,TAG) \
- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
-@@ -57,12 +57,12 @@
-
- /* 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_gray4, NULL };
-+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_purple, "-sf", col_gray4, NULL };
- static const char *termcmd[] = { "st", NULL };
-
- static const Key keys[] = {
- /* modifier key function argument */
-- { MODKEY, XK_p, spawn, {.v = dmenucmd } },
-+ { MODKEY, XK_d, spawn, {.v = dmenucmd } },
- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
- { MODKEY, XK_b, togglebar, {0} },
- { MODKEY, XK_j, focusstack, {.i = +1 } },
+*** /home/tmu/dotfiles/dwm/dwm-6.6/config.def.h 2025-08-09 06:00:55.740267680 -0700
+--- /tmp/ediffFTelAh 2025-12-03 09:08:13.726948240 -0800
+***************
+*** 1,8 ****
+ /* See LICENSE file for copyright and license details. */
+
+ /* 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" };
+--- 1,10 ----
+ /* See LICENSE file for copyright and license details. */
+
++ #include <X11/XF86keysym.h>
++
+ /* appearance */
+ static const unsigned int borderpx = 1; /* border pixel of windows */
+! static const unsigned int snap = 1; /* 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" };
+***************
+*** 11,21 ****
+ static const char col_gray2[] = "#444444";
+ static const char col_gray3[] = "#bbbbbb";
+ static const char col_gray4[] = "#eeeeee";
+! static const char col_cyan[] = "#005577";
+ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+! [SchemeSel] = { col_gray4, col_cyan, col_cyan },
+ };
+
+ /* tagging */
+--- 13,23 ----
+ static const char col_gray2[] = "#444444";
+ static const char col_gray3[] = "#bbbbbb";
+ static const char col_gray4[] = "#eeeeee";
+! static const char col_purple[] = "#6904f7";
+ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+! [SchemeSel] = { col_gray4, col_purple, col_purple },
+ };
+
+ /* tagging */
+***************
+*** 45,51 ****
+ };
+
+ /* key definitions */
+! #define MODKEY Mod1Mask
+ #define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+--- 47,53 ----
+ };
+
+ /* key definitions */
+! #define MODKEY Mod4Mask
+ #define TAGKEYS(KEY,TAG) \
+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
+***************
+*** 57,74 ****
+
+ /* 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_gray4, NULL };
+ static const char *termcmd[] = { "st", NULL };
+
+ static const Key keys[] = {
+ /* modifier key function argument */
+! { MODKEY, XK_p, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
+ { 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} },
+--- 59,90 ----
+
+ /* 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_purple, "-sf", col_gray4, NULL };
+ static const char *termcmd[] = { "st", NULL };
++ static const char *browsercmd[] = { "glide", NULL };
++ static const char *bupcmd[] = { "brightnessup", NULL };
++ static const char *bdowncmd[] = { "brightnessdown", NULL };
++ static const char *bmaxcmd[] = { "brightnessmax", NULL };
++ static const char *upvol[] = { "/usr/bin/amixer", "set", "Master", "5%+", NULL };
++ static const char *downvol[] = { "/usr/bin/amixer", "set", "Master", "5%-", NULL };
++ static const char *mutevol[] = { "/usr/bin/amixer", "set", "Master", "toggle", NULL };
+
+ static const Key keys[] = {
+ /* modifier key function argument */
+! { MODKEY, XK_d, spawn, {.v = dmenucmd } },
+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
++ { MODKEY, XK_e, spawn, {.v = browsercmd } },
++ { 0, XF86XK_MonBrightnessUp, spawn, {.v = bupcmd } },
++ { 0, XF86XK_MonBrightnessDown, spawn, {.v = bdowncmd } },
++ { 0, XF86XK_Display, spawn, {.v = bmaxcmd} },
++ { 0, XF86XK_AudioLowerVolume, spawn, {.v = downvol } },
++ { 0, XF86XK_AudioMute, spawn, {.v = mutevol } },
++ { 0, XF86XK_AudioRaiseVolume, spawn, {.v = upvol } },
+ { 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_o, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+ { MODKEY, XK_l, setmfact, {.f = +0.05} },
+ { MODKEY, XK_Return, zoom, {0} },
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-17 11:51:02 +0000