From b5d2e2593e923e8a048f71620054a3b59df7bc9d Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 23 Feb 2025 17:38:35 +0100 Subject: [PATCH] chore: axe vscode-extensions --- flake.lock | 27 +---------- flake.nix | 7 --- programs/vscode.nix | 108 -------------------------------------------- 3 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 programs/vscode.nix diff --git a/flake.lock b/flake.lock index d3bfc5c..92d82df 100644 --- a/flake.lock +++ b/flake.lock @@ -247,8 +247,7 @@ "nixpkgs": "nixpkgs", "systems": "systems", "treefmt-nix": "treefmt-nix", - "ukubot-rs": "ukubot-rs", - "vscode-extensions": "vscode-extensions" + "ukubot-rs": "ukubot-rs" } }, "rust-overlay": { @@ -329,30 +328,6 @@ "repo": "ukubot-rs", "type": "github" } - }, - "vscode-extensions": { - "inputs": { - "flake-compat": [], - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739929767, - "narHash": "sha256-4mcftoL28KCeBX+wyD37IdVGeY2MyXxigL8Jj2rzsus=", - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "rev": "fe953b35b591faf57660800fb6e8b74956eea846", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-vscode-extensions", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 4f98d99..ca1cc01 100644 --- a/flake.nix +++ b/flake.nix @@ -120,13 +120,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - vscode-extensions = { - url = "github:nix-community/nix-vscode-extensions"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-compat.follows = ""; - }; - # ==== uku3lig stuff ==== api-rs = { url = "github:uku3lig/api-rs"; diff --git a/programs/vscode.nix b/programs/vscode.nix deleted file mode 100644 index c2c43ce..0000000 --- a/programs/vscode.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ - pkgs, - vscode-extensions, - ... -}: -let - inherit (pkgs.stdenv.hostPlatform) system; - extensions = vscode-extensions.extensions.${system}; - - patched = with pkgs.vscode-extensions; [ - ms-python.python - ms-vscode.cpptools - ms-vscode-remote.remote-ssh - rust-lang.rust-analyzer - wakatime.vscode-wakatime - ]; -in -{ - hm.programs.vscode = { - enable = true; - enableUpdateCheck = false; - enableExtensionUpdateCheck = false; - mutableExtensionsDir = false; - - extensions = - with extensions.vscode-marketplace; - patched - ++ [ - # style - bierner.markdown-preview-github-styles - catppuccin.catppuccin-vsc - - # git - donjayamanne.githistory - eamodio.gitlens - - # misc - github.copilot - editorconfig.editorconfig - mkhl.direnv - tailscale.vscode-tailscale - usernamehw.errorlens - - # rust - dustypomerleau.rust-syntax - serayuzgur.crates - tamasfe.even-better-toml - ms-vsliveshare.vsliveshare - - # nix - jnoortheen.nix-ide - - # cpp - mesonbuild.mesonbuild - (ms-vscode.cmake-tools.overrideAttrs (_: { - sourceRoot = "extension"; - })) - (ms-vscode.makefile-tools.overrideAttrs (_: { - sourceRoot = "extension"; - })) - twxs.cmake - xaver.clang-format - - # python - donjayamanne.python-environment-manager - ms-python.vscode-pylance - - # java - redhat.java - - # web - astro-build.astro-vscode - vue.volar - esbenp.prettier-vscode - dbaeumer.vscode-eslint - ]; - - userSettings = { - "cmake.configureOnOpen" = true; - "editor.fontFamily" = "'Iosevka Nerd Font', monospace"; - "editor.fontSize" = 16; - "editor.formatOnSave" = true; - "editor.inlineSuggest.enabled" = true; - "files.autoSave" = "afterDelay"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = "nil"; - "rust-analyzer.check.command" = "clippy"; - "terminal.integrated.fontFamily" = "Iosevka Nerd Font"; - "workbench.colorTheme" = "Catppuccin Macchiato"; - "errorLens.messageBackgroundMode" = "message"; - "java.jdt.ls.java.home" = "${pkgs.jdk17}/lib/openjdk"; - - "editor.defaultFormatter" = "esbenp.prettier-vscode"; - "[javascript]"."editor.defaultFormatter" = "esbenp.prettier-vscode"; - "[astro]"."editor.defaultFormatter" = "astro-build.astro-vscode"; - "[rust]"."editor.defaultFormatter" = "rust-lang.rust-analyzer"; - - # fix for segfault on hyprland - "window.titleBarStyle" = "custom"; - - "remote.SSH.useLocalServer" = false; - "remote.SSH.remotePlatform" = { - "etna.fossa-macaroni.ts.net" = "linux"; - "contabo.fossa-macaroni.ts.net" = "linux"; - }; - }; - }; -}