From a0fcfdbf1058282ac3ac6999a2ca1128285dabd1 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 15 Dec 2025 15:26:52 +0100
Subject: [PATCH 01/25] fixes sessionzier

---
 modules/zellij/config.kdl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index a65ac39..49d4d7e 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -17,7 +17,7 @@ keybinds clear-defaults=true {
                 floating true
                 move_to_focused_tab true
             };
-            SwitchToMode "Locked"
+            SwitchToMode "Locked";
         }
 
         bind "s" {
@@ -25,7 +25,7 @@ keybinds clear-defaults=true {
                 close_on_exit true
                 floating true
             };
-            SwitchToMode "locked";
+            SwitchToMode "Locked";
         }
 
         // Global keybindings

From f4fdee9b9c80b5cb2e0550676a2c6562b1a78639 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 15 Dec 2025 15:28:46 +0100
Subject: [PATCH 02/25] fixes sessionzier

---
 modules/zellij/config.kdl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index 49d4d7e..e491f0f 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -25,6 +25,7 @@ keybinds clear-defaults=true {
                 close_on_exit true
                 floating true
             };
+            TogglePaneEmbedOrFloating;
             SwitchToMode "Locked";
         }
 

From 71cd051c04c1552bca33d1381dd7401170b56e3f Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 15 Dec 2025 15:36:04 +0100
Subject: [PATCH 03/25] fixes sessionzier

