From e8e3f0efe662c93a21408a72e31c5bf7ea9ec15f Mon Sep 17 00:00:00 2001 From: willifan <willifan@pm.me> Date: Sun, 23 Mar 2025 20:46:47 +0100 Subject: [PATCH] adapt vscode breaking naming change --- .../default/home-manager/desktop/vscodium.nix | 106 +++++++++--------- modules/default/home-manager/stylix.nix | 1 + 2 files changed, 55 insertions(+), 52 deletions(-) diff --git a/modules/default/home-manager/desktop/vscodium.nix b/modules/default/home-manager/desktop/vscodium.nix index 50e4175..c113d3e 100644 --- a/modules/default/home-manager/desktop/vscodium.nix +++ b/modules/default/home-manager/desktop/vscodium.nix @@ -6,59 +6,61 @@ enable = true; package = pkgs.vscodium; - userSettings = { - "[nix]"."editor.tabSize" = 2; - "explorer.confirmDragAndDrop" = false; - "cmake.showOptionsMovedNotification" = false; - "extensions.autoUpdate" = false; - "rust-analyzer.check.command" = "clippy"; - "editor.formatOnSave" = true; + profiles.default = { + userSettings = { + "[nix]"."editor.tabSize" = 2; + "explorer.confirmDragAndDrop" = false; + "cmake.showOptionsMovedNotification" = false; + "extensions.autoUpdate" = false; + "rust-analyzer.check.command" = "clippy"; + "editor.formatOnSave" = true; + }; + extensions = with pkgs.vscode-extensions; [ + # System + arrterian.nix-env-selector + bbenoist.nix + #fireblast.hyprlang-vscode + #eww-yuck.yuck + + #Rust + rust-lang.rust-analyzer + serayuzgur.crates + bungcip.better-toml + #vadimcn.vscode-lldb + usernamehw.errorlens + + #C/C++ + ms-vscode.cpptools + twxs.cmake + ms-vscode.cmake-tools + + #Shell + timonwong.shellcheck + mads-hartmann.bash-ide-vscode + + #Git + #phil294.git-log--graph + ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "hyprlang-vscode"; + publisher = "fireblast"; + version = "0.0.1"; + sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4="; + } + { + name = "yuck"; + publisher = "eww-yuck"; + version = "0.0.3"; + sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; + } + { + name = "git-log--graph"; + publisher = "phil294"; + version = "0.1.15"; + sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0="; + } + ]; }; - extensions = with pkgs.vscode-extensions; [ - # System - arrterian.nix-env-selector - bbenoist.nix - #fireblast.hyprlang-vscode - #eww-yuck.yuck - - #Rust - rust-lang.rust-analyzer - serayuzgur.crates - bungcip.better-toml - #vadimcn.vscode-lldb - usernamehw.errorlens - - #C/C++ - ms-vscode.cpptools - twxs.cmake - ms-vscode.cmake-tools - - #Shell - timonwong.shellcheck - mads-hartmann.bash-ide-vscode - - #Git - #phil294.git-log--graph - ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "hyprlang-vscode"; - publisher = "fireblast"; - version = "0.0.1"; - sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4="; - } - { - name = "yuck"; - publisher = "eww-yuck"; - version = "0.0.3"; - sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM="; - } - { - name = "git-log--graph"; - publisher = "phil294"; - version = "0.1.15"; - sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0="; - } - ]; }; }; } diff --git a/modules/default/home-manager/stylix.nix b/modules/default/home-manager/stylix.nix index 6547895..755c4fc 100644 --- a/modules/default/home-manager/stylix.nix +++ b/modules/default/home-manager/stylix.nix @@ -65,6 +65,7 @@ in targets = { hyprland.hyprpaper.enable = false; starship.enable = false; + vscode.profileNames = [ "default" ]; }; };