diff --git a/machines/J0162/elitherl.nix b/machines/J0162/elitherl.nix index 5cc3985f..baaf32c6 100644 --- a/machines/J0162/elitherl.nix +++ b/machines/J0162/elitherl.nix @@ -14,26 +14,47 @@ teams-for-linux zoom-us ]; + programs.firefox.package = pkgs.firefox-wayland; wayland.windowManager.hyprland.extraConfig = '' source=./common.conf monitor=eDP-1,preferred,auto,1.00 + monitor=DP-2,preferred,auto,auto + monitor=DP-3,preferred,auto,auto,transform,1 + windowrule = float, title:^([Zz]oom).*$ + windowrule = center, title:^([Zz]oom).*$ + # windowrule = workspace 4 silent, ^(Microsoft Teams - Preview)$ + windowrule = workspace 3, title:^([Zz]oom).*$ + windowrule = workspace 4 silent, ^(Nxplayer.bin)$ ''; - # wayland.windowManager.sway.config.output.eDP-1.scale = "1.0"; - programs.waybar.settings.main = { - "modules-left" = ["wlr/workspaces"]; - "modules-center" = ["clock"]; - "modules-right" = [ - "cpu" - "memory" - "temperature" - "pulseaudio" - "network" - "bluetooth" - "backlight" - "battery" - "battery#bat2" - "tray" - ]; + programs.waybar.settings = { + main = { + "output" = "!DP-3"; + "modules-left" = [ + "wlr/workspaces" + "cpu" + "memory" + "temperature" + ]; + "modules-center" = ["clock"]; + "modules-right" = [ + "pulseaudio" + "bluetooth" + "network#compact" + "backlight" + "battery" + "tray" + ]; + }; + alt = { + "include" = [ + "~/.config/waybar/modules.json" + "~/.config/waybar/layout.json" + ]; + "output" = "DP-3"; + "modules-left" = []; + "modules-center" = ["wlr/workspaces"]; + "modules-right" = []; + }; }; }