From ff573e79d02a7efb8eec1023f3f4d128bc47f363 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:08:55 -0800
Subject: [PATCH 01/18] waybar

---
 home-manager/hyprland.nix | 92 ++++++---------------------------------
 home-manager/style.css    | 84 +++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 79 deletions(-)
 create mode 100644 home-manager/style.css

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index f01e35e..3cfba73 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -257,11 +257,15 @@
         };
 
         "clock" = {
+          "background-color" = "@blue";
+          "color" = "@text";
           format = "{:%Y-%m-%d %H:%M:%S}";
           tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         };
 
         "pulseaudio" = {
+          "background-color" = "@mauve";
+          "color" = "@text";
           format = "{icon} {volume}%";
           format-muted = " Muted";
           format-icons = {
@@ -274,20 +278,28 @@
         };
 
         "network" = {
+          "background-color" = "@green";
+          "color" = "@text";
           format-wifi = " {essid} ({signalStrength}%)";
           format-ethernet = " {ifname}";
           format-disconnected = "⚠ Disconnected";
         };
 
         "cpu" = {
+          "background-color" = "@yellow";
+          "color" = "@text";
           format = " {usage}%";
         };
 
         "memory" = {
+          "background-color" = "@peach";
+          "color" = "@text";
           format = " {}%";
         };
 
         "battery" = {
+          "background-color" = "@red";
+          "color" = "@text";
           format = "{icon} {capacity}%";
           format-charging = " {capacity}%";
           format-plugged = " {capacity}%";
@@ -302,85 +314,7 @@
         };
       };
     };
-    style = ''
-      /* Catppuccin Mocha colors */
-      @define-color rosewater #f5e0dc;
-      @define-color flamingo #f2cdcd;
-      @define-color pink #f5c2e7;
-      @define-color mauve #cba6f7;
-      @define-color red #f38ba8;
-      @define-color maroon #eba0ac;
-      @define-color peach #fab387;
-      @define-color yellow #f9e2af;
-      @define-color green #a6e3a1;
-      @define-color teal #94e2d5;
-      @define-color sky #89dceb;
-      @define-color sapphire #74c7ec;
-      @define-color blue #89b4fa;
-      @define-color lavender #b4befe;
-      @define-color text #cdd6f4;
-      @define-color subtext1 #bac2de;
-      @define-color subtext0 #a6adc8;
-      @define-color overlay2 #9399b2;
-      @define-color overlay1 #7f849c;
-      @define-color overlay0 #6c7086;
-      @define-color surface2 #585b70;
-      @define-color surface1 #45475a;
-      @define-color surface0 #313244;
-      @define-color base #1e1e2e;
-      @define-color mantle #181825;
-      @define-color crust #11111b;
-
-      * {
-        font-family: "JetBrainsMono Nerd Font", monospace;
-        font-size: 13px;
-      }
-
-      window#waybar {
-        background-color: @crust;
-        border-bottom: 2px solid @surface0;
-        color: @text;
-      }
-
-      #workspaces button {
-        padding: 0 5px;
-        background-color: transparent;
-        color: @overlay1;
-        border-radius: 0;
-      }
-
-      #workspaces button.active {
-        color: @lavender;
-        border-bottom: 2px solid @lavender;
-      }
-
-      #workspaces button:hover {
-        background-color: @surface0;
-      }
-
-      #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery {
-        padding: 0 10px;
-        background-color: @mantle;
-        margin: 0 4px;
-        border-radius: 8px;
-      }
-
-      #pulseaudio.muted {
-        color: @red;
-      }
-
-      #battery.charging, #battery.plugged {
-        color: @green;
-      }
-
-      #battery.warning:not(.charging) {
-        color: @yellow;
-      }
-
-      #battery.critical:not(.charging) {
-        color: @red;
-      }
-    '';
+    style = builtins.readFile ./style.css;
   };
 
   # Rofi (application launcher)
