From 697a62bc89682b8bd528aa054015d10326dd9b52 Mon Sep 17 00:00:00 2001 From: Olaf Kolkman Date: Tue, 3 Jun 2025 07:26:20 +0200 Subject: [PATCH] Platform IO still doesn't run --- flake.nix | 1 + modules/darwin/casks.nix | 2 +- modules/darwin/home-manager.nix | 2 +- modules/shared/packages.nix | 80 +++++++++++++++++---------------- 4 files changed, 44 insertions(+), 41 deletions(-) diff --git a/flake.nix b/flake.nix index 5e29fac..d79adb2 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,7 @@ nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; }; + }; outputs = { diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix index d00cccc..45ce08a 100644 --- a/modules/darwin/casks.nix +++ b/modules/darwin/casks.nix @@ -6,7 +6,7 @@ _: "iterm2" "oracle-jdk" "arduino-ide" - "visual-studio-code" + # "visual-studio-code" # Creatative tools "spotify" diff --git a/modules/darwin/home-manager.nix b/modules/darwin/home-manager.nix index 0c60cce..c43bb86 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 = "/Applications/Visual Studio Code.app/"; } + { path = "/run/current-system/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 bf0824e..fd5b4d2 100644 --- a/modules/shared/packages.nix +++ b/modules/shared/packages.nix @@ -84,45 +84,47 @@ with pkgs; cargo platformio-core - # (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="; - # } - # ]; - # }) + (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 + ms-vscode.cmake-tools + shd101wyy.markdown-preview-enhanced + ] + ++ 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