diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index 05ade7b..54f82fe 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -52,6 +52,7 @@ ssh.enable = true; btop.enable = true; mpv.enable = true; + i3.enable = true; dwm.enable = true; schizofox.enable = true; displaymanager.enable = true; diff --git a/hosts/vali/mars/default.nix b/hosts/vali/mars/default.nix index 360094d..2a9abad 100644 --- a/hosts/vali/mars/default.nix +++ b/hosts/vali/mars/default.nix @@ -5,5 +5,6 @@ _: { ./hardware-configuration.nix ./profile.nix ./i3 + ./dwm/dwm.nix ]; } diff --git a/hosts/vali/mars/dwm/dwm-6.5/config.h b/hosts/vali/mars/dwm/dwm-6.5/config.h new file mode 100644 index 0000000..9efa774 --- /dev/null +++ b/hosts/vali/mars/dwm/dwm-6.5/config.h @@ -0,0 +1,116 @@ +/* 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 }, +}; + +/* 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 */ + { "[]=", 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} }, + +/* 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_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} }, + { 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 */ +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} }, +}; + diff --git a/hosts/vali/mars/dwm/dwm-6.5/drw.o b/hosts/vali/mars/dwm/dwm-6.5/drw.o new file mode 100644 index 0000000..05c8f4b Binary files /dev/null and b/hosts/vali/mars/dwm/dwm-6.5/drw.o differ diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm b/hosts/vali/mars/dwm/dwm-6.5/dwm new file mode 100755 index 0000000..5e45246 Binary files /dev/null and b/hosts/vali/mars/dwm/dwm-6.5/dwm differ diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.o b/hosts/vali/mars/dwm/dwm-6.5/dwm.o new file mode 100644 index 0000000..171c5aa Binary files /dev/null and b/hosts/vali/mars/dwm/dwm-6.5/dwm.o differ diff --git a/hosts/vali/mars/dwm/dwm-6.5/shell.nix b/hosts/vali/mars/dwm/dwm-6.5/shell.nix new file mode 100644 index 0000000..883e00e --- /dev/null +++ b/hosts/vali/mars/dwm/dwm-6.5/shell.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {} }: + pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + gnumake + xorg.libX11.dev + xorg.libXft + xorg.libXinerama + ]; +} diff --git a/hosts/vali/mars/dwm/dwm-6.5/util.o b/hosts/vali/mars/dwm/dwm-6.5/util.o new file mode 100644 index 0000000..4b569ab Binary files /dev/null and b/hosts/vali/mars/dwm/dwm-6.5/util.o differ diff --git a/hosts/vali/mars/dwm/dwm.nix b/hosts/vali/mars/dwm/dwm.nix index 8fec3cb..e7cea0d 100644 --- a/hosts/vali/mars/dwm/dwm.nix +++ b/hosts/vali/mars/dwm/dwm.nix @@ -11,12 +11,13 @@ in { xkb.layout = "de"; windowManager.dwm = { enable = true; - package = pkgs.dwm.overrideAttrs.src = ./dwm-6.5 - }; - displayManager = { - gdm.enable = true; - defaultSession = "none+dwm"; + # package = pkgs.dwm.overrideAttrs { src = ./dwm-6.5/dwm; }; }; }; + nixpkgs.overlays = [ + (final: prev: { + dwm = prev.dwm.overrideAttrs (old: {src = ./dwm-6.5;}); #FIX ME: Update with path to your dwm folder + }) + ]; }; } diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix index ece2570..b91e21d 100644 --- a/hosts/vali/mars/programs.nix +++ b/hosts/vali/mars/programs.nix @@ -26,6 +26,7 @@ in { foot gcc gdb + gnumake grimblast git httpie @@ -72,6 +73,9 @@ in { vlc wget xclip + xorg.libX11.dev + xorg.libXft + xorg.libXinerama yt-dlp zathura zip