From 64c6cefe447a879f29a554f1818c9ea373916ff5 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Sat, 5 Apr 2025 20:31:16 +0300
Subject: [PATCH] fix some setting after upgrade

---
 flake.nix                                    |   1 -
 profiles/applications/vscode/default.nix     | 363 ++++++++++---------
 profiles/overlay.nix                         |   9 -
 profiles/workspace/catppuccin/catppuccin.nix |  32 ++
 profiles/workspace/catppuccin/default.nix    |   1 -
 profiles/workspace/catppuccin/vscode.nix     |  38 --
 profiles/workspace/wayland/hyprland.nix      |  45 +--
 7 files changed, 246 insertions(+), 243 deletions(-)
 delete mode 100644 profiles/workspace/catppuccin/vscode.nix

diff --git a/flake.nix b/flake.nix
index 52431bd..de6e1d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     catppuccin.url = "github:catppuccin/nix";
-    catppuccin-vsc.url = "github:catppuccin/vscode";
     deploy-rs.url = "github:serokell/deploy-rs";
     disko = {
       url = "github:nix-community/disko";
diff --git a/profiles/applications/vscode/default.nix b/profiles/applications/vscode/default.nix
index 7ea8d84..4fcff80 100644
--- a/profiles/applications/vscode/default.nix
+++ b/profiles/applications/vscode/default.nix
@@ -1,4 +1,11 @@
-{ pkgs, lib, config, inputs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  inputs,
+  self-nixpkgs,
+  ...
+}:
 let
   EDITOR = pkgs.writeShellScript "code-editor" ''
     source "/etc/profiles/per-user/${config.mainuser}/etc/profile.d/hm-session-vars.sh"
@@ -10,10 +17,13 @@ let
     "$@"
   '';
 
-  ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace;
-  ext-nixpkgs = pkgs.vscode-extensions;
+  pkgs-ext = import self-nixpkgs {
+    inherit (pkgs) system;
+    config.allowUnfree = true;
+    overlays = [ inputs.nix-vscode-marketplace.overlays.default ];
+  };
 
-  continue-ver = lib.getVersion ext-nixpkgs.continue.continue;
+  continue-ver = lib.getVersion pkgs-ext.vscode-extensions.continue.continue;
 in
 {
   environment.sessionVariables = {
@@ -35,177 +45,184 @@ in
     programs.vscode = {
       enable = true;
       package = pkgs.vscode;
-      enableExtensionUpdateCheck = false;
-      enableUpdateCheck = false;
-      extensions = [
-          ext-vscode.aaron-bond.better-comments
-          # ext-vscode.alefragnani.bookmarks
-          # ext-vscode.alefragnani.project-manager
-          # ext-vscode.alexisvt.flutter-snippets
-          ext-vscode.christian-kohler.path-intellisense
-          ext-vscode.codezombiech.gitignore
-          ext-nixpkgs.continue.continue
-          # ext-vscode.dart-code.dart-code
-          # ext-vscode.dart-code.flutter
-          ext-vscode.eamodio.gitlens
-          ext-vscode.enkia.tokyo-night
-          # ext-vscode.felixangelov.bloc
-          ext-vscode.fill-labs.dependi
-          ext-vscode.github.vscode-github-actions
-          ext-vscode.github.vscode-pull-request-github
-          ext-vscode.gruntfuggly.todo-tree
-          ext-vscode.irongeek.vscode-env
-          ext-vscode.jebbs.plantuml
-          ext-vscode.jnoortheen.nix-ide
-          # ext-vscode.lucax88x.codeacejumper
-          # ext-vscode.marcelovelasquez.flutter-tree
-          ext-vscode.mhutchie.git-graph
-          ext-vscode.mkhl.direnv
-          ext-vscode.ms-azuretools.vscode-docker
-          ext-nixpkgs.ms-python.python
-          ext-vscode.ms-python.isort
-          ext-vscode.ms-python.vscode-pylance
-          ext-nixpkgs.ms-vscode.cpptools
-          ext-vscode.ms-vscode.hexeditor
-          ext-nixpkgs.ms-vscode-remote.remote-containers
-          ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later
-          ext-vscode.pkief.material-icon-theme
-          ext-vscode.streetsidesoftware.code-spell-checker
-          ext-vscode.streetsidesoftware.code-spell-checker-russian
-          ext-vscode.ultram4rine.vscode-choosealicense
-          ext-vscode.usernamehw.errorlens
-          ext-vscode.yzhang.markdown-all-in-one
-          # Rust
-          ext-vscode.jscearcy.rust-doc-viewer
-          ext-vscode.polypus74.trusty-rusty-snippets
-          ext-nixpkgs.rust-lang.rust-analyzer
-          ext-vscode.tamasfe.even-better-toml
-          ext-vscode.vadimcn.vscode-lldb
-          # Golang
-          ext-vscode.golang.go
-          # Zig
-          ext-vscode.ziglang.vscode-zig
-        ];
-      # mutableExtensionsDir = false;
-      userSettings = {
-        "continue.telemetryEnabled" = false;
-        "dart.checkForSdkUpdates" = false;
-        "dart.debugSdkLibraries" = true;
-        "dart.flutterCreateOrganization" = "com.ataraxiadev";
-        "dart.flutterCreatePlatforms" = [ "linux,web,windows" ];
-        "dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter";
-        "dart.openDevTools" = "flutter";
-        "dart.runPubGetOnNestedProjects" = "below";
-        "dart.showTodos" = true;
-        "editor.fontFamily" = "'VictorMono Nerd Font Medium'";
-        "editor.fontLigatures" = true;
-        "editor.fontSize" = 16;
-        "editor.guides.bracketPairs" = "active";
-        "editor.quickSuggestions" = {
-          "other" = true;
-          "comments" = false;
-          "strings" = true;
-        };
-        "files.autoSave" = "afterDelay";
-        "files.exclude" = {
-          "**/.classpath" = true;
-          "**/.project" = true;
-          "**/.settings" = true;
-          "**/.factorypath" = true;
-          "**/.direnv" = true;
-        };
-        "files.trimTrailingWhitespace" = true;
-        "files.watcherExclude" = {
-          "**/.direnv" = true;
-        };
-        "git-graph.repository.sign.commits" = true;
-        "git-graph.repository.sign.tags" = true;
-        "git.autofetch" = false;
-        "git.enableCommitSigning" = true;
-        "go.useLanguageServer" = true;
-        "gopls" = {
-          "ui.semanticTokens" = true;
-          "formatting.gofumpt" = true;
-          "ui.diagnostic.staticcheck" = true;
-        };
-        "license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>";
-        "license.default" = "mit";
-        "license.extension" = ".md";
-        "license.year" = "auto";
-        "nix.enableLanguageServer" = true;
-        "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
-        "nix.serverPath" = "${pkgs.nil}/bin/nil";
-        # "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
-        "nix.serverSettings" = {
-          "nil" = {
-            "formatting" = {
-              "command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
-            };
-            # "nix" = {
-            #   "maxMemoryMB" = 4096;
-            #   "flake" = {
-            #     "autoEvalInputs" = true;
-            #   };
-            # };
-          };
-          "nixd" = {
-            "formatting" = {
-              "command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
-            };
-            # "options" = {
-            #   "nixos" = {
-            #     "expr" = "";
-            #   };
-            #   "home-manager" = {
-            #     "expr" = "";
-            #   };
-            # };
-          };
-        };
-        "rust-analyzer.check.command" = "clippy";
-        "search.exclude" = {
-          "**/.direnv" = true;
-        };
-        "security.workspace.trust.untrustedFiles" = "open";
-        "telemetry.telemetryLevel" = "off";
-        "terminal.integrated.defaultProfile.linux" = "zsh";
-        "terminal.integrated.fontFamily" = "FiraCode Nerd Font";
-        "terminal.integrated.fontWeight" = "500";
-        "terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh";
-        "terminal.integrated.scrollback" = 100000;
-        "todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!";
-        "update.mode" = "none";
-        "window.menuBarVisibility" = "toggle";
-        "window.titleBarStyle" = "custom";
-        "workbench.colorTheme" = "Tokyo Night";
-        "workbench.iconTheme" = "material-icon-theme";
-        "zig.path" = "zig";
-        "zig.zls.path" = "zls";
-        "zig.initialSetupDone" = true;
-        "[dart]" = {
-          "editor.formatOnSave" = true;
-          "editor.formatOnType" = true;
-          "editor.rulers" = [
-              80
+      profiles.default = {
+        enableExtensionUpdateCheck = false;
+        enableUpdateCheck = false;
+        extensions =
+          let
+            ext-market = pkgs-ext.vscode-marketplace;
+            ext-nixpkgs = pkgs-ext.vscode-extensions;
+          in
+          [
+            ext-market.aaron-bond.better-comments
+            # ext-market.alefragnani.bookmarks
+            # ext-market.alefragnani.project-manager
+            # ext-market.alexisvt.flutter-snippets
+            ext-market.christian-kohler.path-intellisense
+            ext-market.codezombiech.gitignore
+            ext-nixpkgs.continue.continue
+            # ext-market.dart-code.dart-code
+            # ext-market.dart-code.flutter
+            ext-market.eamodio.gitlens
+            ext-market.enkia.tokyo-night
+            # ext-market.felixangelov.bloc
+            ext-market.fill-labs.dependi
+            ext-market.github.vscode-github-actions
+            ext-market.github.vscode-pull-request-github
+            ext-market.gruntfuggly.todo-tree
+            ext-market.irongeek.vscode-env
+            ext-market.jebbs.plantuml
+            ext-market.jnoortheen.nix-ide
+            # ext-market.lucax88x.codeacejumper
+            # ext-market.marcelovelasquez.flutter-tree
+            ext-market.mhutchie.git-graph
+            ext-market.mkhl.direnv
+            ext-market.ms-azuretools.vscode-docker
+            ext-nixpkgs.ms-python.python
+            ext-market.ms-python.isort
+            ext-market.ms-python.vscode-pylance
+            ext-nixpkgs.ms-vscode.cpptools
+            ext-market.ms-vscode.hexeditor
+            ext-nixpkgs.ms-vscode-remote.remote-containers
+            ext-nixpkgs.ms-vscode-remote.remote-ssh # FIX later
+            ext-market.pkief.material-icon-theme
+            ext-market.streetsidesoftware.code-spell-checker
+            ext-market.streetsidesoftware.code-spell-checker-russian
+            ext-market.ultram4rine.vscode-choosealicense
+            ext-market.usernamehw.errorlens
+            ext-market.yzhang.markdown-all-in-one
+            # Rust
+            ext-market.jscearcy.rust-doc-viewer
+            ext-market.polypus74.trusty-rusty-snippets
+            ext-nixpkgs.rust-lang.rust-analyzer
+            ext-market.tamasfe.even-better-toml
+            ext-market.vadimcn.vscode-lldb
+            # Golang
+            ext-market.golang.go
+            # Zig
+            ext-market.ziglang.vscode-zig
+          ];
+        # mutableExtensionsDir = false;
+        userSettings = {
+          "continue.telemetryEnabled" = false;
+          "dart.checkForSdkUpdates" = false;
+          "dart.debugSdkLibraries" = true;
+          "dart.flutterCreateOrganization" = "com.ataraxiadev";
+          "dart.flutterCreatePlatforms" = [ "linux,web,windows" ];
+          "dart.flutterScreenshotPath" = "/home/${config.mainuser}/Pictures/flutter";
+          "dart.openDevTools" = "flutter";
+          "dart.runPubGetOnNestedProjects" = "below";
+          "dart.showTodos" = true;
+          "editor.fontFamily" = "'VictorMono Nerd Font Medium'";
+          "editor.fontLigatures" = true;
+          "editor.fontSize" = 16;
+          "editor.guides.bracketPairs" = "active";
+          "editor.quickSuggestions" = {
+            "other" = true;
+            "comments" = false;
+            "strings" = true;
+          };
+          "files.autoSave" = "afterDelay";
+          "files.exclude" = {
+            "**/.classpath" = true;
+            "**/.project" = true;
+            "**/.settings" = true;
+            "**/.factorypath" = true;
+            "**/.direnv" = true;
+          };
+          "files.trimTrailingWhitespace" = true;
+          "files.watcherExclude" = {
+            "**/.direnv" = true;
+          };
+          "git-graph.repository.sign.commits" = true;
+          "git-graph.repository.sign.tags" = true;
+          "git.autofetch" = false;
+          "git.enableCommitSigning" = true;
+          "go.useLanguageServer" = true;
+          "gopls" = {
+            "ui.semanticTokens" = true;
+            "formatting.gofumpt" = true;
+            "ui.diagnostic.staticcheck" = true;
+          };
+          "license.author" = "Dmitriy <ataraxiadev@ataraxiadev.com>";
+          "license.default" = "mit";
+          "license.extension" = ".md";
+          "license.year" = "auto";
+          "nix.enableLanguageServer" = true;
+          "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
+          "nix.serverPath" = "${pkgs.nil}/bin/nil";
+          # "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
+          "nix.serverSettings" = {
+            "nil" = {
+              "formatting" = {
+                "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
+              };
+              # "nix" = {
+              #   "maxMemoryMB" = 4096;
+              #   "flake" = {
+              #     "autoEvalInputs" = true;
+              #   };
+              # };
+            };
+            "nixd" = {
+              "formatting" = {
+                "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
+              };
+              # "options" = {
+              #   "nixos" = {
+              #     "expr" = "";
+              #   };
+              #   "home-manager" = {
+              #     "expr" = "";
+              #   };
+              # };
+            };
+          };
+          "rust-analyzer.check.command" = "clippy";
+          "search.exclude" = {
+            "**/.direnv" = true;
+          };
+          "security.workspace.trust.untrustedFiles" = "open";
+          "telemetry.telemetryLevel" = "off";
+          "terminal.integrated.defaultProfile.linux" = "zsh";
+          "terminal.integrated.fontFamily" = "FiraCode Nerd Font";
+          "terminal.integrated.fontWeight" = "500";
+          "terminal.integrated.profiles.linux".zsh.path = "/run/current-system/sw/bin/zsh";
+          "terminal.integrated.scrollback" = 100000;
+          "todo-tree.regex.regex" = "(//|#|<!--|;|/\\*|^|^[ \\t]*(-|\\d+.))\\s*($TAGS)|todo!";
+          "update.mode" = "none";
+          "window.menuBarVisibility" = "toggle";
+          "window.titleBarStyle" = "custom";
+          "workbench.colorTheme" = "Tokyo Night";
+          "workbench.iconTheme" = "material-icon-theme";
+          "zig.path" = "zig";
+          "zig.zls.path" = "zls";
+          "zig.initialSetupDone" = true;
+          "[dart]" = {
+            "editor.formatOnSave" = true;
+            "editor.formatOnType" = true;
+            "editor.rulers" = [
+              80
+            ];
+            "editor.selectionHighlight" = false;
+            "editor.suggest.snippetsPreventQuickSuggestions" = false;
+            "editor.suggestSelection" = "first";
+            "editor.tabCompletion" = "onlySnippets";
+            "editor.wordBasedSuggestions" = "off";
+          };
+          "[nix]" = {
+            "editor.tabSize" = 2;
+            "editor.detectIndentation" = true;
+          };
+          "[rust]" = {
+            "editor.defaultFormatter" = "rust-lang.rust-analyzer";
+            "editor.formatOnSave" = true;
+          };
+          "python.analysis.extraPaths" = [
+            "/home/${config.mainuser}/.vscode/extensions/continue.continue"
+            "/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
           ];
-          "editor.selectionHighlight" = false;
-          "editor.suggest.snippetsPreventQuickSuggestions" = false;
-          "editor.suggestSelection" = "first";
-          "editor.tabCompletion" = "onlySnippets";
-          "editor.wordBasedSuggestions" = "off";
         };
-        "[nix]" = {
-          "editor.tabSize" = 2;
-          "editor.detectIndentation" = true;
-        };
-        "[rust]" = {
-          "editor.defaultFormatter" = "rust-lang.rust-analyzer";
-          "editor.formatOnSave" = true;
-        };
-        "python.analysis.extraPaths" = [
-          "/home/${config.mainuser}/.vscode/extensions/continue.continue"
-          "/home/${config.mainuser}/.vscode/extensions/continue.continue-${continue-ver}-linux-x64"
-        ];
       };
     };
   };
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
index 84091d4..753787c 100644
--- a/profiles/overlay.nix
+++ b/profiles/overlay.nix
@@ -56,15 +56,6 @@ with lib; {
           '';
         });
 
-        hyprland = prev.hyprland.overrideAttrs (oa: {
-          patches = (oa.patches or []) ++ [
-            ../patches/hyprland-tablet.patch
-          ];
-        });
-        maa-assistant-arknights = prev.maa-assistant-arknights.overrideAttrs (_: {
-          env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
-        });
-
         neatvnc = prev.neatvnc.overrideAttrs (oa: {
           patches = [ ../patches/neatvnc.patch ] ++ oa.patches or [ ];
         });
diff --git a/profiles/workspace/catppuccin/catppuccin.nix b/profiles/workspace/catppuccin/catppuccin.nix
index 507a6cb..166a529 100644
--- a/profiles/workspace/catppuccin/catppuccin.nix
+++ b/profiles/workspace/catppuccin/catppuccin.nix
@@ -31,6 +31,38 @@
     catppuccin.zsh-syntax-highlighting.enable = true;
     programs.zsh.syntaxHighlighting.enable = true;
 
+    catppuccin.vscode = {
+      enable = true;
+      flavor = cfg.flavor;
+      settings = {
+        accent = cfg.accent;
+        boldKeywords = false;
+        italicComments = false;
+        italicKeywords = false;
+        extraBordersEnabled = false;
+        workbenchMode = "flat";
+        bracketMode = "dimmed";
+        colorOverrides = {
+          ${cfg.flavor} = {
+            base = "#1c1c2d";
+            mantle = "#191925";
+            crust = "#151511";
+          };
+        };
+        customUIColors = {
+          "statusBar.foreground" = "accent";
+        };
+      };
+    };
+    programs.vscode.profiles.default.userSettings = {
+      "gopls.ui.semanticTokens" = lib.mkForce true;
+      "editor.semanticHighlighting.enabled" = lib.mkForce true;
+      "terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
+      "window.titleBarStyle" = lib.mkForce "custom";
+      "workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
+      "workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
+    };
+
     wayland.windowManager.hyprland.extraConfig = ''
       exec=hyprctl setcursor catppuccin-${cfg.flavor}-${cfg.accent}-cursors ${toString cfg.thm.cursorSize}
     '';
diff --git a/profiles/workspace/catppuccin/default.nix b/profiles/workspace/catppuccin/default.nix
index 48a47c2..80130dd 100644
--- a/profiles/workspace/catppuccin/default.nix
+++ b/profiles/workspace/catppuccin/default.nix
@@ -25,7 +25,6 @@
     (import ./gitea.nix { inherit cfg; gitea = "gitea"; })
     # Deprecated on catppuccin-nix
     (import ./gtk.nix { inherit cfg; })
-    (import ./vscode.nix { inherit cfg; })
   ];
 
   home-manager.users.${config.mainuser} = {
diff --git a/profiles/workspace/catppuccin/vscode.nix b/profiles/workspace/catppuccin/vscode.nix
deleted file mode 100644
index 64176fe..0000000
--- a/profiles/workspace/catppuccin/vscode.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ cfg }: { config, lib, pkgs, inputs, ... }: {
-  home-manager.users.${config.mainuser} = {
-    programs.vscode = {
-      extensions = let
-        ext-vscode = inputs.nix-vscode-marketplace.extensions.${pkgs.system}.vscode-marketplace;
-      in [
-        ext-vscode.alexdauenhauer.catppuccin-noctis
-        ext-vscode.catppuccin.catppuccin-vsc-icons
-        (inputs.catppuccin-vsc.packages.${pkgs.system}.catppuccin-vsc.override {
-          accent = cfg.accent;
-          boldKeywords = false;
-          italicComments = false;
-          italicKeywords = false;
-          extraBordersEnabled = false;
-          workbenchMode = "flat";
-          bracketMode = "dimmed";
-          colorOverrides = {
-            mocha = {
-              base = "#1c1c2d";
-              mantle = "#191925";
-              crust = "#151511";
-            };
-          };
-          customUIColors = {
-            "statusBar.foreground" = "accent";
-          };
-        })
-      ];
-      userSettings = {
-        "editor.semanticHighlighting.enabled" = lib.mkForce true;
-        "terminal.integrated.minimumContrastRatio" = lib.mkForce 1;
-        "window.titleBarStyle" = lib.mkForce "custom";
-        "workbench.colorTheme" = lib.mkForce "Catppuccin ${cfg.flavorUpper}";
-        "workbench.iconTheme" = lib.mkForce "catppuccin-${cfg.flavor}";
-      };
-    };
-  };
-}
\ No newline at end of file
diff --git a/profiles/workspace/wayland/hyprland.nix b/profiles/workspace/wayland/hyprland.nix
index 51dec1d..e130697 100644
--- a/profiles/workspace/wayland/hyprland.nix
+++ b/profiles/workspace/wayland/hyprland.nix
@@ -251,31 +251,34 @@ in {
           bind=${modifier}ALT,g,movetoworkspace,name:Games
           bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers
         '' ''
-          windowrulev2=workspace name:Email silent,class:^(geary)$
-          windowrulev2=workspace name:Steam silent,class:^(steam)$
-          windowrulev2=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
-          windowrulev2=workspace name:Music silent,title:^(Spotify)$
-          windowrulev2=tile,title:^(Spotify)$
-          windowrulev2=workspace name:Messengers silent,class:^(org.telegram.desktop)$
-          windowrule=opaque,firefox
-          windowrule=opaque,chromium-browser
-          windowrule=opaque,mpv
+          windowrule=workspace name:Email silent,class:^(geary)$
+          windowrule=workspace name:Steam silent,class:^(steam)$
+          windowrule=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
+          windowrule=workspace name:Music silent,title:^(Spotify)$
+          windowrule=tile,title:^(Spotify)$
+          windowrule=workspace name:Messengers silent,class:^(org.telegram.desktop)$
+          windowrule=opaque,class:^(firefox)$
+          windowrule=opaque,class:^(Chromium-browser)$
+          windowrule=opaque,class:^(mpv)$
 
-          windowrule=float,Waydroid
-          windowrule=size 1600 900,Waydroid
-          windowrule=center,Waydroid
-          windowrule=opaque,Waydroid
-          windowrule=opaque,qemu
+          windowrule=float,class:^(Waydroid)$
+          windowrule=size 1600 900,class:^(Waydroid)$
+          windowrule=center,class:^(Waydroid)$
+          windowrule=opaque,class:^(Waydroid)$
+          windowrule=opaque,class:.*(qemu).*
 
-          windowrule=opaque,steam_app.*
-          windowrule=float,steam_app.*
+          windowrule=opaque,class:^(steam)$
+          windowrule=float,class:^(steam)$
 
-          windowrule=opaque,virt-manager
-          windowrulev2=opaque,class:^(.*winbox64.exe)$
-          windowrulev2=tile,class:^(.*winbox64.exe)$
-          windowrulev2=opaque,class:^(starrail.exe)$
+          windowrule=opaque,class:^(gamescope)$
+          windowrule=float,class:^(gamescope)$
 
-          windowrule=opaque,.*jellyfin.*
+          windowrule=opaque,class:.*(virt-manager).*
+          windowrule=opaque,class:^(.*winbox64.exe)$
+          windowrule=tile,class:^(.*winbox64.exe)$
+          windowrule=opaque,class:^(starrail.exe)$
+
+          windowrule=opaque,class:.*(jellyfin).*
         '' ''
           env=GDK_BACKEND=wayland,x11
           env=QT_QPA_PLATFORM=wayland;xcb