---
 modules/zellij/config.kdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index e491f0f..0469684 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -21,7 +21,7 @@ keybinds clear-defaults=true {
         }
 
         bind "s" {
-            Run "sessionizer" {
+            Run "fish" "(sessionizer)" {
                 close_on_exit true
                 floating true
             };

From ef7e6982e22ec0e607b54024ce5d12236c397aa2 Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 15 Dec 2025 15:42:29 +0100
Subject: [PATCH 04/25] fixes sessionzier

---
 modules/fish/default.nix  | 1 +
 modules/zellij/config.kdl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index c02d305..1499c79 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -182,6 +182,7 @@
       setup_path = /* fish */ ''
         fish_add_path /run/wrappers/bin
         fish_add_path /run/current-system/sw/bin
+        fish_add_path $HOME/.config/fish/functions
 
         if test "$uname" = "Darwin"
           setup_homebrew
diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index 0469684..e491f0f 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -21,7 +21,7 @@ keybinds clear-defaults=true {
         }
 
         bind "s" {
-            Run "fish" "(sessionizer)" {
+            Run "sessionizer" {
                 close_on_exit true
                 floating true
             };

From bbbbcfa59b944fc2f0ba5168d4827de0b832b0cf Mon Sep 17 00:00:00 2001
From: Dennis <dennis@dnsc-work.fritz.box>
Date: Mon, 15 Dec 2025 15:47:03 +0100
Subject: [PATCH 05/25] fixes sessionzier

---
 modules/fish/default.nix  | 1 -
 modules/zellij/config.kdl | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/fish/default.nix b/modules/fish/default.nix
index 1499c79..c02d305 100644
--- a/modules/fish/default.nix
+++ b/modules/fish/default.nix
@@ -182,7 +182,6 @@
       setup_path = /* fish */ ''
         fish_add_path /run/wrappers/bin
         fish_add_path /run/current-system/sw/bin
-        fish_add_path $HOME/.config/fish/functions
 
         if test "$uname" = "Darwin"
           setup_homebrew
diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index e491f0f..37d971d 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -21,11 +21,10 @@ keybinds clear-defaults=true {
         }
 
         bind "s" {
-            Run "sessionizer" {
+            Run "fish" "-ic" "sessionizer" {
                 close_on_exit true
                 floating true
             };
-            TogglePaneEmbedOrFloating;
             SwitchToMode "Locked";
         }
 

From 0f8c57641f079ad89df6aef836886215012353f2 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 19:13:00 +0100
Subject: [PATCH 06/25] adapts mouse accel speed

---
 modules/wm/niri/config/config.kdl | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 42e9ad0..999c85f 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -34,22 +34,11 @@ input {
     mouse {
         // off
         // natural-scroll
-        // accel-speed 0.2
+        accel-speed 0.9
         // accel-profile "flat"
         // scroll-method "no-scroll"
     }
 
-    trackpoint {
-        // off
-        // natural-scroll
-        // accel-speed 0.2
-        // accel-profile "flat"
-        // scroll-method "on-button-down"
-        // scroll-button 273
-        // scroll-button-lock
-        // middle-emulation
-    }
-
     tablet {
         map-to-output "DP-3"
         // calibration-matrix 1.0 1.0 1.0 1.0 1.0 1.0

From f8cd971b5008d6339b521192c93d7905a515ead6 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 19:16:51 +0100
Subject: [PATCH 07/25] tries unstable again

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index c7d06bb..1f930a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,7 +55,7 @@
       nixosModules.steam = import ./modules/steam;
       nixosModules.niriSystem = import ./modules/wm/niri-system;
 
-      nixosConfigurations.dnsc-machine = inputs.nixpkgs-stable.lib.nixosSystem {
+      nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs outputs; };
         modules = [

From 88ed615a422027b6026533042741ff2bf5a04a06 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 19:26:51 +0100
Subject: [PATCH 08/25] fixes some annoyances

---
 flake.lock                            | 36 +++++++++++++--------------
 home/linux.nix                        |  2 ++
 modules/wm/ironbar/config/config.toml |  2 +-
 modules/zen/default.nix               |  2 +-
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index b04fa18..942c5f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -89,11 +89,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1765876616,
-        "narHash": "sha256-j9BnLfWdJrJrETfmfnlnpvRGKVp1MLRaw78oYDSnTRY=",
+        "lastModified": 1765944212,
+        "narHash": "sha256-t00grDNNFjoUM2MWhBISsChMZJbt0zxYn9SK0ZR+1Ns=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "2843ec4d4793815111a1b99e170ec7b1842b7f9f",
+        "rev": "353247cb60d73387ce75bf058d65a18517f56a7c",
         "type": "gitlab"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765860045,
-        "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
+        "lastModified": 1765980955,
+        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
+        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
         "type": "github"
       },
       "original": {
@@ -208,11 +208,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765808204,
-        "narHash": "sha256-pnI+SmXYXeNofYBYbcCkj4CTJdoXwJYYPgc1MutMz0Q=",
+        "lastModified": 1765991878,
+        "narHash": "sha256-xbXgzqqtxoiqeQPB01IruQiQ4+LvcUujRyjK13HRHHc=",
         "owner": "JakeStanger",
         "repo": "ironbar",
-        "rev": "c2f1043524b8eee45369692e56bb170b640df047",
+        "rev": "91e1897629000ef094f17f7ccd580115d7cef44e",
         "type": "github"
       },
       "original": {
@@ -315,11 +315,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1765762245,
-        "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
+        "lastModified": 1765838191,
+        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
+        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
         "type": "github"
       },
       "original": {
@@ -359,11 +359,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1765803225,
-        "narHash": "sha256-xwaZV/UgJ04+ixbZZfoDE8IsOWjtvQZICh9aamzPnrg=",
+        "lastModified": 1765934234,
+        "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac9a217389ee622d4e1e727c4efcc9c4bc9089ba",
+        "rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
         "type": "github"
       },
       "original": {
@@ -523,11 +523,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1765895443,
-        "narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=",
+        "lastModified": 1765946036,
+        "narHash": "sha256-R/qaIkzqm00qBMr8onM6ZZFX49lvsQLZ79adVubqjts=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56",
+        "rev": "7db019a64483743a8d92319baafbbe71b687d0a1",
         "type": "github"
       },
       "original": {
diff --git a/home/linux.nix b/home/linux.nix
index 98c296d..c297a53 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -36,6 +36,8 @@
     wl-clipboard
     hyprpicker
     usbutils
+    krita
+    gpustat
   ];
 
   imports = [
diff --git a/modules/wm/ironbar/config/config.toml b/modules/wm/ironbar/config/config.toml
index fc2256d..bb16a63 100644
--- a/modules/wm/ironbar/config/config.toml
+++ b/modules/wm/ironbar/config/config.toml
@@ -32,7 +32,7 @@ max_length = 40
 type = "sys_info"
 format = [
   "h:dnsc-machine",
-  "  {cpu_percent@sum}% ({temp_c@k10temp Tccd1}°C)",
+  "  {cpu_percent}% ({temp_c@k10temp Tccd1}°C)",
   "  {memory_used#G:<2.1}/{memory_total#G:<2.1}GB",
   "  {disk_used#G@/:.1}GB used ({disk_free#G@/:.0}GB free)"
 ]
diff --git a/modules/zen/default.nix b/modules/zen/default.nix
index 1559f9c..313e35c 100644
--- a/modules/zen/default.nix
+++ b/modules/zen/default.nix
@@ -49,7 +49,7 @@
             workspace = spaces.Personal.id;
             container = containers.Personal.id;
             url = "https://home.dnsc.io";
-            position = 100;
+            position = 101;
           };
           "Apps" = {
             id = "092abc24-d7c5-4012-b311-d4ee0b193537";

From d68ef4942d54fdb4c5d279a71c4875f8f196a6ef Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 19:37:30 +0100
Subject: [PATCH 09/25] fixes some more annoyances

---
 modules/wm/fuzzel/scripts/fuzzel-projects.sh | 5 +++--
 modules/wm/niri/config/config.kdl            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/wm/fuzzel/scripts/fuzzel-projects.sh b/modules/wm/fuzzel/scripts/fuzzel-projects.sh
index dd5d43c..1aba537 100755
--- a/modules/wm/fuzzel/scripts/fuzzel-projects.sh
+++ b/modules/wm/fuzzel/scripts/fuzzel-projects.sh
@@ -8,9 +8,10 @@ for project in ${projects[*]}; do
 done
 
 selected=$(printf "$projects_with_names" | fuzzel --dmenu --with-nth=1 --accept-nth=2 --prompt "Work on: ")
+session_name=$(basename "$selected")
 
 if [ "$selected" != "" ]; then
   niri msg action focus-workspace "code"
-  firefox &
-  ghostty --working-directory="$selected"
+  zen-beta &
+  ghostty -e zellij attach "$session_name" --create
 fi
diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 999c85f..f48fb46 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -34,7 +34,7 @@ input {
     mouse {
         // off
         // natural-scroll
-        accel-speed 0.9
+        accel-speed 0.8
         // accel-profile "flat"
         // scroll-method "no-scroll"
     }

From cab5fd7e191bdf08ccb00c1194c646c1ae3a064c Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 19:55:46 +0100
Subject: [PATCH 10/25] decreases mouse accel

---
 modules/wm/niri/config/config.kdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index f48fb46..d70c19d 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -34,7 +34,7 @@ input {
     mouse {
         // off
         // natural-scroll
-        accel-speed 0.8
+        accel-speed 0.7
         // accel-profile "flat"
         // scroll-method "no-scroll"
     }

From 463bdf97a28506f3da148ceddb5114279f014c6b Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 20:01:46 +0100
Subject: [PATCH 11/25] fixes zellij pane move and niri accel speed

---
 modules/wm/niri/config/config.kdl | 4 ++--
 modules/zellij/config.kdl         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index d70c19d..6738ea2 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -34,7 +34,7 @@ input {
     mouse {
         // off
         // natural-scroll
-        accel-speed 0.7
+        accel-speed -0.3
         // accel-profile "flat"
         // scroll-method "no-scroll"
     }
@@ -100,7 +100,7 @@ layout {
     // You can change how the focus ring looks.
     focus-ring {
         // off
-        width 2
+        width 3
         active-color "#c57faf"
         inactive-color "#d369af"
     }
diff --git a/modules/zellij/config.kdl b/modules/zellij/config.kdl
index 37d971d..bc1e058 100644
--- a/modules/zellij/config.kdl
+++ b/modules/zellij/config.kdl
@@ -34,10 +34,10 @@ keybinds clear-defaults=true {
         bind "x" { CloseFocus; SwitchToMode "Locked"; }
         bind "-" { NewPane "Down"; SwitchToMode "Locked"; }
         bind "|" { NewPane "Right"; SwitchToMode "Locked"; }
-        bind "h" "Left" { MoveFocus "Left"; }
-        bind "l" "Right" { MoveFocus "Right"; }
-        bind "j" "Down" { MoveFocus "Down"; }
-        bind "k" "Up" { MoveFocus "Up"; }
+        bind "h" "Left" { MoveFocus "Left"; SwitchToMode "Locked"; }
+        bind "l" "Right" { MoveFocus "Right"; SwitchToMode "Locked"; }
+        bind "j" "Down" { MoveFocus "Down"; SwitchToMode "Locked"; }
+        bind "k" "Up" { MoveFocus "Up"; SwitchToMode "Locked"; }
         bind "1" { GoToTab 1; SwitchToMode "Locked"; }
         bind "2" { GoToTab 2; SwitchToMode "Locked"; }
         bind "3" { GoToTab 3; SwitchToMode "Locked"; }

From 90267481d3b6eb050bacdcaf628015f9589de91e Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 20:13:49 +0100
Subject: [PATCH 12/25] fixes zen PIP and installs librewolf

---
 home/linux.nix                    | 2 +-
 modules/wm/niri/config/config.kdl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/home/linux.nix b/home/linux.nix
index c297a53..ff28eb4 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -38,6 +38,7 @@
     usbutils
     krita
     gpustat
+    librewolf
   ];
 
   imports = [
@@ -50,7 +51,6 @@
     ../modules/fish
     ../modules/zellij
     ../modules/mpv
-    ../modules/firefox
     ../modules/zen
     ../modules/wm/swaync
     ../modules/wm/cliphist
diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 6738ea2..84ae9b2 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -247,7 +247,7 @@ window-rule {
     // This app-id regular expression will work for both:
     // - host Firefox (app-id is "firefox")
     // - Flatpak Firefox (app-id is "org.mozilla.firefox")
-    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    match app-id=r#"zen-beta$"# title="^Picture-in-Picture$"
     open-floating true
 }
 

From 99e52fe9effd42307c504a41fd1b09a0716fa159 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 20:19:51 +0100
Subject: [PATCH 13/25] trying out non-workspace switching project selector

---
 modules/wm/fuzzel/scripts/fuzzel-projects.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/wm/fuzzel/scripts/fuzzel-projects.sh b/modules/wm/fuzzel/scripts/fuzzel-projects.sh
index 1aba537..8ce3508 100755
--- a/modules/wm/fuzzel/scripts/fuzzel-projects.sh
+++ b/modules/wm/fuzzel/scripts/fuzzel-projects.sh
@@ -11,7 +11,7 @@ selected=$(printf "$projects_with_names" | fuzzel --dmenu --with-nth=1 --accept-
 session_name=$(basename "$selected")
 
 if [ "$selected" != "" ]; then
-  niri msg action focus-workspace "code"
-  zen-beta &
+  # niri msg action focus-workspace "code"
+  # zen-beta &
   ghostty -e zellij attach "$session_name" --create
 fi

From 7b7448ed19078dd379673bd500e6e695c1daa4df Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Wed, 17 Dec 2025 20:44:44 +0100
Subject: [PATCH 14/25] turns off niri animations

---
 modules/wm/niri/config/config.kdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 84ae9b2..c5c6b72 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -206,7 +206,7 @@ screenshot-path "~/Pictures/Screenshots/taken_at_%Y-%m-%d %H-%M-%S.png"
 // https://yalter.github.io/niri/Configuration:-Animations
 animations {
     // Uncomment to turn off all animations.
-    // off
+    off
 
     // Slow down all animations by this factor. Values below 1 speed them up instead.
     // slowdown 3.0

From a18063885ea25e198bf3c4b70113ad113fcfdea1 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Thu, 18 Dec 2025 20:56:18 +0100
Subject: [PATCH 15/25] zen theme colors

---
 modules/zen/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/modules/zen/default.nix b/modules/zen/default.nix
index 313e35c..845e6cc 100644
--- a/modules/zen/default.nix
+++ b/modules/zen/default.nix
@@ -41,6 +41,22 @@
             id = "53d805fa-2cc1-44b5-929b-a72cc83d9587";
             position = 1000;
             container = containers."Personal".id;
+            theme = {
+              type = "gradient";
+              texture = 0.7;
+              color = [
+                {
+                  red = 87;
+                  green = 36;
+                  blue = 84;
+                }
+                {
+                  red = 51;
+                  green = 21;
+                  blue = 49;
+                }
+              ];
+            };
           };
         };
         pins = {

From 6daec5b04dbe706a53d223a31bc407b6bd65ef26 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Thu, 18 Dec 2025 21:21:31 +0100
Subject: [PATCH 16/25] fixes zen theme

---
 modules/zen/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/zen/default.nix b/modules/zen/default.nix
index 845e6cc..eb64533 100644
--- a/modules/zen/default.nix
+++ b/modules/zen/default.nix
@@ -44,7 +44,8 @@
             theme = {
               type = "gradient";
               texture = 0.7;
-              color = [
+              opacity = 0.8;
+              colors = [
                 {
                   red = 87;
                   green = 36;

From c9aa1dedc72aaed4b4dfb3df1cb613f915d61cc3 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Thu, 18 Dec 2025 22:14:33 +0100
Subject: [PATCH 17/25] wip:waybar

---
 modules/wm/waybar/config/config.jsonc | 23 +++++++++++++++++++++++
 modules/wm/waybar/config/style.css    |  4 ++++
 modules/wm/waybar/default.nix         | 15 +++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 modules/wm/waybar/config/config.jsonc
 create mode 100644 modules/wm/waybar/config/style.css
 create mode 100644 modules/wm/waybar/default.nix

diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
new file mode 100644
index 0000000..dd1e76d
--- /dev/null
+++ b/modules/wm/waybar/config/config.jsonc
@@ -0,0 +1,23 @@
+{
+  // Bar Options
+  "layer": "top",
+  "output": "DP-3",
+  "position": "left",
+  "margin": "5px",
+  // Placing Modules
+  "modules-left": [
+    "niri/workspaces"
+  ],
+  "modules-center": [],
+  "modules-right": [
+    "clock"
+  ],
+  // Module Configuration 
+  "niri/workspaces": {
+    "format": "{icon}",
+    "format-icons": {
+      "active": "",
+      "default": ""
+    }
+  }
+}
diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css
new file mode 100644
index 0000000..cf6e967
--- /dev/null
+++ b/modules/wm/waybar/config/style.css
@@ -0,0 +1,4 @@
+* {
+  font-family: "VictorMono Nerd Font";
+  font-size: 12;
+}
diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix
new file mode 100644
index 0000000..a03d35a
--- /dev/null
+++ b/modules/wm/waybar/default.nix
@@ -0,0 +1,15 @@
+{ config, ... }:
+
+{
+  xdg.configFile."waybar" = {
+    source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/wm/waybar/config";
+  };
+
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = false;
+      target = "graphical-session.target";
+    };
+  };
+}

From 8d786e37a7353cb7f890146beb52bcbab3b9c4ae Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Thu, 18 Dec 2025 22:15:49 +0100
Subject: [PATCH 18/25] wip:waybar

---
 home/linux.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/linux.nix b/home/linux.nix
index ff28eb4..4b81977 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -57,6 +57,7 @@
     ../modules/wm/awww
     ../modules/wm/fuzzel
     ../modules/wm/ironbar
+    ../modules/wm/waybar
     ../modules/wm/niri
   ];
 

From e0b15d993b6e5a8a1756efe4a1ea923aadbd8471 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 00:28:30 +0100
Subject: [PATCH 19/25] wip:waybar

---
 home/linux.nix                        |  1 +
 modules/wm/waybar/config/config.jsonc | 75 ++++++++++++++++++++++++---
 modules/wm/waybar/config/style.css    | 60 ++++++++++++++++++++-
 3 files changed, 128 insertions(+), 8 deletions(-)

diff --git a/home/linux.nix b/home/linux.nix
index 4b81977..9303a60 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -39,6 +39,7 @@
     krita
     gpustat
     librewolf
+    pamixer
   ];
 
   imports = [
diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index dd1e76d..962c66e 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -1,23 +1,86 @@
 {
   // Bar Options
-  "layer": "top",
   "output": "DP-3",
   "position": "left",
-  "margin": "5px",
+  "margin-left": 8,
+  "margin-top": 8,
+  "margin-bottom": 8,
+  // TODO: Remove
+  "reload_style_on_change": true,
   // Placing Modules
   "modules-left": [
+    "clock",
+    "custom/cpu-label",
+    "cpu",
+    "custom/memory-label",
+    "memory",
+    "custom/disk-label",
+    "disk"
+  ],
+  "modules-center": [
     "niri/workspaces"
   ],
-  "modules-center": [],
   "modules-right": [
-    "clock"
+    "wireplumber",
+    "tray"
   ],
   // Module Configuration 
   "niri/workspaces": {
     "format": "{icon}",
     "format-icons": {
-      "active": "",
-      "default": ""
+      "active": "󰄯",
+      "default": "󰄰"
     }
+  },
+  "clock": {
+    "interval": 60,
+    "format": "{:%H\n%M}",
+    "format-alt": "<span color='#d369af'>{:%d\n%m}</span>",
+    "tooltip": false,
+    "justify": "center"
+  },
+  "custom/cpu-label": {
+    "format": "CPU",
+    "tooltip": false
+  },
+  "cpu": {
+    "interval": "30",
+    "format": "{usage}%",
+    "max-length": 2
+  },
+  "custom/memory-label": {
+    "format": "MEM",
+    "tooltip": false
+  },
+  "memory": {
+    "interval": "30",
+    "format": "{percentage}%",
+    "max-length": 2
+  },
+  "custom/disk-label": {
+    "format": "SSD",
+    "tooltip": false
+  },
+  "disk": {
+    "interval": "30",
+    "format": "{percentage_used}%",
+    "max-length": 2
+  },
+  "wireplumber": {
+    "on-click": "pamixer -t",
+    "on-click-right": "pwvucontrol",
+    "format": "{icon}",
+    "format-muted": "󰖁",
+    "format-icons": {
+      "default": [
+        "󰕿",
+        "󰖀",
+        "󰕾"
+      ]
+    }
+  },
+  "tray": {
+    "icon-size": 14,
+    "spacing": 18
   }
 }
diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css
index cf6e967..ee778be 100644
--- a/modules/wm/waybar/config/style.css
+++ b/modules/wm/waybar/config/style.css
@@ -1,4 +1,60 @@
 * {
-  font-family: "VictorMono Nerd Font";
-  font-size: 12;
+  font-family: "VictorMono Nerd Font Propo";
+  font-size: 12px;
+  font-weight: bold;
+  background: transparent;
+}
+
+tooltip,
+#tray menu {
+  background: rgba(15, 11, 12, 0.9);
+  border-radius: 8px;
+  border: 2px solid #572454;
+}
+
+window#waybar {
+  background-color: rgba(15, 11, 12, 0.999);
+  border-radius: 8px;
+  color: #ffffff;
+}
+
+#workspaces button {
+  padding: 2px 10px;
+  margin: 0;
+  color: #d369af;
+}
+
+#clock {
+  font-size: 15px;
+  padding: 8px 0 8px;
+}
+
+#custom-cpu-label,
+#custom-memory-label,
+#custom-disk-label {
+  color: #572454;
+  padding-top: 6px;
+  border-top: 1px solid #572454;
+}
+
+#disk {
+  border-bottom: 1px solid #572454;
+}
+
+#cpu,
+#memory,
+#disk {
+  color: #d369af;
+  padding-bottom: 8px;
+}
+
+#wireplumber {
+  font-size: 16px;
+}
+
+#tray {
+  margin: 4px;
+  border-radius: 4px;
+  padding-top: 10px;
+  padding-bottom: 10px;
 }

From 324357540d618c4e2da13f3d14d9806eeb43e332 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 00:58:14 +0100
Subject: [PATCH 20/25] configures waybar

---
 flake.nix                               |  4 ---
 home/linux.nix                          |  2 --
 hosts/dnsc-machine/default.nix          |  1 -
 modules/wm/niri/config/config.kdl       |  2 --
 modules/wm/waybar/config/config.jsonc   | 37 ++++++++++++++++++++++---
 modules/wm/waybar/config/power_menu.xml | 20 +++++++++++++
 modules/wm/waybar/config/style.css      | 28 +++++++++++++++++--
 modules/wm/waybar/default.nix           |  2 +-
 8 files changed, 80 insertions(+), 16 deletions(-)
 create mode 100644 modules/wm/waybar/config/power_menu.xml

diff --git a/flake.nix b/flake.nix
index 1f930a3..2db518e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,10 +10,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    ironbar = {
-      url = "github:JakeStanger/ironbar";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix-darwin.url = "github:LnL7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
     ip-whitelist.url = "github:Oak-Digital/nixos-ip-whitelist-firewall";
diff --git a/home/linux.nix b/home/linux.nix
index 9303a60..cc52cb5 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -39,7 +39,6 @@
     krita
     gpustat
     librewolf
-    pamixer
   ];
 
   imports = [
@@ -57,7 +56,6 @@
     ../modules/wm/cliphist
     ../modules/wm/awww
     ../modules/wm/fuzzel
-    ../modules/wm/ironbar
     ../modules/wm/waybar
     ../modules/wm/niri
   ];
diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix
index 7a7001a..0bc92e9 100644
--- a/hosts/dnsc-machine/default.nix
+++ b/hosts/dnsc-machine/default.nix
@@ -63,7 +63,6 @@
       dennis = {
         imports = [
           inputs.zen-browser.homeModules.beta
-          inputs.ironbar.homeManagerModules.default
           ../../home/linux.nix
         ];
       };
diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index c5c6b72..5559b8d 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -179,8 +179,6 @@ layout {
 // STARTUP
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
-spawn-at-startup "ironbar"
-spawn-at-startup "blueman-applet"
 spawn-at-startup "tailscale systray"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index 962c66e..affafa0 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -21,8 +21,10 @@
     "niri/workspaces"
   ],
   "modules-right": [
-    "wireplumber",
-    "tray"
+    "wireplumber#source",
+    "wireplumber#sink",
+    "tray",
+    "custom/power"
   ],
   // Module Configuration 
   "niri/workspaces": {
@@ -66,9 +68,25 @@
     "format": "{percentage_used}%",
     "max-length": 2
   },
-  "wireplumber": {
-    "on-click": "pamixer -t",
+  "wireplumber#source": {
+    "node-type": "Audio/Source",
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
     "on-click-right": "pwvucontrol",
+    "scroll-step": 5.0,
+    "tooltip-format": "{node_name} ({source_volume}%)",
+    "format": "{icon}",
+    "format-muted": "󰍭",
+    "format-icons": {
+      "default": [
+        "󰍬"
+      ]
+    }
+  },
+  "wireplumber#sink": {
+    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+    "on-click-right": "pwvucontrol",
+    "scroll-step": 5.0,
+    "tooltip-format": "{node_name} ({volume}%)",
     "format": "{icon}",
     "format-muted": "󰖁",
     "format-icons": {
@@ -82,5 +100,16 @@
   "tray": {
     "icon-size": 14,
     "spacing": 18
+  },
+  "custom/power": {
+    "format": "󰐥",
+    "tooltip": false,
+    "menu": "on-click",
+    "menu-file": "~/.config/waybar/power_menu.xml",
+    "menu-actions": {
+      "lock": "hyprlock",
+      "reboot": "reboot",
+      "shutdown": "shutdown"
+    }
   }
 }
diff --git a/modules/wm/waybar/config/power_menu.xml b/modules/wm/waybar/config/power_menu.xml
new file mode 100644
index 0000000..748ccb1
--- /dev/null
+++ b/modules/wm/waybar/config/power_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <object class="GtkMenu" id="menu">
+        <child>
+            <object class="GtkMenuItem" id="lock">
+                <property name="label">Suspend</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="reboot">
+                <property name="label">Hibernate</property>
+            </object>
+        </child>
+        <child>
+            <object class="GtkMenuItem" id="shutdown">
+                <property name="label">Shutdown</property>
+            </object>
+        </child>
+    </object>
+</interface>
diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css
index ee778be..9b03dbd 100644
--- a/modules/wm/waybar/config/style.css
+++ b/modules/wm/waybar/config/style.css
@@ -6,14 +6,26 @@
 }
 
 tooltip,
-#tray menu {
+menu {
   background: rgba(15, 11, 12, 0.9);
   border-radius: 8px;
   border: 2px solid #572454;
 }
 
+menuitem {
+  color: #ffffff;
+  margin-left: 4px;
+  margin-right: 4px;
+  border-radius: 4px;
+}
+
+menuitem:hover {
+  color: #331531;
+  background-color: #c57faf;
+}
+
 window#waybar {
-  background-color: rgba(15, 11, 12, 0.999);
+  background-color: rgba(15, 11, 12, 0.95);
   border-radius: 8px;
   color: #ffffff;
 }
@@ -50,11 +62,23 @@ window#waybar {
 
 #wireplumber {
   font-size: 16px;
+  margin-top: 4px;
+  margin-bottom: 4px;
 }
 
 #tray {
   margin: 4px;
+  margin-top: 0;
   border-radius: 4px;
   padding-top: 10px;
   padding-bottom: 10px;
 }
+
+#custom-power {
+  background-color: #331531;
+  font-size: 16px;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+}
diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix
index a03d35a..f8749ac 100644
--- a/modules/wm/waybar/default.nix
+++ b/modules/wm/waybar/default.nix
@@ -8,7 +8,7 @@
   programs.waybar = {
     enable = true;
     systemd = {
-      enable = false;
+      enable = true;
       target = "graphical-session.target";
     };
   };

From f83bb4332679aeae751a8b0485e3c9cafd3766a4 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 00:59:46 +0100
Subject: [PATCH 21/25] removes ironbar flake

---
 flake.lock             | 116 -----------------------------------------
 flake.nix              |   1 -
 home/linux.nix         |   7 +--
 modules/wm/default.nix |   2 +-
 4 files changed, 2 insertions(+), 124 deletions(-)

diff --git a/flake.lock b/flake.lock
index 942c5f7..d05c6f3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -60,29 +60,6 @@
         "type": "github"
       }
     },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "ironbar",
-          "naersk",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1752475459,
-        "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "firefox-addons": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
@@ -103,21 +80,6 @@
         "type": "gitlab"
       }
     },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -198,51 +160,6 @@
         "type": "github"
       }
     },