diff --git a/home-manager/style.css b/home-manager/style.css
new file mode 100644
index 0000000..0a8713a
--- /dev/null
+++ b/home-manager/style.css
@@ -0,0 +1,84 @@
+/*
+      *
+      * Catppuccin Mocha
+      *
+      */
+
+      @define-color rosewater #f5e0dc;
+      @define-color flamingo #f2cdcd;
+      @define-color pink #f5c2e7;
+      @define-color mauve #cba6f7;
+      @define-color red #f38ba8;
+      @define-color maroon #eba0ac;
+      @define-color peach #fab387;
+      @define-color yellow #f9e2af;
+      @define-color green #a6e3a1;
+      @define-color teal #94e2d5;
+      @define-color sky #89dceb;
+      @define-color sapphire #74c7ec;
+      @define-color blue #89b4fa;
+      @define-color lavender #b4befe;
+
+      @define-color text #cdd6f4;
+      @define-color subtext1 #bac2de;
+      @define-color subtext0 #a6adc8;
+      @define-color overlay2 #9399b2;
+      @define-color overlay1 #7f849c;
+      @define-color overlay0 #6c7086;
+      @define-color surface2 #585b70;
+      @define-color surface1 #45475a;
+      @define-color surface0 #313244;
+      @define-color base #1e1e2e;
+      @define-color mantle #181825;
+      @define-color crust #11111b;
+
+      * {
+        /* `otf-font-awesome` is required to be installed for icons */
+        font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+        font-size: 13px;
+      }
+
+      window#waybar {
+        background-color: @crust;
+        border-bottom: 2px solid @surface0;
+        color: @text;
+      }
+
+      #workspaces button {
+        padding: 0 5px;
+        background-color: transparent;
+        color: @overlay1;
+        border-radius: 0;
+      }
+
+      #workspaces button.active {
+        color: @lavender;
+        border-bottom: 2px solid @lavender;
+      }
+
+      #workspaces button:hover {
+        background-color: @surface0;
+      }
+
+      #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery {
+        padding: 0 10px;
+        background-color: @mantle;
+        margin: 0 4px;
+        border-radius: 8px;
+      }
+
+      #pulseaudio.muted {
+        color: @red;
+      }
+
+      #battery.charging, #battery.plugged {
+        color: @green;
+      }
+
+      #battery.warning:not(.charging) {
+        color: @yellow;
+      }
+
+      #battery.critical:not(.charging) {
+        color: @red;
+      }

From fdfca565c8005ae3d3af57d919e94e6333cdd212 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:18:10 -0800
Subject: [PATCH 02/18] waybar

---
 home-manager/hyprland.nix | 124 ++++++++++++++++++++++++++++++++++----
 home-manager/style.css    |  84 --------------------------
 2 files changed, 111 insertions(+), 97 deletions(-)
 delete mode 100644 home-manager/style.css

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 3cfba73..df68c89 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -257,15 +257,11 @@
         };
 
         "clock" = {
-          "background-color" = "@blue";
-          "color" = "@text";
           format = "{:%Y-%m-%d %H:%M:%S}";
           tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         };
 
         "pulseaudio" = {
-          "background-color" = "@mauve";
-          "color" = "@text";
           format = "{icon} {volume}%";
           format-muted = " Muted";
           format-icons = {
@@ -278,28 +274,20 @@
         };
 
         "network" = {
-          "background-color" = "@green";
-          "color" = "@text";
           format-wifi = " {essid} ({signalStrength}%)";
           format-ethernet = " {ifname}";
           format-disconnected = "⚠ Disconnected";
         };
 
         "cpu" = {
-          "background-color" = "@yellow";
-          "color" = "@text";
           format = " {usage}%";
         };
 
         "memory" = {
-          "background-color" = "@peach";
-          "color" = "@text";
           format = " {}%";
         };
 
         "battery" = {
-          "background-color" = "@red";
-          "color" = "@text";
           format = "{icon} {capacity}%";
           format-charging = " {capacity}%";
           format-plugged = " {capacity}%";
@@ -314,7 +302,117 @@
         };
       };
     };
-    style = builtins.readFile ./style.css;
+    style = ''
+      /*
+      *
+      * Catppuccin Mocha
+      *
+      */
+
+      @define-color rosewater #f5e0dc;
+      @define-color flamingo #f2cdcd;
+      @define-color pink #f5c2e7;
+      @define-color mauve #cba6f7;
+      @define-color red #f38ba8;
+      @define-color maroon #eba0ac;
+      @define-color peach #fab387;
+      @define-color yellow #f9e2af;
+      @define-color green #a6e3a1;
+      @define-color teal #94e2d5;
+      @define-color sky #89dceb;
+      @define-color sapphire #74c7ec;
+      @define-color blue #89b4fa;
+      @define-color lavender #b4befe;
+
+      @define-color text #cdd6f4;
+      @define-color subtext1 #bac2de;
+      @define-color subtext0 #a6adc8;
+      @define-color overlay2 #9399b2;
+      @define-color overlay1 #7f849c;
+      @define-color overlay0 #6c7086;
+      @define-color surface2 #585b70;
+      @define-color surface1 #45475a;
+      @define-color surface0 #313244;
+      @define-color base #1e1e2e;
+      @define-color mantle #181825;
+      @define-color crust #11111b;
+
+      * {
+        /* `otf-font-awesome` is required to be installed for icons */
+        font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+        font-size: 13px;
+      }
+
+      window#waybar {
+        background-color: @crust;
+        border-bottom: 2px solid @surface0;
+        color: @text;
+      }
+
+      #workspaces button {
+        padding: 0 5px;
+        background-color: transparent;
+        color: @overlay1;
+        border-radius: 0;
+      }
+
+      #workspaces button.active {
+        color: @lavender;
+        border-bottom: 2px solid @lavender;
+      }
+
+      #workspaces button:hover {
+        background-color: @surface0;
+      }
+
+      #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery, #tray {
+        padding: 0 10px;
+        margin: 0 4px;
+        border-radius: 8px;
+        background-color: @mantle;
+      }
+
+      #clock {
+        background-color: @blue;
+      }
+
+      #pulseaudio {
+        background-color: @mauve;
+      }
+
+      #network {
+        background-color: @green;
+      }
+
+      #cpu {
+        background-color: @yellow;
+      }
+
+      #memory {
+        background-color: @peach;
+      }
+
+      #battery {
+        background-color: @red;
+      }
+
+      #pulseaudio.muted {
+        color: @red;
+      }
+
+      #battery.charging, #battery.plugged {
+        color: @green;
+      }
+
+      #battery.warning:not(.charging) {
+        color: @yellow;
+      }
+
+      #battery.critical:not(.charging) {
+        color: @red;
+      }
+    '';
+
   };
 
   # Rofi (application launcher)
