eRgo35/dwm
1
0
Fork 0
mirror of https://github.com/eRgo35/dwm.git synced 2026-02-04 19:46:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: eRgo35:2827b6f7f9e9f43b373f04b963996df5247d0689
Branches Tags
eRgo35:main
...
compare: eRgo35:97dd5ae0522829f9651793fbc3b52c40d99b8fb0
Branches Tags
eRgo35:main

3 Commits
2827b6f7f9 ... 97dd5ae052

Author SHA1 Message Date
Michał Czyż
97dd5ae052 feat: more migration stuff 2024-12-27 19:52:29 +01:00
Michał Czyż
ccb50b0234 fix: compilation fixes 2024-12-27 17:40:38 +01:00
Michał Czyż
261eac2d36 feat: nixified 2024-12-27 17:04:25 +01:00
7 changed files with 175 additions and 126 deletions
Expand all files Collapse all files

1
.envrc Normal file
View File

@@ -0,0 +1 @@
use flake

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@ dwm-msg
config.h config.h
patches.h patches.h
.legacy/ .legacy/
.direnv/

205
config.def.h
View File

@@ -168,83 +168,81 @@ static void (*bartabmonfns[])(Monitor *) = { NULL /* , customlayoutfn */ };
#if BAR_PANGO_PATCH #if BAR_PANGO_PATCH
static const char font[] = "monospace 11"; static const char font[] = "monospace 11";
#else #else
static const char *fonts[] = { "JetBrainsMono Nerd Font:size=16:antialias=true", "monospace:size=16:antialias=true" }; static const char *fonts[] = { "JetBrainsMono Nerd Font:size=11:antialias=true", "monospace:size=11:antialias=true" };
#endif // BAR_PANGO_PATCH #endif // BAR_PANGO_PATCH
static const char dmenufont[] = "JetBrainsMono Nerd Font:size=16:antialias=true"; static const char dmenufont[] = "JetBrainsMono Nerd Font:size=11:antialias=true";
static char base[] = "#191724"; #define BASE "#191724"
static char surface[] = "#1f1d2e"; #define SURFACE "#1f1d2e"
static char overlay[] = "#26233a"; #define OVERLAY "#26233a"
static char muted[] = "#6e6a86"; #define MUTED "#6e6a86"
static char subtle[] = "#908caa"; #define SUBTLE "#908caa"
static char text[] = "#e0def4"; #define TEXT "#e0def4"
static char love[] = "#eb6f92";
static char gold[] = "#f6c177";
static char rose[] = "#ebbcba";
static char pine[] = "#31748f";
static char foam[] = "#9ccfd8";
static char iris[] = "#c4a7e7";
static char highlightLow[] = "#21202e";
static char highlightMed[] = "#403d52";
static char highlightHigh[] = "#524f67";
#define LOVE "#eb6f92"
#define GOLD "#f6c177"
#define ROSE "#ebbcba"
#define PINE "#31748f"
#define FOAM "#9ccfd8"
#define IRIS "#c4a7e7"
#define HIGHLIGHT_LOW "#21202e"
#define HIGHLIGHT_MED "#403d52"
#define HIGHLIGHT_HIGH "#524f67"
static char c000000[] = "#000000"; // placeholder value static char c000000[] = "#000000"; // placeholder value
static char normfgcolor[] = text; static char normfgcolor[] = TEXT;
static char normbgcolor[] = surface; static char normbgcolor[] = SURFACE;
static char normbordercolor[] = overlay; static char normbordercolor[] = OVERLAY;
static char normfloatcolor[] = highlightMed; static char normfloatcolor[] = HIGHLIGHT_MED;
static char selfgcolor[] = ; static char selfgcolor[] = TEXT;
static char selbgcolor[] = "#005577"; static char selbgcolor[] = PINE;
static char selbordercolor[] = "#005577"; static char selbordercolor[] = PINE;
static char selfloatcolor[] = "#005577"; static char selfloatcolor[] = PINE;
static char titlenormfgcolor[] = "#bbbbbb"; static char titlenormfgcolor[] = SUBTLE;
static char titlenormbgcolor[] = "#1f1d2e"; static char titlenormbgcolor[] = SURFACE;
static char titlenormbordercolor[] = "#444444"; static char titlenormbordercolor[] = OVERLAY;
static char titlenormfloatcolor[] = "#db8fd9"; static char titlenormfloatcolor[] = ROSE;
static char titleselfgcolor[] = "#eeeeee"; static char titleselfgcolor[] = TEXT;
static char titleselbgcolor[] = "#005577"; static char titleselbgcolor[] = PINE;
static char titleselbordercolor[] = "#005577"; static char titleselbordercolor[] = PINE;
static char titleselfloatcolor[] = "#005577"; static char titleselfloatcolor[] = PINE;
static char tagsnormfgcolor[] = "#bbbbbb"; static char tagsnormfgcolor[] = MUTED;
static char tagsnormbgcolor[] = "#222222"; static char tagsnormbgcolor[] = BASE;
static char tagsnormbordercolor[] = "#444444"; static char tagsnormbordercolor[] = OVERLAY;
static char tagsnormfloatcolor[] = "#db8fd9"; static char tagsnormfloatcolor[] = ROSE;
static char tagsselfgcolor[] = "#eeeeee"; static char tagsselfgcolor[] = TEXT;
static char tagsselbgcolor[] = "#005577"; static char tagsselbgcolor[] = PINE;
static char tagsselbordercolor[] = "#005577"; static char tagsselbordercolor[] = PINE;
static char tagsselfloatcolor[] = "#005577"; static char tagsselfloatcolor[] = PINE;
static char hidnormfgcolor[] = "#005577"; static char hidnormfgcolor[] = MUTED;
static char hidselfgcolor[] = "#227799"; static char hidselfgcolor[] = SUBTLE;
static char hidnormbgcolor[] = "#222222"; static char hidnormbgcolor[] = BASE;
static char hidselbgcolor[] = "#222222"; static char hidselbgcolor[] = BASE;
static char urgfgcolor[] = "#bbbbbb"; static char urgfgcolor[] = TEXT;
static char urgbgcolor[] = "#222222"; static char urgbgcolor[] = LOVE;
static char urgbordercolor[] = "#ff0000"; static char urgbordercolor[] = LOVE;
static char urgfloatcolor[] = "#db8fd9"; static char urgfloatcolor[] = ROSE;
#if RENAMED_SCRATCHPADS_PATCH #if RENAMED_SCRATCHPADS_PATCH
static char scratchselfgcolor[] = "#FFF7D4"; static char scratchselfgcolor[] = TEXT;
static char scratchselbgcolor[] = "#77547E"; static char scratchselbgcolor[] = IRIS;
static char scratchselbordercolor[] = "#894B9F"; static char scratchselbordercolor[] = IRIS;
static char scratchselfloatcolor[] = "#894B9F"; static char scratchselfloatcolor[] = IRIS;
static char scratchnormfgcolor[] = "#FFF7D4"; static char scratchnormfgcolor[] = SUBTLE;
static char scratchnormbgcolor[] = "#664C67"; static char scratchnormbgcolor[] = HIGHLIGHT_LOW;
static char scratchnormbordercolor[] = "#77547E"; static char scratchnormbordercolor[] = OVERLAY;
static char scratchnormfloatcolor[] = "#77547E"; static char scratchnormfloatcolor[] = OVERLAY;
#endif // RENAMED_SCRATCHPADS_PATCH #endif // RENAMED_SCRATCHPADS_PATCH
#if BAR_FLEXWINTITLE_PATCH #if BAR_FLEXWINTITLE_PATCH
@@ -970,7 +968,7 @@ static const Key keys[] = {
{ 0, XF86XK_WLAN, spawn, {.v = wlan}}, { 0, XF86XK_WLAN, spawn, {.v = wlan}},
{ 0, XF86XK_Tools, spawn, {.v = tools}}, { 0, XF86XK_Tools, spawn, {.v = tools}},
// { 0, XF86XK_Search, spawn, {.v = search}}, // { 0, XF86XK_Search, spawn, {.v = search}},
{ 0, XF86XK_LaunchA, alttabstart, {0}}, /*{ 0, XF86XK_LaunchA, alttabstart, {0}},*/
{ 0, XF86XK_Explorer, spawn, {.v = explorer}}, { 0, XF86XK_Explorer, spawn, {.v = explorer}},
{ MODKEY|Mod1Mask, XK_F1, spawn, {.v = upvol}}, { MODKEY|Mod1Mask, XK_F1, spawn, {.v = upvol}},
{ MODKEY|Mod1Mask, XK_F3, spawn, {.v = downvol}}, { MODKEY|Mod1Mask, XK_F3, spawn, {.v = downvol}},
@@ -1036,14 +1034,14 @@ static const Key keys[] = {
{ MODKEY, XK_v, switchcol, {0} }, { MODKEY, XK_v, switchcol, {0} },
#endif // SWITCHCOL_PATCH #endif // SWITCHCOL_PATCH
#if ROTATESTACK_PATCH #if ROTATESTACK_PATCH
{ MODKEY|Mod4Mask, XK_j, rotatestack, {.i = +1 } }, { MODKEY|Mod1Mask, XK_j, rotatestack, {.i = +1 } },
{ MODKEY|Mod4Mask, XK_k, rotatestack, {.i = -1 } }, { MODKEY|Mod1Mask, XK_k, rotatestack, {.i = -1 } },
#endif // ROTATESTACK_PATCH #endif // ROTATESTACK_PATCH
#if INPLACEROTATE_PATCH #if INPLACEROTATE_PATCH
{ MODKEY|Mod4Mask, XK_j, inplacerotate, {.i = +2 } }, // same as rotatestack { MODKEY|Mod1Mask, XK_j, inplacerotate, {.i = +2 } }, // same as rotatestack
{ MODKEY|Mod4Mask, XK_k, inplacerotate, {.i = -2 } }, // same as reotatestack { MODKEY|Mod1Mask, XK_k, inplacerotate, {.i = -2 } }, // same as reotatestack
{ MODKEY|Mod4Mask|ShiftMask, XK_j, inplacerotate, {.i = +1} }, { MODKEY|Mod1Mask|ShiftMask, XK_j, inplacerotate, {.i = +1} },
{ MODKEY|Mod4Mask|ShiftMask, XK_k, inplacerotate, {.i = -1} }, { MODKEY|Mod1Mask|ShiftMask, XK_k, inplacerotate, {.i = -1} },
#endif // INPLACEROTATE_PATCH #endif // INPLACEROTATE_PATCH
#if PUSH_PATCH || PUSH_NO_MASTER_PATCH #if PUSH_PATCH || PUSH_NO_MASTER_PATCH
{ MODKEY|ControlMask, XK_j, pushdown, {0} }, { MODKEY|ControlMask, XK_j, pushdown, {0} },
@@ -1067,14 +1065,14 @@ static const Key keys[] = {
{ MODKEY|ControlMask|ShiftMask, XK_r, aspectresize, {.i = -24} }, { MODKEY|ControlMask|ShiftMask, XK_r, aspectresize, {.i = -24} },
#endif // ASPECTRESIZE_PATCH #endif // ASPECTRESIZE_PATCH
#if MOVERESIZE_PATCH #if MOVERESIZE_PATCH
{ MODKEY|Mod4Mask, XK_Down, moveresize, {.v = "0x 25y 0w 0h" } }, { MODKEY|Mod1Mask, XK_Down, moveresize, {.v = "0x 25y 0w 0h" } },
{ MODKEY|Mod4Mask, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } }, { MODKEY|Mod1Mask, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } },
{ MODKEY|Mod4Mask, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } }, { MODKEY|Mod1Mask, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } },
{ MODKEY|Mod4Mask, XK_Left, moveresize, {.v = "-25x 0y 0w 0h" } }, { MODKEY|Mod1Mask, XK_Left, moveresize, {.v = "-25x 0y 0w 0h" } },
{ MODKEY|Mod4Mask|ShiftMask, XK_Down, moveresize, {.v = "0x 0y 0w 25h" } }, { MODKEY|Mod1Mask|ShiftMask, XK_Down, moveresize, {.v = "0x 0y 0w 25h" } },
{ MODKEY|Mod4Mask|ShiftMask, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } }, { MODKEY|Mod1Mask|ShiftMask, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } },
{ MODKEY|Mod4Mask|ShiftMask, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } }, { MODKEY|Mod1Mask|ShiftMask, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } },
{ MODKEY|Mod4Mask|ShiftMask, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } }, { MODKEY|Mod1Mask|ShiftMask, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } },
#endif // MOVERESIZE_PATCH #endif // MOVERESIZE_PATCH
#if MOVESTACK_PATCH #if MOVESTACK_PATCH
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
@@ -1097,22 +1095,22 @@ static const Key keys[] = {
#endif // INSETS_PATCH #endif // INSETS_PATCH
{ MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_Return, zoom, {0} },
#if VANITYGAPS_PATCH #if VANITYGAPS_PATCH
{ MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_u, incrgaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_i, incrigaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_o, incrogaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_o, incrogaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_6, incrihgaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_6, incrihgaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_7, incrivgaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_7, incrivgaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_8, incrohgaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_8, incrohgaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_9, incrovgaps, {.i = +1 } }, { MODKEY|Mod1Mask, XK_9, incrovgaps, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } },
{ MODKEY|Mod4Mask, XK_0, togglegaps, {0} }, { MODKEY|Mod1Mask, XK_0, togglegaps, {0} },
{ MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, { MODKEY|Mod1Mask|ShiftMask, XK_0, defaultgaps, {0} },
#endif // VANITYGAPS_PATCH #endif // VANITYGAPS_PATCH
#if ALT_TAB_PATCH #if ALT_TAB_PATCH
{ Mod1Mask, XK_Tab, alttabstart, {0} }, { Mod1Mask, XK_Tab, alttabstart, {0} },
@@ -1132,21 +1130,22 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_backslash, shiftview, { .i = +1 } }, { MODKEY|ShiftMask, XK_backslash, shiftview, { .i = +1 } },
#endif // SHIFTVIEW_PATCH #endif // SHIFTVIEW_PATCH
#if SHIFTVIEW_CLIENTS_PATCH #if SHIFTVIEW_CLIENTS_PATCH
{ MODKEY|Mod4Mask, XK_Tab, shiftviewclients, { .i = -1 } }, { MODKEY|Mod1Mask, XK_Tab, shiftviewclients, { .i = -1 } },
{ MODKEY|Mod4Mask, XK_backslash, shiftviewclients, { .i = +1 } }, { MODKEY|Mod1Mask, XK_backslash, shiftviewclients, { .i = +1 } },
#endif // SHIFTVIEW_CLIENTS_PATCH #endif // SHIFTVIEW_CLIENTS_PATCH
#if SHIFTBOTH_PATCH #if SHIFTBOTH_PATCH
{ MODKEY|ControlMask, XK_Left, shiftboth, { .i = -1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoleft placedir { MODKEY|ControlMask, XK_Left, shiftboth, { .i = -1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoleft placedir
{ MODKEY|ControlMask, XK_Right, shiftboth, { .i = +1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoright placedir { MODKEY|ControlMask, XK_Right, shiftboth, { .i = +1 } }, // note keybinding conflict with focusadjacenttag tagandviewtoright placedir
#endif // SHIFTBOTH_PATCH #endif // SHIFTBOTH_PATCH
#if SHIFTSWAPTAGS_PATCH && SWAPTAGS_PATCH #if SHIFTSWAPTAGS_PATCH && SWAPTAGS_PATCH
{ MODKEY|Mod4Mask|ShiftMask, XK_Left, shiftswaptags, { .i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_Left, shiftswaptags, { .i = -1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_Right, shiftswaptags, { .i = +1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_Right, shiftswaptags, { .i = +1 } },
#endif // SHIFTSWAPTAGS_PATCH #endif // SHIFTSWAPTAGS_PATCH
#if BAR_WINTITLEACTIONS_PATCH #if BAR_WINTITLEACTIONS_PATCH
{ MODKEY|ControlMask, XK_z, showhideclient, {0} }, { MODKEY|ControlMask, XK_z, showhideclient, {0} },
#endif // BAR_WINTITLEACTIONS_PATCH #endif // BAR_WINTITLEACTIONS_PATCH
{ MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} },
{ MODKEY, XK_q, killclient, {0} },
#if KILLUNSEL_PATCH #if KILLUNSEL_PATCH
{ MODKEY|ShiftMask, XK_x, killunsel, {0} }, { MODKEY|ShiftMask, XK_x, killunsel, {0} },
#endif // KILLUNSEL_PATCH #endif // KILLUNSEL_PATCH
@@ -1208,7 +1207,7 @@ static const Key keys[] = {
{ MODKEY|ShiftMask, XK_grave, removescratch, {.ui = 0 } }, { MODKEY|ShiftMask, XK_grave, removescratch, {.ui = 0 } },
#endif // SCRATCHPADS_PATCH | RENAMED_SCRATCHPADS_PATCH #endif // SCRATCHPADS_PATCH | RENAMED_SCRATCHPADS_PATCH
#if UNFLOATVISIBLE_PATCH #if UNFLOATVISIBLE_PATCH
{ MODKEY|Mod4Mask, XK_space, unfloatvisible, {0} }, { MODKEY|Mod1Mask, XK_space, unfloatvisible, {0} },
{ MODKEY|ShiftMask, XK_t, unfloatvisible, {.v = &layouts[0]} }, { MODKEY|ShiftMask, XK_t, unfloatvisible, {.v = &layouts[0]} },
#endif // UNFLOATVISIBLE_PATCH #endif // UNFLOATVISIBLE_PATCH
#if TOGGLEFULLSCREEN_PATCH #if TOGGLEFULLSCREEN_PATCH
@@ -1267,12 +1266,12 @@ static const Key keys[] = {
{ MODKEY|ControlMask, XK_F9, tagall, {.v = "9"} }, { MODKEY|ControlMask, XK_F9, tagall, {.v = "9"} },
#endif // TAGALL_PATCH #endif // TAGALL_PATCH
#if TAGALLMON_PATCH #if TAGALLMON_PATCH
{ MODKEY|Mod4Mask|ShiftMask, XK_comma, tagallmon, {.i = +1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_comma, tagallmon, {.i = +1 } },
{ MODKEY|Mod4Mask|ShiftMask, XK_period, tagallmon, {.i = -1 } }, { MODKEY|Mod1Mask|ShiftMask, XK_period, tagallmon, {.i = -1 } },
#endif // TAGALLMON_PATCH #endif // TAGALLMON_PATCH
#if TAGSWAPMON_PATCH #if TAGSWAPMON_PATCH
{ MODKEY|Mod4Mask|ControlMask, XK_comma, tagswapmon, {.i = +1 } }, { MODKEY|Mod1Mask|ControlMask, XK_comma, tagswapmon, {.i = +1 } },
{ MODKEY|Mod4Mask|ControlMask, XK_period, tagswapmon, {.i = -1 } }, { MODKEY|Mod1Mask|ControlMask, XK_period, tagswapmon, {.i = -1 } },
#endif // TAGSWAPMON_PATCH #endif // TAGSWAPMON_PATCH
#if BAR_ALTERNATIVE_TAGS_PATCH #if BAR_ALTERNATIVE_TAGS_PATCH
{ MODKEY, XK_n, togglealttag, {0} }, { MODKEY, XK_n, togglealttag, {0} },
@@ -1285,10 +1284,10 @@ static const Key keys[] = {
{ MODKEY|ControlMask, XK_Down, switchtag, { .ui = SWITCHTAG_DOWN | SWITCHTAG_VIEW } }, { MODKEY|ControlMask, XK_Down, switchtag, { .ui = SWITCHTAG_DOWN | SWITCHTAG_VIEW } },
{ MODKEY|ControlMask, XK_Right, switchtag, { .ui = SWITCHTAG_RIGHT | SWITCHTAG_VIEW } }, // note keybinding conflict with placedir { MODKEY|ControlMask, XK_Right, switchtag, { .ui = SWITCHTAG_RIGHT | SWITCHTAG_VIEW } }, // note keybinding conflict with placedir
{ MODKEY|ControlMask, XK_Left, switchtag, { .ui = SWITCHTAG_LEFT | SWITCHTAG_VIEW } }, // note keybinding conflict with placedir { MODKEY|ControlMask, XK_Left, switchtag, { .ui = SWITCHTAG_LEFT | SWITCHTAG_VIEW } }, // note keybinding conflict with placedir
{ MODKEY|Mod4Mask, XK_Up, switchtag, { .ui = SWITCHTAG_UP | SWITCHTAG_TAG | SWITCHTAG_VIEW } }, { MODKEY|Mod1Mask, XK_Up, switchtag, { .ui = SWITCHTAG_UP | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
{ MODKEY|Mod4Mask, XK_Down, switchtag, { .ui = SWITCHTAG_DOWN | SWITCHTAG_TAG | SWITCHTAG_VIEW } }, { MODKEY|Mod1Mask, XK_Down, switchtag, { .ui = SWITCHTAG_DOWN | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
{ MODKEY|Mod4Mask, XK_Right, switchtag, { .ui = SWITCHTAG_RIGHT | SWITCHTAG_TAG | SWITCHTAG_VIEW } }, { MODKEY|Mod1Mask, XK_Right, switchtag, { .ui = SWITCHTAG_RIGHT | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
{ MODKEY|Mod4Mask, XK_Left, switchtag, { .ui = SWITCHTAG_LEFT | SWITCHTAG_TAG | SWITCHTAG_VIEW } }, { MODKEY|Mod1Mask, XK_Left, switchtag, { .ui = SWITCHTAG_LEFT | SWITCHTAG_TAG | SWITCHTAG_VIEW } },
#endif // BAR_TAGGRID_PATCH #endif // BAR_TAGGRID_PATCH
#if MOVEPLACE_PATCH #if MOVEPLACE_PATCH
{ MODKEY, XK_KP_7, moveplace, {.ui = WIN_NW }}, /* XK_KP_Home, */ { MODKEY, XK_KP_7, moveplace, {.ui = WIN_NW }}, /* XK_KP_Home, */

21
default.nix
View File

@@ -1,21 +0,0 @@
{ stdenv, fetchurl, libX11, libXft, libXinerama }:
stdenv.mkDerivation {
name = "dwm-HEAD";
src = builtins.filterSource
(path: type: (toString path) != (toString ./.git)) ./.;
buildInputs = [ libX11 libXft libXinerama ];
prePatch = ''
substituteInPlace config.mk --replace '/usr/local' $out
'';
meta = with stdenv.lib; {
description = "Dynamic window manager for X";
homepage = http://dwm.suckless.org/;
license = licenses.mit;
platforms = platforms.all;
};
}

23
flake.lock generated Normal file
View File

@@ -0,0 +1,23 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 0,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"path": "/nix/store/8fwsiv0hd7nw1brkvka0jf1frk3m7qkr-source",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

46
flake.nix Normal file
View File

@@ -0,0 +1,46 @@
{
outputs = { self, nixpkgs }: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
in {
packages.${system}.dwm = pkgs.stdenv.mkDerivation rec {
pname = "dwm";
version = "custom";
src = ./.;
buildInputs = with pkgs; [
xorg.libX11
xorg.libXft
xorg.libXinerama
];
makeFlags = [ "CC=${pkgs.gcc}/bin/cc" ];
installPhase = ''
mkdir -p $out/bin
cp dwm $out/bin/
'';
meta = with pkgs.lib; {
description = "Dynamic Window Manager";
license = licenses.mit;
maintainers = [ ];
};
};
devShells.${system}.default = pkgs.mkShell {
buildInputs = with pkgs; [
gnumake
gcc
xorg.libX11
xorg.libX11.dev
xorg.libXft
xorg.libXinerama
];
shellHook = ''
echo "Development shell for dwm ready."
'';
};
};
}

2
patches.def.h
View File

@@ -645,7 +645,7 @@
* This patch takes precedence over the fakefullscreen client patch below. * This patch takes precedence over the fakefullscreen client patch below.
* https://dwm.suckless.org/patches/fakefullscreen/ * https://dwm.suckless.org/patches/fakefullscreen/
*/ */
#define FAKEFULLSCREEN_PATCH 1 #define FAKEFULLSCREEN_PATCH 0
/* Similarly to the fakefullscreen patch this patch only allows clients to "fullscreen" into /* Similarly to the fakefullscreen patch this patch only allows clients to "fullscreen" into
* the space currently given to them. * the space currently given to them.