-    "ironbar": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "naersk": "naersk",
-        "nix-systems": "nix-systems",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765991878,
-        "narHash": "sha256-xbXgzqqtxoiqeQPB01IruQiQ4+LvcUujRyjK13HRHHc=",
-        "owner": "JakeStanger",
-        "repo": "ironbar",
-        "rev": "91e1897629000ef094f17f7ccd580115d7cef44e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JakeStanger",
-        "repo": "ironbar",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "fenix": "fenix",
-        "nixpkgs": [
-          "ironbar",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763384566,
-        "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -282,21 +199,6 @@
         "type": "github"
       }
     },
-    "nix-systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1754028485,
@@ -423,7 +325,6 @@
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager_2",
         "ip-whitelist": "ip-whitelist",
-        "ironbar": "ironbar",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_4",
@@ -432,23 +333,6 @@
         "zen-browser": "zen-browser"
       }
     },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1752428706,
-        "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": "nixpkgs_6"
diff --git a/flake.nix b/flake.nix
index 2db518e..5843aa6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,6 @@
       nix-darwin,
       nix-homebrew,
       agenix,
-      ironbar,
       zellij-switch,
       ...
     }@inputs:
diff --git a/home/linux.nix b/home/linux.nix
index cc52cb5..b8824dd 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -52,12 +52,7 @@
     ../modules/zellij
     ../modules/mpv
     ../modules/zen