diff --git a/home-manager/style.css b/home-manager/style.css
deleted file mode 100644
index 0a8713a..0000000
--- a/home-manager/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-      *
-      * Catppuccin Mocha
-      *
-      */
-
-      @define-color rosewater #f5e0dc;
-      @define-color flamingo #f2cdcd;
-      @define-color pink #f5c2e7;
-      @define-color mauve #cba6f7;
-      @define-color red #f38ba8;
-      @define-color maroon #eba0ac;
-      @define-color peach #fab387;
-      @define-color yellow #f9e2af;
-      @define-color green #a6e3a1;
-      @define-color teal #94e2d5;
-      @define-color sky #89dceb;
-      @define-color sapphire #74c7ec;
-      @define-color blue #89b4fa;
-      @define-color lavender #b4befe;
-
-      @define-color text #cdd6f4;
-      @define-color subtext1 #bac2de;
-      @define-color subtext0 #a6adc8;
-      @define-color overlay2 #9399b2;
-      @define-color overlay1 #7f849c;
-      @define-color overlay0 #6c7086;
-      @define-color surface2 #585b70;
-      @define-color surface1 #45475a;
-      @define-color surface0 #313244;
-      @define-color base #1e1e2e;
-      @define-color mantle #181825;
-      @define-color crust #11111b;
-
-      * {
-        /* `otf-font-awesome` is required to be installed for icons */
-        font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-        font-size: 13px;
-      }
-
-      window#waybar {
-        background-color: @crust;
-        border-bottom: 2px solid @surface0;
-        color: @text;
-      }
-
-      #workspaces button {
-        padding: 0 5px;
-        background-color: transparent;
-        color: @overlay1;
-        border-radius: 0;
-      }
-
-      #workspaces button.active {
-        color: @lavender;
-        border-bottom: 2px solid @lavender;
-      }
-
-      #workspaces button:hover {
-        background-color: @surface0;
-      }
-
-      #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery {
-        padding: 0 10px;
-        background-color: @mantle;
-        margin: 0 4px;
-        border-radius: 8px;
-      }
-
-      #pulseaudio.muted {
-        color: @red;
-      }
-
-      #battery.charging, #battery.plugged {
-        color: @green;
-      }
-
-      #battery.warning:not(.charging) {
-        color: @yellow;
-      }
-
-      #battery.critical:not(.charging) {
-        color: @red;
-      }

From 111cbdc30c8724fb739da69c1a531effa51840bd Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:25:59 -0800
Subject: [PATCH 03/18] waybar

---
 home-manager/hyprland.nix | 82 +++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index df68c89..131855e 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -305,37 +305,27 @@
     style = ''
       /*
       *
-      * Catppuccin Mocha
+      * Tokyo Night
       *
       */
 
-      @define-color rosewater #f5e0dc;
-      @define-color flamingo #f2cdcd;
-      @define-color pink #f5c2e7;
-      @define-color mauve #cba6f7;
-      @define-color red #f38ba8;
-      @define-color maroon #eba0ac;
-      @define-color peach #fab387;
-      @define-color yellow #f9e2af;
-      @define-color green #a6e3a1;
-      @define-color teal #94e2d5;
-      @define-color sky #89dceb;
-      @define-color sapphire #74c7ec;
-      @define-color blue #89b4fa;
-      @define-color lavender #b4befe;
+      @define-color-default-text #c0caf5;
+      @define-color-default-bg #1a1b26;
+      @define-color-default-bg-dark #16161e;
 
