From 31350ebf6ee856f8b904cc546dc30e214ced9d87 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Mon, 13 Jan 2025 10:22:48 -0300 Subject: [PATCH] fix(home/hyprland): update windowrules for 0.46.0 Regex matches now are for an entire line, so remove anchors and wildcards where nescessary. --- .../features/desktop/hyprland/default.nix | 16 ++++++++-------- .../features/desktop/hyprland/hyprbars.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home/gabriel/features/desktop/hyprland/default.nix b/home/gabriel/features/desktop/hyprland/default.nix index 3e45e3fe..6832f333 100644 --- a/home/gabriel/features/desktop/hyprland/default.nix +++ b/home/gabriel/features/desktop/hyprland/default.nix @@ -91,13 +91,13 @@ in { new_window_takes_over_fullscreen = 2; }; windowrulev2 = let - sweethome3d-tooltips = "title:^(win[0-9])$,class:^(com-eteks-sweethome3d-SweetHome3DBootstrap)$"; - xembedsniproxy = "class:^()$,title:^()$,xwayland:1,floating:1"; - steam = "title:^()$,class:^(steam)$"; - steamGame = "class:^(steam_app_[0-9]*)$"; - kdeconnect-pointer = "class:^(org.kdeconnect.daemon)$"; - wineTray ="class:^(explorer.exe)$"; - rsiLauncher ="class:^(rsi launcher.exe)$"; + sweethome3d-tooltips = "title:win[0-9],class:com-eteks-sweethome3d-SweetHome3DBootstrap"; + xembedsniproxy = "class:,title:,xwayland:1,floating:1"; + steam = "title:,class:steam"; + steamGame = "class:steam_app_[0-9]*"; + kdeconnect-pointer = "class:org.kdeconnect.daemon"; + wineTray ="class:explorer.exe"; + rsiLauncher ="class:rsi launcher.exe"; in [ "nofocus, ${sweethome3d-tooltips}" @@ -127,7 +127,7 @@ in { "tile, ${rsiLauncher}" ] ++ (lib.mapAttrsToList ( - name: colors: "bordercolor ${rgba colors.primary "aa"} ${rgba colors.primary_container "aa"}, title:^(\\[${name}\\])" + name: colors: "bordercolor ${rgba colors.primary "aa"} ${rgba colors.primary_container "aa"}, title:\\[${name}\\].*" ) remoteColorschemes); layerrule = [ diff --git a/home/gabriel/features/desktop/hyprland/hyprbars.nix b/home/gabriel/features/desktop/hyprland/hyprbars.nix index b669addf..bf16d383 100644 --- a/home/gabriel/features/desktop/hyprland/hyprbars.nix +++ b/home/gabriel/features/desktop/hyprland/hyprbars.nix @@ -62,11 +62,11 @@ in { "plugin:hyprbars:bar_color ${rgba config.colorscheme.colors.primary "ee"}, focus:1" "plugin:hyprbars:title_color ${rgb config.colorscheme.colors.on_primary}, focus:1" ] ++ (lib.flatten (lib.mapAttrsToList (name: colors: [ - "plugin:hyprbars:bar_color ${rgba colors.primary_container "dd"}, title:^(\\[${name}\\])" - "plugin:hyprbars:title_color ${rgb colors.on_primary_container}, title:^(\\[${name}\\])" + "plugin:hyprbars:bar_color ${rgba colors.primary_container "dd"}, title:\\[${name}\\].*" + "plugin:hyprbars:title_color ${rgb colors.on_primary_container}, title:\\[${name}\\].*" - "plugin:hyprbars:bar_color ${rgba colors.primary "ee"}, title:^(\\[${name}\\]), focus:1" - "plugin:hyprbars:title_color ${rgb colors.on_primary}, title:^(\\[${name}\\]), focus:1" + "plugin:hyprbars:bar_color ${rgba colors.primary "ee"}, title:\\[${name}\\].*, focus:1" + "plugin:hyprbars:title_color ${rgb colors.on_primary}, title:\\[${name}\\].*, focus:1" ]) remoteColorschemes)); }; };