feat(niri): giving niri a test drive

modules/home/programs/fuzzel/default.nix

@@ -22,7 +22,7 @@ in
           main = {
             layer = "overlay";
             font = "Input Sans Narrow Light:size=12";
-            launch-prefix = "uwsm app --";
+            # launch-prefix = "uwsm app --";
             lines = "8";
           };
           colors = {

modules/home/programs/ghostty/default.nix

@@ -28,7 +28,7 @@ in
         enableFishIntegration = config.programs.fish.enable;
         enableZshIntegration = config.programs.zsh.enable;
         settings = {
-          theme = "GruvboxDark";
+          theme = "GruvboxDarkHard";
           focus-follows-mouse = true;
           resize-overlay = "never";
           background-opacity = 0.95;

modules/home/programs/helix/default.nix

@@ -12,7 +12,7 @@ in
 {
   imports = [
     ./languages.nix
-    ./gruvbox.nix
+    # ./gruvbox.nix
   ];
 
   options = {
@@ -26,7 +26,7 @@ in
       package = inputs.helix-flake.packages.${pkgs.system}.default;
 
       settings = {
-        theme = "gruvbox_custom";
+        theme = "gruvbox_dark_hard";
         editor = {
           color-modes = true;
           scrolloff = 0;

modules/home/programs/hyprlock/default.nix

@@ -1,7 +1,6 @@
 {
   inputs,
   pkgs,
-  config,
   lib,
   osConfig,
   cLib,
@@ -9,7 +8,7 @@
 }:
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.home.programs.hyprlock;
+  cfg = osConfig.nixos.programs.hyprland;
 
   hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
   # hyprlockPkg = pkgs.hyprlock;
@@ -18,9 +17,6 @@ let
   inherit (cLib.theme.bgs) resolve;
 in
 {
-  options = {
-    home.programs.hyprlock.enable = mkEnableOption "Enables hyprlock";
-  };
   config = mkIf cfg.enable {
     programs.hyprlock = {
       enable = true;

modules/home/programs/waybar/config/config.jsonc

@@ -1,5 +1,22 @@
 [
   {
+    "modules-left": [
+      "group/system"
+    ],
+    "modules-center": [
+      "niri/workspaces"
+    ],
+    "modules-right": [
+      "custom/progress",
+      "custom/systemd",
+      "group/tray",
+      "pulseaudio",
+      "backlight",
+      "battery",
+      "date",
+      "clock",
+      "custom/dunst"
+    ],
     "backlight": {
       "format": "<span foreground='#928374'>{icon}</span> {percent}%",
       "format-icons": [
@@ -128,6 +145,19 @@
         "*": 3
       }
     },
+    "niri/workspaces": {
+      "format": "{icon}",
+      "format-icons": {
+        // Named workspaces
+        // (you need to configure them in niri)
+        "browser": "",
+        "discord": "",
+        "chat": "<b></b>",
+        // Icons by state
+        "active": "",
+        "default": ""
+      }
+    },
     "memory": {
       "format": "<span foreground='#928374'></span> {}%",
       "states": {
@@ -135,23 +165,6 @@
         "warning": 70
       }
     },
-    "modules-center": [
-      "hyprland/workspaces"
-    ],
-    "modules-left": [
-      "group/system"
-    ],
-    "modules-right": [
-      "custom/progress",
-      "custom/systemd",
-      "group/tray",
-      "pulseaudio",
-      "backlight",
-      "battery",
-      "date",
-      "clock",
-      "custom/dunst"
-    ],
     "network": {
       "format-disconnected": " <span foreground='#928374'></span> ",
       "format-ethernet": "<span foreground='#928374'></span> {ifname}",