-      @define-color text #cdd6f4;
-      @define-color subtext1 #bac2de;
-      @define-color subtext0 #a6adc8;
-      @define-color overlay2 #9399b2;
-      @define-color overlay1 #7f849c;
-      @define-color overlay0 #6c7086;
-      @define-color surface2 #585b70;
-      @define-color surface1 #45475a;
-      @define-color surface0 #313244;
-      @define-color base #1e1e2e;
-      @define-color mantle #181825;
-      @define-color crust #11111b;
+      @define-color-red #f7768e;
+      @define-color-green #9ece6a;
+      @define-color-yellow #e0af68;
+      @define-color-blue #7aa2f7;
+      @define-color-purple #bb9af7;
+      @define-color-cyan #7dcfff;
+      @define-color-white #a9b1d6;
+
+      /* Catppuccin colors for clock and battery */
+      @define-color-cat-blue #89b4fa;
+      @define-color-cat-red #f38ba8;
+      @define-color-cat-green #a6e3a1;
+      @define-color-cat-yellow #f9e2af;
 
       * {
         /* `otf-font-awesome` is required to be installed for icons */
@@ -344,72 +334,78 @@
       }
 
       window#waybar {
-        background-color: @crust;
-        border-bottom: 2px solid @surface0;
-        color: @text;
+        background-color: @default-bg;
+        border-bottom: 2px solid @default-bg-dark;
+        color: @default-text;
       }
 
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: @overlay1;
+        color: @default-text;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: @lavender;
-        border-bottom: 2px solid @lavender;
+        color: @purple;
+        border-bottom: 2px solid @purple;
       }
 
       #workspaces button:hover {
-        background-color: @surface0;
+        background-color: @default-bg-dark;
       }
 
       #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery, #tray {
         padding: 0 10px;
         margin: 0 4px;
         border-radius: 8px;
-        background-color: @mantle;
+        background-color: @default-bg-dark;
       }
 
       #clock {
-        background-color: @blue;
+        background-color: @cat-blue;
+        color: @default-bg;
       }
 
       #pulseaudio {
-        background-color: @mauve;
+        background-color: @purple;
+        color: @default-bg;
       }
 
       #network {
         background-color: @green;
+        color: @default-bg;
       }
 
       #cpu {
         background-color: @yellow;
+        color: @default-bg;
       }
 
       #memory {
-        background-color: @peach;
+        background-color: @cyan;
+        color: @default-bg;
       }
 
       #battery {
-        background-color: @red;
+        background-color: @cat-red;
+        color: @default-bg;
       }
 
       #pulseaudio.muted {
-        color: @red;
+        color: @default-bg;
       }
 
       #battery.charging, #battery.plugged {
-        color: @green;
+        color: @cat-green;
       }
 
       #battery.warning:not(.charging) {
-        color: @yellow;
+        color: @cat-yellow;
       }
 
       #battery.critical:not(.charging) {
-        color: @red;
+        color: @cat-red;
       }
     '';
 

From a58547b501959831a03b3a5d32b2bf0a9d8e6700 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:32:48 -0800
Subject: [PATCH 04/18] waybar

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

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 131855e..81aa4c5 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -550,6 +550,7 @@
     noto-fonts-cjk-sans
     noto-fonts-emoji
     font-awesome
+    roboto
     grim
     slurp
     networkmanagerapplet

From 33abd50ad1648110f07bd80bb901d78a42530f06 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:35:33 -0800
Subject: [PATCH 05/18] waybar

---
 home-manager/hyprland.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 81aa4c5..9189df3 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -19,7 +19,6 @@
         "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "swww init &" # Wallpaper daemon
         "swww img /home/death916/Pictures/wallpapers/header.png &"
-        "waybar &" # Start Waybar
         "dunst &" # Start Dunst notification daemon
         "nm-applet --indicator &" # NetworkManager applet
         "blueman-applet &" # Bluetooth applet

From 54e8700a18ca242029bfce55d83c1f1ab2852f76 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 01:49:38 -0800
Subject: [PATCH 06/18] waybar

---
 home-manager/hyprland.nix | 102 ++++++++++++++------------------------
 1 file changed, 37 insertions(+), 65 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 9189df3..12327e0 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -303,108 +303,80 @@
     };
     style = ''
       /*
-      *
       * Tokyo Night
-      *
       */
 
-      @define-color-default-text #c0caf5;
-      @define-color-default-bg #1a1b26;
-      @define-color-default-bg-dark #16161e;
-
-      @define-color-red #f7768e;
-      @define-color-green #9ece6a;
-      @define-color-yellow #e0af68;
-      @define-color-blue #7aa2f7;
-      @define-color-purple #bb9af7;
-      @define-color-cyan #7dcfff;
-      @define-color-white #a9b1d6;
-
-      /* Catppuccin colors for clock and battery */
-      @define-color-cat-blue #89b4fa;
-      @define-color-cat-red #f38ba8;
-      @define-color-cat-green #a6e3a1;
-      @define-color-cat-yellow #f9e2af;
-
       * {
-        /* `otf-font-awesome` is required to be installed for icons */
-        font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+        font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
         font-size: 13px;
       }
 
       window#waybar {