-    ../modules/wm/swaync
-    ../modules/wm/cliphist
-    ../modules/wm/awww
-    ../modules/wm/fuzzel
-    ../modules/wm/waybar
-    ../modules/wm/niri
+    ../modules/wm
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index e290398..7e61ab0 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -3,7 +3,7 @@
     ./awww
     ./cliphist
     ./fuzzel
-    ./ironbar
+    ./waybar
     ./niri
     ./swaync
   ];

From 4d98f6beb5877359dd849203f078427bdd708f08 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 01:17:47 +0100
Subject: [PATCH 22/25] some fixes

---
 home/linux.nix                          |  7 +++++-
 modules/wm/niri/config/config.kdl       | 33 ++++++++++---------------
 modules/wm/waybar/config/config.jsonc   | 16 +++++++++---
 modules/wm/waybar/config/power_menu.xml |  4 +--
 modules/wm/waybar/config/style.css      |  8 +++---
 modules/wm/waybar/default.nix           |  8 +-----
 6 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/home/linux.nix b/home/linux.nix
index b8824dd..cc52cb5 100644
--- a/home/linux.nix
+++ b/home/linux.nix
@@ -52,7 +52,12 @@
     ../modules/zellij
     ../modules/mpv
     ../modules/zen
-    ../modules/wm
+    ../modules/wm/swaync
+    ../modules/wm/cliphist
+    ../modules/wm/awww
+    ../modules/wm/fuzzel
+    ../modules/wm/waybar
+    ../modules/wm/niri
   ];
 
   programs.home-manager.enable = true;
diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 5559b8d..6523ca7 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -180,6 +180,7 @@ layout {
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "tailscale systray"
+spawn-at-startup "waybar"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
 hotkey-overlay {
@@ -214,20 +215,12 @@ overview {
     backdrop-color "#0f0b15"
 }
 
-workspace "main"
-workspace "code"
-workspace "gaming"
-workspace "other"
-workspace "chat"
-workspace "media"
-
 // Window rules let you adjust behavior for individual windows.
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Window-Rules
 
 window-rule {
     match app-id=r#"^steam$"#
-    open-on-workspace "gaming"
 }
 
 // window-rule {
@@ -424,21 +417,21 @@ binds {
     //
     // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
     // will all refer to the 3rd workspace.
-    Alt+1 { focus-workspace "main"; }
-    Alt+2 { focus-workspace "code"; }
-    Alt+3 { focus-workspace "gaming"; }
-    Alt+4 { focus-workspace "other"; }
-    Alt+5 { focus-workspace "chat"; }
-    Alt+6 { focus-workspace "media"; }
+    Alt+1 { focus-workspace 1; }
+    Alt+2 { focus-workspace 2; }
+    Alt+3 { focus-workspace 3; }
+    Alt+4 { focus-workspace 4; }
+    Alt+5 { focus-workspace 5; }
+    Alt+6 { focus-workspace 6; }
     Alt+7 { focus-workspace 7; }
     Alt+8 { focus-workspace 8; }
     Alt+9 { focus-workspace 9; }
-    Alt+Ctrl+1 { move-column-to-workspace "main"; }
-    Alt+Ctrl+2 { move-column-to-workspace "code"; }
-    Alt+Ctrl+3 { move-column-to-workspace "gaming"; }
-    Alt+Ctrl+4 { move-column-to-workspace "other"; }
-    Alt+Ctrl+5 { move-column-to-workspace "chat"; }
-    Alt+Ctrl+6 { move-column-to-workspace "media"; }
+    Alt+Ctrl+1 { move-column-to-workspace 1; }
+    Alt+Ctrl+2 { move-column-to-workspace 2; }
+    Alt+Ctrl+3 { move-column-to-workspace 3; }
+    Alt+Ctrl+4 { move-column-to-workspace 4; }
+    Alt+Ctrl+5 { move-column-to-workspace 5; }
+    Alt+Ctrl+6 { move-column-to-workspace 6; }
     Alt+Ctrl+7 { move-column-to-workspace 7; }
     Alt+Ctrl+8 { move-column-to-workspace 8; }
     Alt+Ctrl+9 { move-column-to-workspace 9; }
diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index affafa0..732037b 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -5,8 +5,6 @@
   "margin-left": 8,
   "margin-top": 8,
   "margin-bottom": 8,
-  // TODO: Remove
-  "reload_style_on_change": true,
   // Placing Modules
   "modules-left": [
     "clock",
@@ -15,7 +13,9 @@
     "custom/memory-label",
     "memory",
     "custom/disk-label",
-    "disk"
+    "disk",
+    "custom/nvidia-label",
+    "custom/nvidia"
   ],
   "modules-center": [
     "niri/workspaces"
@@ -68,6 +68,16 @@
     "format": "{percentage_used}%",
     "max-length": 2
   },
+  "custom/nvidia-label": {
+    "format": "GPU",
+    "tooltip": false
+  },
+  "custom/nvidia": {
+    "exec": "nvidia-smi --query-gpu=temperature.gpu --format=csv,nounits,noheader",
+    "format": "{}°",
+    "tooltip": false,
+    "interval": 10
+  },
   "wireplumber#source": {
     "node-type": "Audio/Source",
     "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
diff --git a/modules/wm/waybar/config/power_menu.xml b/modules/wm/waybar/config/power_menu.xml
index 748ccb1..8b15c31 100644
--- a/modules/wm/waybar/config/power_menu.xml
+++ b/modules/wm/waybar/config/power_menu.xml
@@ -3,12 +3,12 @@
     <object class="GtkMenu" id="menu">
         <child>
             <object class="GtkMenuItem" id="lock">
-                <property name="label">Suspend</property>
+                <property name="label">Lock</property>
             </object>
         </child>
         <child>
             <object class="GtkMenuItem" id="reboot">
-                <property name="label">Hibernate</property>
+                <property name="label">Reboot</property>
             </object>
         </child>
         <child>
diff --git a/modules/wm/waybar/config/style.css b/modules/wm/waybar/config/style.css
index 9b03dbd..858e436 100644
--- a/modules/wm/waybar/config/style.css
+++ b/modules/wm/waybar/config/style.css
@@ -43,19 +43,21 @@ window#waybar {
 
 #custom-cpu-label,
 #custom-memory-label,
-#custom-disk-label {
+#custom-disk-label,
+#custom-nvidia-label {
   color: #572454;
   padding-top: 6px;
   border-top: 1px solid #572454;
 }
 
-#disk {
+#custom-nvidia {
   border-bottom: 1px solid #572454;
 }
 
 #cpu,
 #memory,
-#disk {
+#disk,
+#custom-nvidia {
   color: #d369af;
   padding-bottom: 8px;
 }
diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix
index f8749ac..cee2cf2 100644
--- a/modules/wm/waybar/default.nix
+++ b/modules/wm/waybar/default.nix
@@ -5,11 +5,5 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/wm/waybar/config";
   };
 
