desktop/niri: change focus-ring to border

Signed-off-by: unexplrd <unexplrd@linerds.us>

hosts/dunamis/configuration.nix

@@ -37,7 +37,7 @@
     };
     stylix = {
       enable = true;
-      theme = "rose-pine-moon";
+      theme = "gruvbox-dark-pale";
     };
   };
 

modules/home/desktop/niri/default.nix

@@ -45,19 +45,21 @@ in {
     gtk = {
       enable = true;
       iconTheme = let
-        papirusPackage =
-          if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme)
+        name =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then "Gruvbox-Plus-Dark"
+          else if config.stylix.polarity == "dark"
+          then "Papirus-Dark"
+          else "Papirus-Light";
+        package =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then pkgs.gruvbox-plus-icons
+          else if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme)
           then pkgs.papirus-icon-theme.override {color = "indigo";}
           else if (lib.strings.hasPrefix "nord" osConfig.module.stylix.theme)
           then pkgs.papirus-icon-theme.override {color = "nordic";}
           else pkgs.papirus-icon-theme;
-      in {
-        name =
-          if config.stylix.polarity == "dark"
-          then "Papirus-Dark"
-          else "Papirus-Light";
-        package = papirusPackage;
-      };
+      in {inherit name package;};
     };
     qt = {
       enable = true;

modules/home/desktop/niri/niri.nix

@@ -163,7 +163,7 @@ in {
     }
 
     layout {
-      gaps 6
+      gaps 3
       center-focused-column "never" // "on-overflow"
       preset-column-widths {
         proportion 0.33333
@@ -185,11 +185,17 @@ in {
         width 6
       }
       focus-ring {
-        // off
+        off
         width 3
         active-gradient from="#${colors.base0D}" to="#${colors.base0F}" angle=40 relative-to="workspace-view"
         inactive-color "#${colors.base03}"
       }
+      border {
+        width 3
+        active-color "#${colors.base0D}"
+        inactive-color "#${colors.base03}"
+
+      }
       struts {
         left 33
         right 33

modules/home/desktop/niri/programs/waybar/default.nix

@@ -102,8 +102,9 @@
       };
       "clock" = {
         interval = 1;
-        format = "{:%H:%M:%S}";
-        tooltip-format = "{:%d.%m.%Y}";
+        format = "{:%B %d - %H:%M - %A}";
+        tooltip = false;
+        # tooltip-format = "{%y.%m.%d - %B %d, %A}";
       };
       battery = {
         states = {

modules/nixos/system/misc/stylix/default.nix

@@ -29,6 +29,10 @@
     if stateVersion == "24.11"
     then pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}
     else pkgs.nerd-fonts.jetbrains-mono;
+  geistMonoPackage =
+    if stateVersion == "24.11"
+    then pkgs.nerdfonts.override {fonts = ["GeistMono"];}
+    else pkgs.nerd-fonts.geist-mono;
 
   wallpapers = {
     fern-outline = builtins.fetchurl {
@@ -51,6 +55,11 @@
       name = "wallhaven-ymo2y7.png";
       sha256 = "1b3j0hxxy8m25scq42lxsxc99xvr15pha1j4wplgz761asrvxly3";
     };
+    nixos-rainbow = builtins.fetchurl {
+      url = "https://w.wallhaven.cc/full/p9/wallhaven-p9pd23.png";
+      name = "wallhaven-p9pd23.png";
+      sha256 = "7CMuETntiVUCKhUIdJzX+sf3F47GvuX2a61o4xbEzww=";
+    };
   };
   themes = {
     rose-pine-dawn = {
@@ -80,8 +89,10 @@
       wallpaper = wallpapers.cyber-dawn;
 
       serif = {
-        package = iosevkaPackage;
-        name = "Iosevka Nerd Font Propo";
+        # package = iosevkaPackage;
+        # name = "Iosevka Nerd Font Propo";
+        package = pkgs.geist-font;
+        name = "Geist Light";
       };
 
       monospace = {
@@ -95,6 +106,29 @@
         size = 24;
       };
     };
+    gruvbox-dark-pale = {
+      polarity = "dark";
+      scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-pale.yaml";
+      wallpaper = wallpapers.nixos-rainbow;
+
+      serif = {
+        # package = iosevkaPackage;
+        # name = "Iosevka Nerd Font Propo";
+        package = pkgs.geist-font;
+        name = "Geist";
+      };
+
+      monospace = {
+        package = geistMonoPackage;
+        name = "GeistMono Nerd Font";
+      };
+
+      cursor = {
+        package = pkgs.bibata-cursors;
+        name = "Bibata-Modern-Classic";
+        size = 24;
+      };
+    };
     nord = {
       polarity = "dark";
       scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";