niri: move rules to module

Signed-off-by: Myned <dev@bjork.tech>

options/custom/desktops/niri/default.nix

@@ -86,23 +86,6 @@ in {
                   children = with kdl;
                     node.children
                     ++ [
-                      # https://github.com/YaLTeR/niri/wiki/Configuration:-Layout#shadow
-                      # (plain "shadow" [
-                      #   (flag "on")
-                      #   (leaf "inactive-color" "#00000000")
-                      # ])
-
-                      # https://github.com/YaLTeR/niri/wiki/Configuration:-Layout#tab-indicator
-                      (plain "tab-indicator" [
-                        (flag "place-within-column")
-                        (leaf "active-color" "#d33682")
-                        (leaf "inactive-color" "#d3368240")
-                        (leaf "corner-radius" config.custom.rounding)
-                        (leaf "gap" 2)
-                        (leaf "gaps-between-tabs" 2)
-                        (leaf "length" {total-proportion = 0.98;})
-                        (leaf "width" (config.custom.border + 3))
-                      ])
                     ];
                 }
               else node));

options/custom/desktops/niri/layout.nix

@@ -75,6 +75,12 @@ in {
             {proportion = 1.0;} # 100%, default
           ];
 
+          # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutshadowcolor
+          shadow = {
+            color = "#00000080";
+            inactive-color = "#00000020";
+          };
+
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutstruts
           struts = {
             left = gap;
@@ -82,6 +88,18 @@ in {
             top = gap;
             bottom = gap;
           };
+
+          # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayouttab-indicator
+          tab-indicator = {
+            corner-radius = config.custom.rounding;
+            gap = 2;
+            gaps-between-tabs = 2;
+            active.color = "#d33682";
+            inactive.color = "#d3368240";
+            length.total-proportion = 0.95;
+            place-within-column = true;
+            width = config.custom.border + 3;
+          };
         };
       }
     ];

options/custom/desktops/niri/rules.nix

@@ -49,7 +49,7 @@ in {
 
               border.enable = false;
               focus-ring.enable = false;
-              #// shadow.enable = true;
+              shadow.enable = true;
             }
 
             {
@@ -197,7 +197,7 @@ in {
               pip = with config.custom; rec {
                 x = gap - border * 2;
                 y = gap;
-                w = builtins.floor (width * 0.3 - gap * 2 + border * 2 + border + 1); # 30%
+                w = builtins.floor (width * 0.25 - gap * 2 + border * 2 + border + 1); # 25%
                 h = builtins.floor (w * 9 / 16); # 16:9
               };
             in {