-        background-color: @default-bg;
-        border-bottom: 2px solid @default-bg-dark;
-        color: @default-text;
+        background-color: #1a1b26;
+        color: #c0caf5;
+        transition-property: background-color;
+        transition-duration: .5s;
       }
 
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: @default-text;
+        color: #c0caf5;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: @purple;
-        border-bottom: 2px solid @purple;
+        color: #bb9af7;
+        border-bottom: 2px solid #bb9af7;
       }
 
       #workspaces button:hover {
-        background-color: @default-bg-dark;
+        background: #16161e;
       }
 
-      #window, #clock, #pulseaudio, #network, #cpu, #memory, #battery, #tray {
+      #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window {
         padding: 0 10px;
-        margin: 0 4px;
+        margin: 3px 4px;
         border-radius: 8px;
-        background-color: @default-bg-dark;
+        background-color: #16161e;
       }
 
       #clock {
-        background-color: @cat-blue;
-        color: @default-bg;
-      }
-
-      #pulseaudio {
-        background-color: @purple;
-        color: @default-bg;
-      }
-
-      #network {
-        background-color: @green;
-        color: @default-bg;
-      }
-
-      #cpu {
-        background-color: @yellow;
-        color: @default-bg;
-      }
-
-      #memory {
-        background-color: @cyan;
-        color: @default-bg;
+        background-color: #7aa2f7;
+        color: #1a1b26;
       }
 
       #battery {
-        background-color: @cat-red;
-        color: @default-bg;
-      }
-
-      #pulseaudio.muted {
-        color: @default-bg;
+        background-color: #f7768e;
+        color: #1a1b26;
       }
 
       #battery.charging, #battery.plugged {
-        color: @cat-green;
+        background-color: #9ece6a;
       }
 
-      #battery.warning:not(.charging) {
-        color: @cat-yellow;
+      #cpu {
+        background-color: #e0af68;
+        color: #1a1b26;
       }
 
-      #battery.critical:not(.charging) {
-        color: @cat-red;
+      #memory {
+        background-color: #7dcfff;
+        color: #1a1b26;
+      }
+
+      #network {
+        background-color: #9ece6a;
+        color: #1a1b26;
+      }
+
+      #pulseaudio {
+        background-color: #bb9af7;
+        color: #1a1b26;
+      }
+
+      #pulseaudio.muted {
+        background-color: #414868;
       }
     '';
 

From 2b1a4832fc3306bffe64970b5271e95930bda221 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:10:28 -0800
Subject: [PATCH 07/18] waybar

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

diff --git a/flake.nix b/flake.nix
index cdb5cbc..ec7d919 100644
--- a/flake.nix
+++ b/flake.nix
@@ -68,6 +68,7 @@
                 {
                   home-manager.useGlobalPkgs = true;
                   home-manager.useUserPackages = true;
+                  home-manager.backupFileExtension = "backup";
                   home-manager.extraSpecialArgs = { inherit hmLib unstablePkgs inputs; };
                   home-manager.users.death916 = {
                     imports = [

From a3fe7ffecf78651b0b4f23f11a567757201b8095 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:12:22 -0800
Subject: [PATCH 08/18] waybar

---
 home-manager/hyprland.nix | 57 +++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 12327e0..c9f84fe 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -303,75 +303,98 @@
     };
     style = ''
       /*
-      * Tokyo Night
+      * Tokyo Night, with custom clock and battery
       */
 
+      @define-color-default-text #c0caf5;
+      @define-color-default-bg #1a1b26;
+      @define-color-default-bg-dark #16161e;
+
+      @define-color-red #f7768e;
+      @define-color-green #9ece6a;
+      @define-color-yellow #e0af68;
+      @define-color-blue #7aa2f7;
+      @define-color-purple #bb9af7;
+      @define-color-cyan #7dcfff;
+
+      /* Catppuccin colors for clock and battery */
+      @define-color-cat-blue #89b4fa;
+      @define-color-cat-red #f38ba8;
+      @define-color-cat-green #a6e3a1;
+      @define-color-cat-yellow #f9e2af;
+
       * {
         font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
         font-size: 13px;
       }
 
       window#waybar {
-        background-color: #1a1b26;
-        color: #c0caf5;
-        transition-property: background-color;
-        transition-duration: .5s;
+        background-color: @default-bg;
+        color: @default-text;
       }
 
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: #c0caf5;
+        color: @default-text;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: #bb9af7;
-        border-bottom: 2px solid #bb9af7;
+        color: @purple;
+        border-bottom: 2px solid @purple;
       }
 
       #workspaces button:hover {
-        background: #16161e;
+        background: @default-bg-dark;
       }
 
       #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window {
         padding: 0 10px;
         margin: 3px 4px;
         border-radius: 8px;
-        background-color: #16161e;
+        background-color: @default-bg-dark;
       }
 
       #clock {
