fix some setting after upgrade

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";

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;
+  pkgs-ext = import self-nixpkgs {
-  ext-nixpkgs = pkgs.vscode-extensions;
+    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,56 +45,62 @@ in
     programs.vscode = {
       enable = true;
       package = pkgs.vscode;
+      profiles.default = {
         enableExtensionUpdateCheck = false;
         enableUpdateCheck = false;
-      extensions = [
+        extensions =
-          ext-vscode.aaron-bond.better-comments
+          let
-          # ext-vscode.alefragnani.bookmarks
+            ext-market = pkgs-ext.vscode-marketplace;
-          # ext-vscode.alefragnani.project-manager
+            ext-nixpkgs = pkgs-ext.vscode-extensions;
-          # ext-vscode.alexisvt.flutter-snippets
+          in
-          ext-vscode.christian-kohler.path-intellisense
+          [
-          ext-vscode.codezombiech.gitignore
+            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-vscode.dart-code.dart-code
+            # ext-market.dart-code.dart-code
-          # ext-vscode.dart-code.flutter
+            # ext-market.dart-code.flutter
-          ext-vscode.eamodio.gitlens
+            ext-market.eamodio.gitlens
-          ext-vscode.enkia.tokyo-night
+            ext-market.enkia.tokyo-night
-          # ext-vscode.felixangelov.bloc
+            # ext-market.felixangelov.bloc
-          ext-vscode.fill-labs.dependi
+            ext-market.fill-labs.dependi
-          ext-vscode.github.vscode-github-actions
+            ext-market.github.vscode-github-actions
-          ext-vscode.github.vscode-pull-request-github
+            ext-market.github.vscode-pull-request-github
-          ext-vscode.gruntfuggly.todo-tree
+            ext-market.gruntfuggly.todo-tree
-          ext-vscode.irongeek.vscode-env
+            ext-market.irongeek.vscode-env
-          ext-vscode.jebbs.plantuml
+            ext-market.jebbs.plantuml
-          ext-vscode.jnoortheen.nix-ide
+            ext-market.jnoortheen.nix-ide
-          # ext-vscode.lucax88x.codeacejumper
+            # ext-market.lucax88x.codeacejumper
-          # ext-vscode.marcelovelasquez.flutter-tree
+            # ext-market.marcelovelasquez.flutter-tree
-          ext-vscode.mhutchie.git-graph
+            ext-market.mhutchie.git-graph
-          ext-vscode.mkhl.direnv
+            ext-market.mkhl.direnv
-          ext-vscode.ms-azuretools.vscode-docker
+            ext-market.ms-azuretools.vscode-docker
             ext-nixpkgs.ms-python.python
-          ext-vscode.ms-python.isort
+            ext-market.ms-python.isort
-          ext-vscode.ms-python.vscode-pylance
+            ext-market.ms-python.vscode-pylance
             ext-nixpkgs.ms-vscode.cpptools
-          ext-vscode.ms-vscode.hexeditor
+            ext-market.ms-vscode.hexeditor
             ext-nixpkgs.ms-vscode-remote.remote-containers
-          ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later
+            ext-nixpkgs.ms-vscode-remote.remote-ssh # FIX later
-          ext-vscode.pkief.material-icon-theme
+            ext-market.pkief.material-icon-theme
-          ext-vscode.streetsidesoftware.code-spell-checker
+            ext-market.streetsidesoftware.code-spell-checker
-          ext-vscode.streetsidesoftware.code-spell-checker-russian
+            ext-market.streetsidesoftware.code-spell-checker-russian
-          ext-vscode.ultram4rine.vscode-choosealicense
+            ext-market.ultram4rine.vscode-choosealicense
-          ext-vscode.usernamehw.errorlens
+            ext-market.usernamehw.errorlens
-          ext-vscode.yzhang.markdown-all-in-one
+            ext-market.yzhang.markdown-all-in-one
             # Rust
-          ext-vscode.jscearcy.rust-doc-viewer
+            ext-market.jscearcy.rust-doc-viewer
-          ext-vscode.polypus74.trusty-rusty-snippets
+            ext-market.polypus74.trusty-rusty-snippets
             ext-nixpkgs.rust-lang.rust-analyzer
-          ext-vscode.tamasfe.even-better-toml
+            ext-market.tamasfe.even-better-toml
-          ext-vscode.vadimcn.vscode-lldb
+            ext-market.vadimcn.vscode-lldb
             # Golang
-          ext-vscode.golang.go
+            ext-market.golang.go
             # Zig
-          ext-vscode.ziglang.vscode-zig
+            ext-market.ziglang.vscode-zig
           ];
         # mutableExtensionsDir = false;
         userSettings = {
@@ -139,7 +155,7 @@ in
           "nix.serverSettings" = {
             "nil" = {
               "formatting" = {
-              "command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
+                "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
               };
               # "nix" = {
               #   "maxMemoryMB" = 4096;
@@ -150,7 +166,7 @@ in
             };
             "nixd" = {
               "formatting" = {
-              "command" = ["${pkgs.nixfmt-rfc-style}/bin/nixfmt"];
+                "command" = [ "${pkgs.nixfmt-rfc-style}/bin/nixfmt" ];
               };
               # "options" = {
               #   "nixos" = {
@@ -209,4 +225,5 @@ in
         };
       };
     };
+  };
 }

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 [ ];
         });

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}
     '';

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} = {

profiles/workspace/catppuccin/vscode.nix

@@ -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}";
-      };
-    };
-  };
-}

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)$
+          windowrule=workspace name:Email silent,class:^(geary)$
-          windowrulev2=workspace name:Steam silent,class:^(steam)$
+          windowrule=workspace name:Steam silent,class:^(steam)$
-          windowrulev2=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
+          windowrule=workspace name:Steam silent,class:^(.gamescope-wrapped)$,title:(Steam)
-          windowrulev2=workspace name:Music silent,title:^(Spotify)$
+          windowrule=workspace name:Music silent,title:^(Spotify)$
-          windowrulev2=tile,title:^(Spotify)$
+          windowrule=tile,title:^(Spotify)$
-          windowrulev2=workspace name:Messengers silent,class:^(org.telegram.desktop)$
+          windowrule=workspace name:Messengers silent,class:^(org.telegram.desktop)$
-          windowrule=opaque,firefox
+          windowrule=opaque,class:^(firefox)$
-          windowrule=opaque,chromium-browser
+          windowrule=opaque,class:^(Chromium-browser)$
-          windowrule=opaque,mpv
+          windowrule=opaque,class:^(mpv)$
 
-          windowrule=float,Waydroid
+          windowrule=float,class:^(Waydroid)$
-          windowrule=size 1600 900,Waydroid
+          windowrule=size 1600 900,class:^(Waydroid)$
-          windowrule=center,Waydroid
+          windowrule=center,class:^(Waydroid)$
-          windowrule=opaque,Waydroid
+          windowrule=opaque,class:^(Waydroid)$
-          windowrule=opaque,qemu
+          windowrule=opaque,class:.*(qemu).*
 
-          windowrule=opaque,steam_app.*
+          windowrule=opaque,class:^(steam)$
-          windowrule=float,steam_app.*
+          windowrule=float,class:^(steam)$
 
-          windowrule=opaque,virt-manager
+          windowrule=opaque,class:^(gamescope)$
-          windowrulev2=opaque,class:^(.*winbox64.exe)$
+          windowrule=float,class:^(gamescope)$
-          windowrulev2=tile,class:^(.*winbox64.exe)$
-          windowrulev2=opaque,class:^(starrail.exe)$
 
-          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