Remove third type of waybar, have only main and compact

flake.nix

@@ -196,7 +196,6 @@
                 ./home/desktop/hyprland
                 ./home/desktop/waybar/main.nix
                 ./home/desktop/waybar/laptop.nix
-                ./home/desktop/waybar/vertical.nix
                 ./home/gui
               ];
               home = {
@@ -207,8 +206,7 @@
               programs.neovim.package = pkgs.neovim-nightly;
               programs.waybar.settings = {
                 main."output" = "DP-5";
-                laptop."output" = "eDP-1";
+                compact."output" = ["eDP-1" "DP-3"];
-                vertical."output" = "DP-3";
               };
               xdg.configFile."hypr/hyprpaper.conf".text = ''
                 preload = ${wallpapers.outputs.default}

home/desktop/hyprland/hyprland.conf

@@ -69,6 +69,7 @@ bind = SUPER, Space, exec, pkill rofi || rofi -show drun
 bind = SUPER SHIFT, Space, togglefloating,
 bind = SUPER, W, exec, pgrep chromium > /dev/null || chromium
 bind = SUPER, E, exec, thunar
+bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer
 bind = SUPER, Q, killactive,
 bind = SUPER SHIFT, Q, exec, powermenu
 bind = SUPER, F1, exec, swaylock
@@ -145,13 +146,13 @@ windowrule = workspace 3,(chromium-browser)
 windowrule = workspace 3,(firefox)
 windowrule = workspace 4,^(libreoffice).*
 windowrule = workspace 4,(Zotero)
-windowrule = workspace 5,(Signal)
+windowrule = workspace 5 silent,(Signal)
-windowrule = workspace 5,(fractal)
+windowrule = workspace 5 silent,(fractal)
-windowrule = workspace 5,(discord)
+windowrule = workspace 5 silent,(discord)
-windowrule = workspace 5,(teams-for-linux)
+windowrule = workspace 6 silent,(Nxplayer.bin)
-windowrule = workspace 6,(Nxplayer.bin)
 windowrule = workspace 7,^(steam).*
 windowrule = workspace 7,(.gamescope-wrapped)
+
 windowrule = float,(foot)
 windowrule = center,(foot)
 windowrule = float,(pavucontrol)
@@ -167,8 +168,8 @@ windowrule = float,(otpclient)
 windowrule = move 10% 10%,(otpclient)
 windowrule = float,(thunar)
 windowrule = center,(thunar)
+windowrule = float,(Nxplayer.bin)
+windowrule = center,(Nxplayer.bin)
 
 windowrulev2 = float,title:^(Zoom|zoom).*
 windowrulev2 = workspace 5,title:^(Zoom|zoom).*
-windowrulev2 = float,class:(Nxplayer.bin),title:^(NoMachine)$
-windowrulev2 = maximize,class:(Nxplayer.bin),title:^(NoMachine).+$

home/desktop/waybar/laptop.nix

@@ -1,6 +1,6 @@
 {...}: {
   imports = [./default.nix];
-  programs.waybar.settings.laptop = {
+  programs.waybar.settings.compact = {
     layer = "top";
     position = "top";
     spacing = 10;
@@ -25,11 +25,11 @@
       "battery#compact"
       "tray"
     ];
-    "clock#compact" = import ./modules/clock.compact.nix;
+    "wlr/workspaces" = import ./modules/wlr_workspaces.nix;
     cpu = import ./modules/cpu.nix;
     memory = import ./modules/memory.nix;
     temperature = import ./modules/temperature.nix;
-    "wlr/workspaces" = import ./modules/wlr_workspaces.nix;
+    "clock#compact" = import ./modules/clock.compact.nix;
     "pulseaudio#compact" = import ./modules/pulseaudio.compact.nix;
     "bluetooth#compact" = import ./modules/bluetooth.compact.nix;
     "network#compact" = import ./modules/network.compact.nix;

home/desktop/waybar/main.nix

@@ -21,14 +21,15 @@
       "pulseaudio"
       "bluetooth"
       "network"
+      "backlight"
       "battery"
       "tray"
     ];
-    clock = import ./modules/clock.nix;
+    "wlr/workspaces" = import ./modules/wlr_workspaces.nix;
     cpu = import ./modules/cpu.nix;
     memory = import ./modules/memory.nix;
     temperature = import ./modules/temperature.nix;
-    "wlr/workspaces" = import ./modules/wlr_workspaces.nix;
+    clock = import ./modules/clock.nix;
     pulseaudio = import ./modules/pulseaudio.nix;
     bluetooth = import ./modules/bluetooth.nix;
     network = import ./modules/network.nix;

home/desktop/waybar/vertical.nix

@@ -1,20 +0,0 @@
-{...}: {
-  imports = [./default.nix];
-  programs.waybar.settings = {
-    vertical = {
-      layer = "top";
-      position = "top";
-      spacing = 10;
-      margin-top = 10;
-      margin-left = 20;
-      margin-right = 20;
-      margin-bottom = 5;
-      "modules-left" = ["wlr/workspaces"];
-      "modules-center" = ["clock#compact"];
-      "modules-right" = ["tray"];
-      "wlr/workspaces" = import ./modules/wlr_workspaces.nix;
-      "clock#compact" = import ./modules/clock.compact.nix;
-      tray = import ./modules/tray.nix;
-    };
-  };
-}