From 8848e53815fe12ffa3998c0a4bbcf2178d6b00e8 Mon Sep 17 00:00:00 2001
From: Rosa <rosaontheweb@proton.me>
Date: Sat, 24 Jan 2026 21:19:44 -0500
Subject: switch to i3blocks

---
 modules/user/desktop/components/fuzzel.nix    |  28 +++++-----
 modules/user/desktop/default.nix              |  32 +++--------
 modules/user/desktop/wallpaper-blue.jpg       | Bin 204580 -> 0 bytes
 modules/user/desktop/wallpaper-pink.jpg       | Bin 487826 -> 0 bytes
 modules/user/desktop/wallpaper.png            | Bin 0 -> 13373186 bytes
 modules/user/desktop/window-managers/sway.nix |  73 +++++++++++++++++++++-----
 6 files changed, 79 insertions(+), 54 deletions(-)
 delete mode 100644 modules/user/desktop/wallpaper-blue.jpg
 delete mode 100644 modules/user/desktop/wallpaper-pink.jpg
 create mode 100644 modules/user/desktop/wallpaper.png

(limited to 'modules')

diff --git a/modules/user/desktop/components/fuzzel.nix b/modules/user/desktop/components/fuzzel.nix
index 67bf047..e4b6ef8 100644
--- a/modules/user/desktop/components/fuzzel.nix
+++ b/modules/user/desktop/components/fuzzel.nix
@@ -6,22 +6,18 @@
       width = 2;
     };
 
-    colors =
-      let
-        accent = if config.desktop.accent == "blue" then "89b4faff" else "f5c2e7ff";
-      in
-      {
-        background = "1e1e2eff";
-        border = accent;
-        input = "cdd6f4ff";
-        match = accent;
-        placeholder = "7f849cff";
-        prompt = "bac2deff";
-        selection = "585b70ff";
-        selection-match = accent;
-        selection-text = "cdd6f4ff";
-        text = "cdd6f4ff";
-      };
+    colors = {
+      background = "1e1e2eff";
+      border = "89b4faff";
+      input = "cdd6f4ff";
+      match = "89b4faff";
+      placeholder = "7f849cff";
+      prompt = "bac2deff";
+      selection = "585b70ff";
+      selection-match = "89b4faff";
+      selection-text = "cdd6f4ff";
+      text = "cdd6f4ff";
+    };
 
     main = {
       dpi-aware = true;
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 8571621..7cd19ce 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -11,23 +11,10 @@
     ./window-managers
   ];
 
