add DankMaterialShell

modules/home/desktop/niri/niri.nix

@@ -154,6 +154,7 @@ in {
     screenshot-path "${xdgPics}/screenshots/screenshot-%Y-%m-%d-%H-%M-%S.png"
 
     animations {
+      off
       slowdown 0.5
     }
 
@@ -187,16 +188,17 @@ in {
         width 6
       }
       focus-ring {
+        off
         width 1
-        active-color "#${colors.base0D}"
-        inactive-color "#${colors.base03}"
+        active-color "#${colors.base03}"
+        inactive-color "#${colors.base02}"
         urgent-color "#${colors.base08}"
       }
       border {
-        off
+        // off
         width 1
-        active-color "#${colors.base0D}"
-        inactive-color "#${colors.base03}"
+        active-color "#${colors.base03}"
+        inactive-color "#${colors.base02}"
         urgent-color "#${colors.base08}"
       }
     }

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

@@ -21,13 +21,25 @@ in {
     margin-right = 36 + 3;
     margin-bottom = 3;
     modules-left = [
-      "custom/launcher"
-      "wlr/taskbar"
+      # "custom/launcher"
+      "niri/language"
+      "niri/workspaces"
+      # "wlr/taskbar"
+    ];
+    modules-center = [
+      "clock"
     ];
     modules-right = [
-      "niri/workspaces"
-      "clock"
-      "niri/language"
+      "privacy"
+      "network"
+      "cpu"
+      "memory"
+      "wireplumber"
+      "wireplumber#source"
+      (ifLaptop "group/laptop")
+      "tray"
+      "idle_inhibitor"
+      "custom/notification"
     ];
     "niri/workspaces" = {
       format = "{index}";
@@ -49,34 +61,12 @@ in {
       tooltip = false;
     };
     "wlr/taskbar" = {
-      format = "{icon} {name}";
+      format = "{icon}";
       icon-size = 16;
       icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
       tooltip-format = "{title}";
       on-click = "activate";
     };
-  };
-  settings.top = {
-    position = "top";
-    height = 34;
-    spacing = 0;
-    margin-left = 36 + 3;
-    margin-right = 36 + 3;
-    margin-top = 3;
-    modules-left = [
-      "custom/notification"
-      "tray"
-      "privacy"
-    ];
-    modules-right = [
-      "network"
-      "cpu"
-      "memory"
-      "wireplumber"
-      "wireplumber#source"
-      (ifLaptop "group/laptop")
-      "idle_inhibitor"
-    ];
     "group/laptop" = {
       orientation = "inherit";
       modules = [
@@ -248,10 +238,14 @@ in {
         color: @base05;
         border-radius: 12px;
       }
+      window#waybar {
+        border: 1px solid @base01;
+      }
 
       .modules-left,
       .modules-center,
       .modules-right {
+        margin: 1px;
         padding-left: 3px;
       } /* for leftmost modules */
 
@@ -309,6 +303,9 @@ in {
         margin: 3px 3px 3px 0;
         padding: 0 0.42em;
       }
+      #clock {
+        background-color: @base00;
+      }
 
       #backlight,
       #battery,