-        background-color: #7aa2f7;
+        background-color: @cat-blue;
         color: #1a1b26;
       }
 
       #battery {
-        background-color: #f7768e;
+        background-color: @cat-red;
         color: #1a1b26;
       }
 
       #battery.charging, #battery.plugged {
-        background-color: #9ece6a;
+        background-color: @cat-green;
+      }
+
+      #battery.warning:not(.charging) {
+        background-color: @cat-yellow;
+      }
+
+      #battery.critical:not(.charging) {
+        background-color: @cat-red;
       }
 
       #cpu {
-        background-color: #e0af68;
+        background-color: @yellow;
         color: #1a1b26;
       }
 
       #memory {
-        background-color: #7dcfff;
+        background-color: @cyan;
         color: #1a1b26;
       }
 
       #network {
-        background-color: #9ece6a;
+        background-color: @green;
         color: #1a1b26;
       }
 
       #pulseaudio {
-        background-color: #bb9af7;
+        background-color: @purple;
         color: #1a1b26;
       }
 

From 0448e393fcdf3f2301bc86b8eb0f8f2cb85741b0 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:14:41 -0800
Subject: [PATCH 09/18] waybar

---
 home-manager/hyprland.nix | 71 +++++++++++++--------------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index c9f84fe..cc52893 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -303,103 +303,80 @@
     };
     style = ''
       /*
-      * Tokyo Night, with custom clock and battery
+      * Gruvbox
       */
 
-      @define-color-default-text #c0caf5;
-      @define-color-default-bg #1a1b26;
-      @define-color-default-bg-dark #16161e;
-
-      @define-color-red #f7768e;
-      @define-color-green #9ece6a;
-      @define-color-yellow #e0af68;
-      @define-color-blue #7aa2f7;
-      @define-color-purple #bb9af7;
-      @define-color-cyan #7dcfff;
-
-      /* Catppuccin colors for clock and battery */
-      @define-color-cat-blue #89b4fa;
-      @define-color-cat-red #f38ba8;
-      @define-color-cat-green #a6e3a1;
-      @define-color-cat-yellow #f9e2af;
-
       * {
         font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
         font-size: 13px;
       }
 
       window#waybar {
-        background-color: @default-bg;
-        color: @default-text;
+        background-color: #282828;
+        color: #ebdbb2;
+        transition-property: background-color;
+        transition-duration: .5s;
       }
 
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: @default-text;
+        color: #ebdbb2;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: @purple;
-        border-bottom: 2px solid @purple;
+        color: #fabd2f;
+        border-bottom: 2px solid #fabd2f;
       }
 
       #workspaces button:hover {
-        background: @default-bg-dark;
+        background: #3c3836;
       }
 
       #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window {
         padding: 0 10px;
         margin: 3px 4px;
         border-radius: 8px;
-        background-color: @default-bg-dark;
+        background-color: #3c3836;
       }
 
       #clock {
-        background-color: @cat-blue;
-        color: #1a1b26;
+        background-color: #458588;
+        color: #282828;
       }
 
       #battery {
-        background-color: @cat-red;
-        color: #1a1b26;
+        background-color: #cc241d;
+        color: #282828;
       }
 
       #battery.charging, #battery.plugged {
-        background-color: @cat-green;
-      }
-
-      #battery.warning:not(.charging) {
-        background-color: @cat-yellow;
-      }
-
-      #battery.critical:not(.charging) {
-        background-color: @cat-red;
+        background-color: #98971a;
       }
 
       #cpu {
-        background-color: @yellow;
-        color: #1a1b26;
+        background-color: #d79921;
+        color: #282828;
       }
 
       #memory {
-        background-color: @cyan;
-        color: #1a1b26;
+        background-color: #b16286;
+        color: #282828;
       }
 
       #network {
-        background-color: @green;
-        color: #1a1b26;
+        background-color: #689d6a;
+        color: #282828;
       }
 
       #pulseaudio {
-        background-color: @purple;
-        color: #1a1b26;
+        background-color: #d65d0e;
+        color: #282828;
       }
 
       #pulseaudio.muted {
-        background-color: #414868;
+        background-color: #928374;
       }
     '';
 

From 44f676b314ae231426ddb3e82885cff276b593fc Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:17:02 -0800
Subject: [PATCH 10/18] waybar

---
 home-manager/hyprland.nix | 44 +++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index cc52893..97d38e4 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -303,7 +303,7 @@
     };
     style = ''
       /*
-      * Gruvbox
+      * Dracula
       */
 
       * {
@@ -312,8 +312,8 @@
       }
 
       window#waybar {
-        background-color: #282828;
-        color: #ebdbb2;
+        background-color: #282a36;
+        color: #f8f8f2;
         transition-property: background-color;
         transition-duration: .5s;
       }
