wip

flake.nix

@@ -46,6 +46,7 @@
 
       overlays = with inputs; [
         nur.overlay
+        (_: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; })
       ];
 
       deploy = lib.mkDeploy { inherit (inputs) self; };

homes/x86_64-linux/gwen@grovetender/default.nix

@@ -41,7 +41,6 @@ in
         wms = {
           hyprland = {
             enable = true;
-            # enableDebug = true;
           };
         };
       };
@@ -74,6 +73,8 @@ in
       xdg = enabled;
     };
 
+    theme.enable = true;
+
     suites = {
       art = enabled;
       business = enabled;
@@ -97,9 +98,6 @@ in
       social = enabled;
       video = enabled;
     };
-
-    theme.enable = true;
-    theme.name = "paradise";
   };
 
   home.stateVersion = "24.05";

modules/home/programs/graphical/addons/hyprlock/default.nix

@@ -161,7 +161,7 @@ in
 
         background = [
           {
-            path = "${config.wallpaper}";
+            path = "screenshot";
             blur_passes = 3;
             blur_size = 8;
           }

modules/home/programs/graphical/bars/waybar/default.nix

@@ -27,10 +27,9 @@ let
   workspacesStyle = builtins.readFile ./styles/workspaces.css;
 
   custom-modules = import ./modules/custom-modules.nix { inherit config lib pkgs; };
-  default-modules = import ./modules/default-modules.nix { inherit lib pkgs; };
+  default-modules = import ./modules/default-modules.nix { inherit lib pkgs config; };
   group-modules = import ./modules/group-modules.nix;
   hyprland-modules = import ./modules/hyprland-modules.nix { inherit config lib; };
-  sway-modules = import ./modules/sway-modules.nix { inherit config lib; };
 
   commonAttributes = {
     layer = "top";
@@ -45,10 +44,8 @@ let
       ++ lib.optionals config.${namespace}.programs.graphical.wms.hyprland.enable [
         "hyprland/workspaces"
       ]
-      ++ lib.optionals config.${namespace}.programs.graphical.wms.sway.enable [ "sway/workspaces" ]
       ++ [ "custom/separator-left" ]
-      ++ lib.optionals config.${namespace}.programs.graphical.wms.hyprland.enable [ "hyprland/window" ]
-      ++ lib.optionals config.${namespace}.programs.graphical.wms.sway.enable [ "sway/window" ];
+      ++ lib.optionals config.${namespace}.programs.graphical.wms.hyprland.enable [ "hyprland/window" ];
   };
 
   fullSizeModules = {
@@ -90,7 +87,6 @@ let
       default-modules
       group-modules
       (lib.mkIf config.${namespace}.programs.graphical.wms.hyprland.enable hyprland-modules)
-      (lib.mkIf config.${namespace}.programs.graphical.wms.sway.enable sway-modules)
     ];
 
   generateOutputSettings =

modules/home/programs/graphical/bars/waybar/modules/default-modules.nix

@@ -1,8 +1,11 @@
-{ lib, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
   inherit (lib) getExe getExe';
-
-  catppuccin = import (lib.snowfall.fs.get-file "modules/home/theme/catppuccin/colors.nix");
 in
 {
   backlight =
@@ -82,7 +85,7 @@ in
     ];
   };
 
-  clock = {
+  clock = with config.lib.stylix.colors; {
     tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
     format = "󰃭 {:%a %d %b \n 󰅐 %I:%M %p}";
     calendar = {
@@ -91,11 +94,11 @@ in
       weeks-pos = "right";
       on-scroll = 1;
       format = {
-        months = "<span color='${catppuccin.colors.rosewater.hex}'><b>{}</b></span>";
-        days = "<span color='${catppuccin.colors.flamingo.hex}'><b>{}</b></span>";
-        weeks = "<span color='${catppuccin.colors.teal.hex}'><b>W{}</b></span>";
-        weekdays = "<span color='${catppuccin.colors.yellow.hex}'><b>{}</b></span>";
-        today = "<span color='${catppuccin.colors.red.hex}'><b><u>{}</u></b></span>";
+        months = "<span color='#${base05}'><b>{}</b></span>";
+        days = "<span color='#${base05}'><b>{}</b></span>";
+        weeks = "<span color='#${base05}'><b>W{}</b></span>";
+        weekdays = "<span color='#${base0B}'><b>{}</b></span>";
+        today = "<span color='#${base0A}'><b><u>{}</u></b></span>";
       };
     };
     actions = {
@@ -121,19 +124,6 @@ in
     format = " {percentage_used}%";
   };
 
-  gamemode = {
-    format = "󰊴";
-    format-alt = "{glyph}";
-    glyph = "󰊴";
-    hide-not-running = true;
-    use-icon = true;
-    icon-name = "input-gaming-symbolic";
-    icon-spacing = 4;
-    icon-size = 20;
-    tooltip = true;
-    tooltip-format = "Games running: {count}";
-  };
-
   idle_inhibitor = {
     format = "{icon} ";
     format-icons = {
@@ -208,8 +198,8 @@ in
     in
     {
       interval = 1;
-      format-wifi = "󰜷 {bandwidthUpBytes}\n󰜮 {bandwidthDownBytes}";
-      format-ethernet = "󰜷 {bandwidthUpBytes}\n󰜮 {bandwidthDownBytes}";
+      format-wifi = "󰜷 {bandwidthUpBytes} 󰜮 {bandwidthDownBytes}";
+      format-ethernet = "󰜷 {bandwidthUpBytes} 󰜮 {bandwidthDownBytes}";
       tooltip-format = "󰈀 {ifname} via {gwaddr}";
       format-linked = "󰈁 {ifname} (No IP)";
       format-disconnected = " Disconnected";
@@ -252,20 +242,6 @@ in
     user = false;
   };
 
-  temperature = {
-    hwmon-path-abs = "/sys/devices/pci0000:00/0000:00:18.3/hwmon";
-    input-filename = "temp3_input";
-    critical-threshold = 80;
-    format-critical = "{temperatureC}°C {icon}";
-    format = "{icon} {temperatureC}°C";
-    format-icons = [
-      ""
-      ""
-      ""
-    ];
-    interval = "5";
-  };
-
   tray = {
     spacing = 10;
   };