update tlp and bar

home/system/hyprpanel/default.nix

@@ -7,7 +7,7 @@ let
   background = "#${config.lib.stylix.colors.base00}";
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
-  font = "${config.stylix.fonts.serif.name}";
+  font = "${config.stylix.fonts.sansSerif.name}";
   fontSize = "${toString config.stylix.fonts.sizes.desktop}px";
 
   inherit (config.var.theme) rounding border-size gaps-in gaps-out;
@@ -22,81 +22,36 @@ in {
     overlay.enable = true;
     hyprland.enable = true;
     overwrite.enable = true;
-    layout = {
-      "bar.layouts" = {
-        "0" = {
-          left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ];
-          middle = [ "media" ];
-          right = [
-            "systray"
-            "volume"
-            "hyprsunset"
-            "battery"
-            "network"
-            "cpu"
-            "clock"
-            "notifications"
-          ];
-        };
-        "*" = {
-          left = [ "dashboard" "workspaces" "windowtitle" ];
-          middle = [ "clock" ];
-          right = [ "volume" "notifications" ];
+    settings = {
+      layout = {
+        bar.layouts = {
+          "0" = {
+            left = [ "dashboard" "hypridle" "workspaces" "windowtitle" ];
+            middle = [ "media" ];
+            right = [
+              "volume"
+              "hyprsunset"
+              "battery"
+              "network"
+              "bluetooth"
+              "cpu"
+              "clock"
+              "systray"
+              "notifications"
+            ];
+          };
+          "*" = {
+            left = [ "dashboard" "workspaces" "windowtitle" ];
+            middle = [ "clock" ];
+            right = [ "volume" "notifications" ];
+          };
         };
       };
     };
 
     override = {
-      bar.battery.hideLabelWhenFull = true;
-      bar.bluetooth.label = false;
-      bar.clock.format = "%a, %d %b  %H:%M";
-      bar.customModules.hypridle.label = false;
-      bar.customModules.hyprsunset.label = false;
-      bar.customModules.hyprsunset.temperature = "4500k";
-      bar.launcher.icon = "";
-      bar.media.show_active_only = true;
-      bar.network.label = false;
-      bar.network.truncation_size = 12;
-      bar.volume.label = false;
-      bar.windowtitle.label = true;
-      bar.workspaces.applicationIconEmptyWorkspace = "";
-      bar.workspaces.hideUnoccupied = false;
-      bar.workspaces.monitorSpecific = false;
-      bar.workspaces.numbered_active_indicator = "underline";
-      bar.workspaces.showApplicationIcons = false;
-      bar.workspaces.showIcons = false;
-      bar.workspaces.workspaces = 5;
-      bar.workspaces.show_numbered = true;
-      menus.clock.time.hideSeconds = true;
-      menus.clock.time.military = true;
-      menus.clock.weather.key = weatherapikey;
-      menus.clock.weather.location = location;
-      menus.clock.weather.unit = "metric";
-      menus.dashboard.powermenu.avatar.image =
-        "/home/${username}/.profile_picture.png";
-      menus.dashboard.powermenu.confirmation = false;
-      menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
-      menus.dashboard.shortcuts.left.shortcut1.icon = "";
-      menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
-      menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
-      menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
-      menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
-      menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
-      menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
-      menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
-      menus.dashboard.shortcuts.left.shortcut4.command = "menu";
-      menus.dashboard.shortcuts.left.shortcut4.icon = "";
-      menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
-      menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
-      menus.dashboard.shortcuts.right.shortcut1.icon = "";
-      menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
-      menus.dashboard.shortcuts.right.shortcut3.command =
-        "screenshot region swappy";
-      menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
-      menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
-      menus.dashboard.stats.enabled = false;
       theme.bar.background =
-        "${background + (if transparentButtons then "00" else "")}";
+        "${background + (if transparent then "00" else "")}";
       theme.bar.border_radius = "${toString rounding}px";
       theme.bar.buttons.background =
         "${(if transparent then background else background-alt)
@@ -117,10 +72,9 @@ in {
       theme.bar.buttons.workspaces.available = accent-alt;
       theme.bar.buttons.workspaces.hover = accent-alt;
       theme.bar.buttons.workspaces.occupied = accent;
-      theme.bar.buttons.y_margins =
-        if floating && transparent then "0" else "8";
+      theme.bar.buttons.y_margins = if transparentButtons then "0" else "8";
       theme.bar.dropdownGap = "3em";
-      theme.bar.floating = if floating then "true" else "false";
+      theme.bar.floating = floating;
       theme.bar.location = position;
       theme.bar.margin_bottom =
         "${if position == "top" then "0" else toString (gaps-in * 2)}px";
@@ -176,6 +130,56 @@ in {
       theme.osd.muted_zero = true;
       theme.osd.orientation = "vertical";
       theme.osd.radius = "${toString rounding}px";
+
+      bar.workspaces.reverse_scroll = true;
+      bar.battery.hideLabelWhenFull = true;
+      bar.bluetooth.label = false;
+      bar.clock.format = "%a, %d %b  %H:%M";
+      bar.customModules.hypridle.label = false;
+      bar.customModules.hyprsunset.label = false;
+      bar.customModules.hyprsunset.temperature = "4500k";
+      bar.launcher.icon = "";
+      bar.media.show_active_only = true;
+      bar.network.label = false;
+      bar.network.truncation_size = 12;
+      bar.volume.label = false;
+      bar.windowtitle.label = true;
+      # bar.workspaces.applicationIconEmptyWorkspace = "";
+      # bar.workspaces.hideUnoccupied = false;
+      bar.workspaces.monitorSpecific = false;
+      # bar.workspaces.numbered_active_indicator = "underline";
+      # bar.workspaces.showApplicationIcons = false;
+      bar.workspaces.show_icons = false;
+      bar.workspaces.workspaces = 5;
+      bar.workspaces.show_numbered = true;
+      menus.clock.time.hideSeconds = true;
+      menus.clock.time.military = true;
+      menus.clock.weather.key = weatherapikey;
+      menus.clock.weather.location = location;
+      menus.clock.weather.unit = "metric";
+      menus.dashboard.powermenu.avatar.image =
+        "/home/${username}/.profile_picture.png";
+      menus.dashboard.powermenu.confirmation = false;
+      menus.dashboard.shortcuts.left.shortcut1.command = "firefox";
+      menus.dashboard.shortcuts.left.shortcut1.icon = "";
+      menus.dashboard.shortcuts.left.shortcut1.tooltip = "Firefox";
+      menus.dashboard.shortcuts.left.shortcut2.command = "caffeine";
+      menus.dashboard.shortcuts.left.shortcut2.icon = "󰅶";
+      menus.dashboard.shortcuts.left.shortcut2.tooltip = "Caffeine";
+      menus.dashboard.shortcuts.left.shortcut3.command = "night-shift";
+      menus.dashboard.shortcuts.left.shortcut3.icon = "󰖔";
+      menus.dashboard.shortcuts.left.shortcut3.tooltip = "Night-shift";
+      menus.dashboard.shortcuts.left.shortcut4.command = "menu";
+      menus.dashboard.shortcuts.left.shortcut4.icon = "";
+      menus.dashboard.shortcuts.left.shortcut4.tooltip = "Search Apps";
+      menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
+      menus.dashboard.shortcuts.right.shortcut1.icon = "";
+      menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
+      menus.dashboard.shortcuts.right.shortcut3.command =
+        "screenshot region swappy";
+      menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
+      menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
+      menus.dashboard.stats.enabled = false;
       wallpaper.enable = false;
     };
   };