@@ -321,62 +321,62 @@
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: #ebdbb2;
+        color: #f8f8f2;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: #fabd2f;
-        border-bottom: 2px solid #fabd2f;
+        color: #bd93f9;
+        border-bottom: 2px solid #bd93f9;
       }
 
       #workspaces button:hover {
-        background: #3c3836;
+        background: #44475a;
       }
 
       #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window {
         padding: 0 10px;
         margin: 3px 4px;
         border-radius: 8px;
-        background-color: #3c3836;
+        background-color: #44475a;
       }
 
       #clock {
-        background-color: #458588;
-        color: #282828;
+        background-color: #6272a4;
       }
 
       #battery {
-        background-color: #cc241d;
-        color: #282828;
+        background-color: #ff5555;
+        color: #f8f8f2;
       }
 
       #battery.charging, #battery.plugged {
-        background-color: #98971a;
+        background-color: #50fa7b;
+        color: #282a36;
       }
 
       #cpu {
-        background-color: #d79921;
-        color: #282828;
+        background-color: #f1fa8c;
+        color: #282a36;
       }
 
       #memory {
-        background-color: #b16286;
-        color: #282828;
+        background-color: #ffb86c;
+        color: #282a36;
       }
 
       #network {
-        background-color: #689d6a;
-        color: #282828;
+        background-color: #8be9fd;
+        color: #282a36;
       }
 
       #pulseaudio {
-        background-color: #d65d0e;
-        color: #282828;
+        background-color: #bd93f9;
+        color: #282a36;
       }
 
       #pulseaudio.muted {
-        background-color: #928374;
+        background-color: #6272a4;
       }
     '';
 

From 08485b2c8087756ad99673bf11d24889c9b2bfa1 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:21:57 -0800
Subject: [PATCH 11/18] waybar

---
 home-manager/hyprland.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 97d38e4..a9084c3 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -356,18 +356,17 @@
       }
 
       #cpu {
-        background-color: #f1fa8c;
+        background-color: #bd93f9; /* Purple */
         color: #282a36;
       }
 
       #memory {
-        background-color: #ffb86c;
-        color: #282a36;
+        background-color: #6272a4; /* Greyish Blue */
+        color: #f8f8f2;
       }
 
       #network {
-        background-color: #8be9fd;
-        color: #282a36;
+        background-color: #44475a; /* Darker Grey */
       }
 
       #pulseaudio {

From 8bd70c4660d56b4729002359f25ff09e2002af95 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 02:24:15 -0800
Subject: [PATCH 12/18] waybar

---
 home-manager/hyprland.nix | 73 +++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 23 deletions(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index a9084c3..264f684 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -303,79 +303,106 @@
     };
     style = ''
       /*
-      * Dracula
+      * Catppuccin Mocha
       */
 
+      @define-color rosewater #f5e0dc;
+      @define-color flamingo #f2cdcd;
+      @define-color pink #f5c2e7;
+      @define-color mauve #cba6f7;
+      @define-color red #f38ba8;
+      @define-color maroon #eba0ac;
+      @define-color peach #fab387;
+      @define-color yellow #f9e2af;
+      @define-color green #a6e3a1;
+      @define-color teal #94e2d5;
+      @define-color sky #89dceb;
+      @define-color sapphire #74c7ec;
+      @define-color blue #89b4fa;
+      @define-color lavender #b4befe;
+
+      @define-color text #cdd6f4;
+      @define-color subtext1 #bac2de;
+      @define-color subtext0 #a6adc8;
+      @define-color overlay2 #9399b2;
+      @define-color overlay1 #7f849c;
+      @define-color overlay0 #6c7086;
+      @define-color surface2 #585b70;
+      @define-color surface1 #45475a;
+      @define-color surface0 #313244;
+      @define-color base #1e1e2e;
+      @define-color mantle #181825;
+      @define-color crust #11111b;
+
       * {
         font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
         font-size: 13px;
       }
 
       window#waybar {
-        background-color: #282a36;
-        color: #f8f8f2;
-        transition-property: background-color;
-        transition-duration: .5s;
+        background-color: @crust;
+        color: @text;
       }
 
       #workspaces button {
         padding: 0 5px;
         background-color: transparent;
-        color: #f8f8f2;
+        color: @overlay1;
         border-radius: 0;
       }
 
       #workspaces button.active {
-        color: #bd93f9;
-        border-bottom: 2px solid #bd93f9;
+        color: @lavender;
+        border-bottom: 2px solid @lavender;
       }
 
       #workspaces button:hover {
-        background: #44475a;
+        background-color: @surface0;
       }
 
       #clock, #battery, #cpu, #memory, #network, #pulseaudio, #tray, #window {
         padding: 0 10px;
         margin: 3px 4px;
         border-radius: 8px;
-        background-color: #44475a;
+        background-color: @mantle;
       }
 
       #clock {
-        background-color: #6272a4;
+        background-color: @blue;
+        color: @crust;
       }
 
       #battery {
