diff --git a/configuration.nix b/configuration.nix index 428bd4d..b4d3106 100644 --- a/configuration.nix +++ b/configuration.nix @@ -48,7 +48,6 @@ # Enable the XFCE Desktop Environment. services.xserver.displayManager.lightdm.enable = true; services.xserver.desktopManager.budgie.enable = true; - # services.xserver.windowManager.dwm.enable = true; # Configure keymap in X11 services.xserver = { diff --git a/home/dwm/config.def.h.diff b/home/dwm/config.def.h.diff new file mode 100644 index 0000000..14d0ae8 --- /dev/null +++ b/home/dwm/config.def.h.diff @@ -0,0 +1,213 @@ +--- a/config.def.h 2024-03-19 04:24:52.000000000 -0700 ++++ b/config.def.h 2024-05-30 22:48:46.975263716 -0700 +@@ -1,116 +1,121 @@ + /* 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" }; +-static const char dmenufont[] = "monospace:size=10"; +-static const char col_gray1[] = "#222222"; +-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 }, ++static const unsigned int borderpx = 0; /* 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[] = {"JetBrainsMono Nerd Font:size=10"}; ++static const char dmenufont[] = "JetBrainsMono Nerd Font:size=10"; ++static const char col_text[] = "#e0def4"; ++static const char col_subtle[] = "#908caa"; ++static const char col_muted[] = "#6e6a86"; ++static const char col_base[] = "#191724"; ++static const char col_iris[] = "#c4a7e7"; ++static const char col_h_low[] = "#21202e"; ++static const char *colors[][3] = { ++ /* fg bg border */ ++ [SchemeNorm] = {col_muted, col_h_low, col_base}, ++ [SchemeSel] = {col_text, col_base, col_iris}, + }; + + /* tagging */ +-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; ++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 }, ++ /* 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}, ++ {"discord", NULL, NULL, 1 << 1, 0, 1}, ++ {"nannou", NULL, NULL, 0, 1, -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 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 */ +- { "[]=", tile }, /* first entry is default */ +- { "><>", NULL }, /* no layout function means floating behavior */ +- { "[M]", monocle }, ++ /* symbol arrange function */ ++ {"[]=", tile}, /* first entry is default */ ++ {"><>", NULL}, /* no layout function means floating behavior */ ++ {"[M]", monocle}, + }; + + /* 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} }, ++#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 } } +- ++#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_gray4, NULL }; +-static const char *termcmd[] = { "st", NULL }; ++static char dmenumon[2] = ++ "0"; /* component of dmenucmd, manipulated in spawn() */ ++static const char *dmenucmd[] = { ++ "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_h_low, ++ "-nf", col_muted, "-sb", col_base, "-sf", col_text, NULL}; ++static const char *termcmd[] = {"alacritty", NULL}; ++static const char *scrnshotcmd[] = {"flameshot", "gui", 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} }, +- { MODKEY, XK_Tab, view, {0} }, +- { MODKEY|ShiftMask, XK_c, killclient, {0} }, +- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, +- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, +- { MODKEY, XK_m, 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} }, ++ /* modifier key function argument */ ++ {MODKEY, XK_p, spawn, {.v = dmenucmd}}, ++ {MODKEY | ShiftMask, XK_Return, spawn, {.v = termcmd}}, ++ {ControlMask, XK_Print, spawn, {.v = scrnshotcmd}}, ++ {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 | ShiftMask, XK_c, killclient, {0}}, ++ {MODKEY, XK_t, setlayout, {.v = &layouts[0]}}, ++ {MODKEY, XK_f, setlayout, {.v = &layouts[1]}}, ++ {MODKEY, XK_m, 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 */ ++/* 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} }, ++ /* 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}}, + }; +- diff --git a/modules/dwm.nix b/modules/dwm.nix new file mode 100644 index 0000000..444d863 --- /dev/null +++ b/modules/dwm.nix @@ -0,0 +1,21 @@ +{ lib, config, pkgs, ... }: + +let + cfg = config.snowhawk.dwm; +in +{ + options.snowhawk.dwm = { + enable = lib.mkEnableOption "dwm"; + }; + + config = lib.mkIf cfg.enable { + services.xserver.windowManager.dwm = { + enable = true; + package = pkgs.dwm.overrideAttrs (oldAttrs: { + patches = [ + ../home/dwm/config.def.h.diff + ]; + }); + }; + }; +}