diff --git a/flake.lock b/flake.lock index 8f1fb89..7319099 100644 --- a/flake.lock +++ b/flake.lock @@ -583,7 +583,8 @@ "nixpkgs": "nixpkgs_2", "repo-clone": "repo-clone", "sops-nix": "sops-nix", - "umu": "umu" + "umu": "umu", + "zdwm": "zdwm" } }, "sops-nix": { @@ -677,6 +678,22 @@ "repo": "xwayland-satellite", "type": "github" } + }, + "zdwm": { + "flake": false, + "locked": { + "lastModified": 1732389015, + "narHash": "sha256-VUaKHqgVx7WYREJCP4qJvwZZgtEWF+yXnAw/s1aUFoU=", + "ref": "refs/heads/master", + "rev": "1e4fffe032f085fb6e5967cc47c9d4969a1baed3", + "revCount": 1730, + "type": "git", + "url": "https://git.zynh.me/Zynh0722/dwm" + }, + "original": { + "type": "git", + "url": "https://git.zynh.me/Zynh0722/dwm" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a31a74b..3e771b0 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone"; + zdwm = { url = "git+https://git.zynh.me/Zynh0722/dwm"; flake = false; }; fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; }; backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; }; umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/dwm/config.def.h-6.5.diff b/home/dwm/config.def.h-6.5.diff deleted file mode 100644 index 330864a..0000000 --- a/home/dwm/config.def.h-6.5.diff +++ /dev/null @@ -1,92 +0,0 @@ -From 8f905b563e9dbc2d7b5f4e7c27a2614211c8953a Mon Sep 17 00:00:00 2001 -From: Zynh Ludwig -Date: Wed, 9 Oct 2024 20:12:27 -0700 -Subject: [PATCH] dwm config - ---- - config.def.h | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -diff --git a/config.def.h b/config.def.h -index fed4fb9..072f6bc 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -1,7 +1,7 @@ - /* See LICENSE file for copyright and license details. */ - - /* appearance */ --static const unsigned int borderpx = 1; /* border pixel of windows */ -+static const unsigned int borderpx = 0; /* border pixel of windows */ - static const unsigned int snap = 32; /* snap pixel */ - static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ - static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */ -@@ -10,17 +10,18 @@ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display - static const int showsystray = 1; /* 0 means no systray */ - 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 *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_gray3, col_gray1, col_gray2 }, -- [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -+ [SchemeNorm] = { col_muted, col_h_low, col_base }, -+ [SchemeSel] = { col_text, col_base, col_iris }, - }; - - /* tagging */ -@@ -33,7 +34,10 @@ static const Rule rules[] = { - */ - /* 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 }, -+ { "calendar", NULL, NULL, 1 << 4, 0, 1 }, -+ { "vesktop", NULL, NULL, 1 << 1, 0, 1 }, -+ { "nannou", NULL, NULL, 0, 1, -1 }, - }; - - /* layout(s) */ -@@ -50,7 +54,7 @@ static const Layout layouts[] = { - }; - - /* 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} }, \ -@@ -62,13 +66,15 @@ static const Layout layouts[] = { - - /* 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 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 } }, -+ { ControlMask, XK_Print, spawn, {.v = scrnshotcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, --- -2.46.0 - diff --git a/modules/dwm.nix b/modules/dwm.nix index 359c4bc..b10bef5 100644 --- a/modules/dwm.nix +++ b/modules/dwm.nix @@ -1,7 +1,6 @@ { lib, config, pkgs, inputs, ... }: let - inherit (pkgs) fetchpatch; inherit (lib) getExe; cfg = config.snowhawk.dwm; @@ -26,21 +25,7 @@ in services.xserver.windowManager.dwm = { enable = true; package = pkgs.dwm.overrideAttrs (oldAttrs: { - patches = [ - # Per Tag Patch - (fetchpatch { - url = "https://dwm.suckless.org/patches/pertag/dwm-pertag-6.2.diff"; - hash = "sha256-8DmooU16+TGu+BzUzxdlbYaB12HSae/RO7fGfsC8IHM="; - }) - - # Systray patch - (fetchpatch { - url = "https://dwm.suckless.org/patches/systray/dwm-systray-20230922-9f88553.diff"; - hash = "sha256-Kh1aP1xgZAREjTy7Xz48YBo3rhrJngspUYwBU2Gyw7k="; - }) - - ../home/dwm/config.def.h-6.5.diff - ]; + src = inputs.zdwm; }); };