-        background-color: #ff5555;
-        color: #f8f8f2;
+        background-color: @red;
+        color: @crust;
       }
 
       #battery.charging, #battery.plugged {
-        background-color: #50fa7b;
-        color: #282a36;
+        background-color: @green;
       }
 
       #cpu {
-        background-color: #bd93f9; /* Purple */
-        color: #282a36;
+        background-color: @yellow;
+        color: @crust;
       }
 
       #memory {
-        background-color: #6272a4; /* Greyish Blue */
-        color: #f8f8f2;
+        background-color: @peach;
+        color: @crust;
       }
 
       #network {
-        background-color: #44475a; /* Darker Grey */
+        background-color: @green;
+        color: @crust;
       }
 
       #pulseaudio {
-        background-color: #bd93f9;
-        color: #282a36;
+        background-color: @mauve;
+        color: @crust;
       }
 
       #pulseaudio.muted {
-        background-color: #6272a4;
+        background-color: @surface1;
       }
     '';
 

From 9f3fe56d3bd1eb5b1acfff553a9e999eb9e51341 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 03:32:11 -0800
Subject: [PATCH 13/18] gnome 4 halloy test

---
 modules/nixos/laptop/desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix
index 045c803..d1c6e71 100644
--- a/modules/nixos/laptop/desktop.nix
+++ b/modules/nixos/laptop/desktop.nix
@@ -19,8 +19,8 @@
   services.gnome.gnome-keyring.enable = true;
   services.dbus.enable = true; # for nextcloud client
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = false;
-  services.xserver.desktopManager.gnome.enable = false;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
   #cosmic instead
   # services.desktopManager.cosmic.enable = true;
   # services.displayManager.cosmic-greeter.enable = true;

From d4bb3ec9b0ec17965bcb1d8114984956b06e9082 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 03:44:30 -0800
Subject: [PATCH 14/18] waybar

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

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 264f684..04a5ec4 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -18,6 +18,7 @@
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "swww init &" # Wallpaper daemon
+        "waybar &" # Start Waybar
         "swww img /home/death916/Pictures/wallpapers/header.png &"
         "dunst &" # Start Dunst notification daemon
         "nm-applet --indicator &" # NetworkManager applet

From a77c23775caffa3b4c1b6a3f621a102b43ec3036 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 04:04:58 -0800
Subject: [PATCH 15/18] rofi show window

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

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 04a5ec4..9083cd6 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -162,6 +162,7 @@
         "SUPER, Return, exec, waveterm" # Terminal
         "SUPER, T, exec, ghostty" # Wave Terminal
         "SUPER, D, exec, rofi -show drun" # Rofi application launcher
+        "SUPER A, exec, rofi -show window"
         "SUPER, W, exec, microsoft-edge"
         "SUPER, E, exec, nautilus" # File manager
         "SUPER, N, exec, dunstctl history-pop"

From 7762b7878056be95ea65ca5c2a82324b7e384c8c Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 04:08:00 -0800
Subject: [PATCH 16/18] rofi show window

---
 home-manager/hyprland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index 9083cd6..f025f1e 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -415,7 +415,7 @@
     enable = true;
     theme = "arthur"; # Use a Catppuccin theme for Rofi
     extraConfig = {
-      modi = "drun,run,ssh";
+      modi = "drun,run,ssh,window";
       show-icons = true;
       icon-theme = "Papirus-Dark";
     };

From 4a060dd0537d49425590efbd8fb0f7cff24baf73 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 04:10:26 -0800
Subject: [PATCH 17/18] rofi

---
 home-manager/hyprland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index f025f1e..ce260d4 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -162,7 +162,7 @@
         "SUPER, Return, exec, waveterm" # Terminal
         "SUPER, T, exec, ghostty" # Wave Terminal
         "SUPER, D, exec, rofi -show drun" # Rofi application launcher
-        "SUPER A, exec, rofi -show window"
+        "SUPER, A, exec, rofi -show window"
         "SUPER, W, exec, microsoft-edge"
         "SUPER, E, exec, nautilus" # File manager
         "SUPER, N, exec, dunstctl history-pop"

From 5fb0a7e5ba225cbb38979914060fec380c64b9b7 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Tue, 4 Nov 2025 05:43:16 -0800
Subject: [PATCH 18/18] wallpaper

---
 home-manager/hyprland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index ce260d4..274679d 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -19,7 +19,7 @@
         "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
         "swww init &" # Wallpaper daemon
         "waybar &" # Start Waybar
-        "swww img /home/death916/Pictures/wallpapers/header.png &"
+        "swww img /home/death916/Pictures/wallpapers/jameswebb1.jpg &"
         "dunst &" # Start Dunst notification daemon
         "nm-applet --indicator &" # NetworkManager applet
         "blueman-applet &" # Bluetooth applet