-  programs.waybar = {
-    enable = true;
-    systemd = {
-      enable = true;
-      target = "graphical-session.target";
-    };
-  };
+  programs.waybar.enable = true;
 }

From d3b131ae8d56d9b7c93af2add2f94fdbcd6ac08d Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 01:21:09 +0100
Subject: [PATCH 23/25] fixes niri

---
 modules/wm/niri/config/config.kdl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index 6523ca7..be2acfd 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -180,7 +180,7 @@ layout {
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "tailscale systray"
-spawn-at-startup "waybar"
+spawn-at-startup "waybar &"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
 hotkey-overlay {

From 9cf843ec064ef7fbf8da7d8024a2bbbeb61976e5 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 01:29:06 +0100
Subject: [PATCH 24/25] waybar systemd

---
 modules/wm/niri/config/config.kdl     | 2 +-
 modules/wm/waybar/config/config.jsonc | 1 +
 modules/wm/waybar/default.nix         | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/wm/niri/config/config.kdl b/modules/wm/niri/config/config.kdl
index be2acfd..699fe9e 100644
--- a/modules/wm/niri/config/config.kdl
+++ b/modules/wm/niri/config/config.kdl
@@ -177,10 +177,10 @@ layout {
 }
 
 // STARTUP
+spawn-at-startup "waybar"
 spawn-at-startup "swaync"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "tailscale systray"
-spawn-at-startup "waybar &"
 spawn-sh-at-startup "~/.config/awww/bin/random-bg.sh ~/Pictures/Wallpapers/safe/dark"
 
 hotkey-overlay {
diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index 732037b..f1d140e 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -2,6 +2,7 @@
   // Bar Options
   "output": "DP-3",
   "position": "left",
+  "width": 36,
   "margin-left": 8,
   "margin-top": 8,
   "margin-bottom": 8,
diff --git a/modules/wm/waybar/default.nix b/modules/wm/waybar/default.nix
index cee2cf2..698ff0b 100644
--- a/modules/wm/waybar/default.nix
+++ b/modules/wm/waybar/default.nix
@@ -5,5 +5,11 @@
     source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dev/nix-config/modules/wm/waybar/config";
   };
 
-  programs.waybar.enable = true;
+  programs.waybar = {
+    enable = true;
+    systemd = {
+      enable = true;
+      target = "graphical.target";
+    };
+  };
 }

From 4a85648bbf2ed7dcbd8d30daeefaf3c7cea71e2f Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <me@dnsc.io>
Date: Fri, 19 Dec 2025 01:33:45 +0100
Subject: [PATCH 25/25] fix shutdown

---
 modules/wm/waybar/config/config.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wm/waybar/config/config.jsonc b/modules/wm/waybar/config/config.jsonc
index f1d140e..1c603be 100644
--- a/modules/wm/waybar/config/config.jsonc
+++ b/modules/wm/waybar/config/config.jsonc
@@ -120,7 +120,7 @@
     "menu-actions": {
       "lock": "hyprlock",
       "reboot": "reboot",
-      "shutdown": "shutdown"
+      "shutdown": "shutdown now"
     }
   }
 }