Waybar finalized

modules/wm/hyprland/default.nix

@@ -6,12 +6,12 @@
 }: let
   inherit (lib) mkIf mkEnableOption;
   cfg = config.horseman.wm.hyprland;
-  homeCfg = config.horseman;
 in {
   imports = [
     ./options.nix
     ./keybindings.nix
     ./animations.nix
+    ./waybar.nix
   ];
 
   options = {
@@ -66,9 +66,6 @@ in {
         "suppressevent maximize, class:.*"
         "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
 
-        "rounding 0, floating:0 onworkspace:w[tv1]"
-        "bordersize 0, floating:0 onworkspace:w[tv1]"
-
         "float, initialTitle:^Picture-in-Picture$"
         "center, initialTitle:^Picture-in-Picture$"
         "size 33% 33%, initialTitle:^Picture-in-Picture$"
@@ -77,10 +74,6 @@ in {
         "float, initialTitle:GLFW"
       ];
 
-      workspaces = [
-        "w[tv1], gapsout:0, gapsin:0"
-      ];
-
       general = {
         gapsIn = 5;
         gapsOut = 5;
@@ -195,109 +188,6 @@ in {
           }
         ];
       };
-
-      waybar = {
-        formats = {
-          horizontal = {
-            "clock" = {
-              format = "󰥔 {:%H:%M:%S}";
-              format-alt = "{:%a %d %b %Y}";
-            };
-          };
-          vertical = {
-            "clock" = {
-              format = "{:%H\n%M\n%S}";
-              format-alt = "{:%d\n%m\n%y}";
-            };
-          };
-        };
-        modules = {
-          "clock" = {
-            interval = 1;
-            tooltip = false;
-          };
-
-          "cpu" = {
-            interval = 3;
-            format = " {usage}%";
-            on-click = "kitty btop &";
-          };
-
-          "memory" = {
-            interval = 3;
-            format = " {percentage}%";
-            on-click = "kitty btop &";
-          };
-
-          "pulseaudio" = {
-            format = " {volume}";
-            on-click = "kitty pulsemixer &";
-          };
-
-          "network" = {
-            interval = 3;
-            format = "{ipaddr}";
-            format-ethernet = " {ipaddr}";
-            format-disconnected = "󰣽 Disconnected";
-            format-wifi = "󰤨 {essid}";
-
-            tooltip = false;
-          };
-
-          "battery" = {
-            interval = 3;
-            # TODO This needs to be fixed
-          };
-
-          "hyprland/workspaces" = {
-            format = "{icon}";
-            format-icons = {
-              "active" = "";
-              "default" = "";
-              "empty" = "";
-            };
-            persistent-workspaces = {
-              "*" = [1 2 3 4 5 6 7 8 9 10];
-            };
-          };
-
-          "group/power" = {
-            orientation = "horizontal";
-            drawer = {
-            };
-            modules = [
-              "custom/power"
-              "custom/reboot"
-              "custom/lock"
-              "idle_inhibitor"
-            ];
-          };
-
-          "custom/lock" = {
-            format = "󰍁 ";
-            tooltip = false;
-            on-click = "hyprlock";
-          };
-          "custom/reboot" = {
-            format = "󰜉 ";
-            tooltip = false;
-            on-click = "reboot";
-          };
-          "custom/power" = {
-            format = " ";
-            tooltip = false;
-            on-click = "shutdown now";
-          };
-          "idle_inhibitor" = {
-            tooltip = false;
-            format = "{icon}";
-            format-icons = {
-              deactivated = "󰒲 ";
-              activated = "󰒳 ";
-            };
-          };
-        };
-      };
     };
 
     services.logind.extraConfig = ''