-  options.desktop = {
-    accent = lib.mkOption {
-      description = "The accent colour to use from catppuccin";
-      default = "blue";
-      type =
-        with lib.types;
-        enum [
-          "blue"
-          "pink"
-        ];
-    };
-
-    windowManager = lib.mkOption {
-      description = "Which window manager to use";
-      default = null;
-      type = with lib.types; nullOr (enum [ ]);
-    };
+  options.desktop.windowManager = lib.mkOption {
+    description = "Which window manager to use";
+    default = null;
+    type = with lib.types; nullOr (enum [ ]);
   };
 
   config = {
@@ -44,23 +31,18 @@
       theme = {
         package = (
           pkgs.catppuccin-gtk.override {
-            accents = [
-              "blue"
-              "pink"
-            ];
-
             variant = "mocha";
           }
         );
 
-        name = "catppuccin-mocha-${config.desktop.accent}-standard";
+        name = "catppuccin-mocha-blue-standard";
       };
     };
 
     home = {
-      file."Pictures/wallpaper.jpg" = {
+      file."Pictures/wallpaper.png" = {
         enable = (config.desktop.windowManager != null);
-        source = ./wallpaper-${config.desktop.accent}.jpg;
+        source = ./wallpaper.png;
       };
 
       packages = with pkgs; [
diff --git a/modules/user/desktop/wallpaper-blue.jpg b/modules/user/desktop/wallpaper-blue.jpg
deleted file mode 100644
index e75494a..0000000
Binary files a/modules/user/desktop/wallpaper-blue.jpg and /dev/null differ
diff --git a/modules/user/desktop/wallpaper-pink.jpg b/modules/user/desktop/wallpaper-pink.jpg
deleted file mode 100644
index 420ab56..0000000
Binary files a/modules/user/desktop/wallpaper-pink.jpg and /dev/null differ
diff --git a/modules/user/desktop/wallpaper.png b/modules/user/desktop/wallpaper.png
new file mode 100644
index 0000000..9b5f637
Binary files /dev/null and b/modules/user/desktop/wallpaper.png differ
diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix
index 14ae618..c52b1cf 100644
--- a/modules/user/desktop/window-managers/sway.nix
+++ b/modules/user/desktop/window-managers/sway.nix
@@ -8,7 +8,6 @@
 {
   options.desktop.windowManager = lib.mkOption { type = with lib.types; nullOr (enum [ "sway" ]); };
   config = {
-    desktop.components.waybar.enable = lib.mkDefault (config.desktop.windowManager == "sway");
     home.packages = with pkgs; [
       grim
       slurp
@@ -16,6 +15,16 @@
 
     programs = {
       fuzzel.enable = lib.mkDefault (config.desktop.windowManager == "sway");
+      i3blocks = {
+        enable = lib.mkDefault (config.desktop.windowManager == "sway");
+        bars.bottom = {
+          time = {
+            command = "date +'%F %R'";
+            interval = 60;
+          };
+        };
+      };
+
       swaylock = {
         enable = lib.mkDefault (config.desktop.windowManager == "sway");
         settings = {
@@ -31,7 +40,49 @@
           enable = lib.mkForce true;
           package = null; # use the nixos module
           config = {
-            bars = [ ];
+            bars = [
+              {
+                colors = {
+                  activeWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#cdd6f4";
+                  };
+
+                  background = "#11111b";
+                  focusedBackground = "#11111b";
+                  focusedSeparator = "#313244";
+                  focusedStatusline = "#cdd6f4";
+                  focusedWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#89b4fa";
+                  };
+
+                  inactiveWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#313244";
+                  };
+
+                  separator = "#313244";
+                  statusline = "#cdd6f4";
+                  urgentWorkspace = {
+                    background = "#11111b";
+                    border = "#11111b";
+                    text = "#f38ba8";
+                  };
+                };
+
+                fonts = {
+                  names = [ "Fira Code" ];
+                  size = 8.0;
+                };
+
+                statusCommand = "${pkgs.i3blocks}/bin/i3blocks -c ~/.config/i3blocks/bottom";
+              }
+            ];
+
             bindswitches = {
               "lid:off" = {
                 action = "output eDP-1 power on";
@@ -46,12 +97,8 @@
 
             colors = # catppuccin mocha
               let
-                accent = if (config.desktop.accent == "pink") then pink else blue;
                 base = "#1e1e2e";
                 blue = "#89b4fa";
-                flamingo = "#f2cdcd";
-                indicator = if (config.desktop.accent == "pink") then flamingo else teal;
-                pink = "#f5c2e7";
                 red = "#f38ba8";
                 surface1 = "#45475a";
                 teal = "#94e2d5";
@@ -59,10 +106,10 @@
               in
               {
                 focused = {
-                  background = "${accent}";
-                  border = "${accent}";
-                  childBorder = "${accent}";
-                  indicator = "${indicator}";
+                  background = "${blue}";
+                  border = "${blue}";
+                  childBorder = "${blue}";
+                  indicator = "${teal}";
                   text = "${base}";
                 };
 
@@ -174,20 +221,20 @@
             modifier = "Mod4";
             output = {
               "eDP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "2256x1504@60Hz";
                 position = "0 0";
                 scale = "1.5";
               };
 
               "DP-1" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@165Hz";
                 position = "0 0";
               };
 
               "DP-2" = {
-                background = "~/Pictures/wallpaper.jpg fill";
+                background = "~/Pictures/wallpaper.png fill";
                 mode = "1920x1080@75Hz";
                 position = "1920 0";
               };
-- 
cgit v1.3.1