From da81594cdd16a3bdb9d40771819b534b2ab5090e Mon Sep 17 00:00:00 2001 From: kolkman Date: Mon, 2 Jun 2025 18:44:10 +0200 Subject: [PATCH] Working VSCODE --- modules/darwin/casks.nix | 1 + modules/darwin/home-manager.nix | 2 +- modules/shared/packages.nix | 75 ++++++++++++++++++--------------- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix index e120cfe..d00cccc 100644 --- a/modules/darwin/casks.nix +++ b/modules/darwin/casks.nix @@ -6,6 +6,7 @@ _: "iterm2" "oracle-jdk" "arduino-ide" + "visual-studio-code" # Creatative tools "spotify" diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index c43bb86..0c60cce 100644 --- a/modules/darwin/home-manager.nix +++ b/modules/darwin/home-manager.nix @@ -111,7 +111,7 @@ in path = "/Applications/Jellyfin Media Player.app/"; options = "-l Jellyfin"; } - { path = "/run/current-system/Applications/Visual Studio Code.app/"; } + { path = "/Applications/Visual Studio Code.app/"; } { path = "/Applications/Home Assistant.app/"; } { path = "/Applications/reMarkable.app/"; } { path = "/Applications/LibreOffice.app/"; } diff --git a/modules/shared/packages.nix b/modules/shared/packages.nix index 15c30a4..bf0824e 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -82,42 +82,47 @@ with pkgs; # Rust Related rustc cargo + platformio-core - # vscode see https://nixos.wiki/wiki/Visual_Studio_Code - - (vscode-with-extensions.override { - vscodeExtensions = - with vscode-extensions; - [ - #bbenoist.nix - jnoortheen.nix-ide - ms-python.python - ms-azuretools.vscode-docker - # ms-vscode-remote.remote-ssh - # ms-vscode.cpptools - eamodio.gitlens - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - # { - # name = "remote-ssh-edit"; - # publisher = "ms-vscode-remote"; - # version = "0.47.2"; - # sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; - # } - { - name = "cpptools"; - publisher = "ms-vscode"; - version = "1.26.1"; - sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0="; - } - { - name = "platformio-ide"; - publisher = "platformio"; - version = "3.3.4"; - sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk="; - } - ]; - }) + # (vscode-with-extensions.override { + # vscodeExtensions = + # with vscode-extensions; + # [ + # #bbenoist.nix + # jnoortheen.nix-ide + # ms-python.python + # ms-azuretools.vscode-docker + # # ms-vscode-remote.remote-ssh + # eamodio.gitlens + # james-yu.latex-workshop + # ] + # ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + # # { + # # name = "remote-ssh-edit"; + # # publisher = "ms-vscode-remote"; + # # version = "0.47.2"; + # # sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g"; + # # } + # { + # name = "cpptools"; + # publisher = "ms-vscode"; + # version = "1.26.1"; + # sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0="; + # } + # { + # name = "minifyall"; + # publisher = "josee9988"; + # version = "2.10.0"; + # sha256 = "sha256-cH5x8fUN0n+hO1b3lNzau2MnyeYmsD0ZXAYGxCQjT0Y="; + # } + # { + # name = "platformio-ide"; + # publisher = "platformio"; + # version = "3.3.4"; + # sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk="; + # } + # ]; + # }) # Tex and LaTex pandoc