diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 716a904b..2e1d53ae 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -54,11 +54,13 @@ in { }; extraConfig = builtins.readFile ./hyprland.conf; }; - xdg.configFile."hypr/hyprpaper.conf".text = lib.mkDefault '' - preload = ${inputs.wallpapers.outputs.default} - wallpaper = ,${inputs.wallpapers.outputs.default} - ''; - xdg.configFile."hypr/macchiato.conf".source = ./macchiato.conf; - xdg.configFile."hypr/display.conf".text = lib.mkDefault ''''; - xdg.configFile."hypr/autostart.conf".text = lib.mkDefault ''''; + xdg.configFile = { + "hypr/hyprpaper.conf".text = lib.mkDefault '' + preload = ${inputs.wallpapers.outputs.default} + wallpaper = ,${inputs.wallpapers.outputs.default} + ''; + "hypr/macchiato.conf".source = ./macchiato.conf; + "hypr/display.conf".text = lib.mkDefault ''''; + "hypr/autostart.conf".text = lib.mkDefault ''''; + }; } diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf index 69b8d348..12400710 100644 --- a/home/hyprland/hyprland.conf +++ b/home/hyprland/hyprland.conf @@ -71,7 +71,7 @@ animations { bind = SUPER, Return, exec, wezterm 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, W, exec, pgrep firefox > /dev/null || firefox bind = SUPER, E, exec, thunar bind = SUPER, R, exec, pgrep nxplayer > /dev/null || nxplayer bind = SUPER, Q, killactive, @@ -146,8 +146,7 @@ bindm = SUPER, mouse:273, resizewindow # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more windowrule = workspace 2,(neovide) -windowrule = workspace 3,(chromium-browser) -windowrule = workspace 3,(firefox) +windowrule = workspace 3,(firefox|chromium-browser) windowrule = workspace 4,^(libreoffice).* windowrule = workspace 4,(Zotero) windowrule = workspace 5 silent,(Signal) @@ -177,4 +176,4 @@ windowrule = center,(Nxplayer.bin) windowrulev2 = float,title:^(Zoom|zoom).* windowrulev2 = workspace 5,title:^(Zoom|zoom).* -windowrulev2 = float,title:(File),class:(chromium) +windowrulev2 = float,title:(File),class:(firefox|chromium-browser) diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix index c7993267..819c1107 100644 --- a/home/hyprland/waybar/modules/wlr_workspaces.nix +++ b/home/hyprland/waybar/modules/wlr_workspaces.nix @@ -6,7 +6,7 @@ format-icons = { "1" = "󰟀"; "2" = "󰅴"; - "3" = "󰊯"; + "3" = "󰈹"; "4" = "󰝰"; "5" = "󰭹"; "6" = "";