From 62b34d5d404b055b0804321af3fa88f7354cc23c Mon Sep 17 00:00:00 2001
From: Olaf <github@dacht.net>
Date: Wed, 28 May 2025 08:31:56 +0200
Subject: [PATCH] Reversing VScode (no X84 Darwin package availabie?!?)
---
flake.nix | 6 ++----
modules/darwin/casks.nix | 1 +
modules/darwin/home-manager.nix | 2 +-
modules/shared/packages.nix | 33 ++-------------------------------
4 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/flake.nix b/flake.nix
index a1ad5df..5678bd0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,9 +37,7 @@
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
- nix-vscode-extensions= {
- url = "github:nix-community/nix-vscode-extensions";
- };
+
};
outputs =
{
@@ -54,7 +52,7 @@
disko,
nixd,
sops-nix,
- nix-vscode-extensions,
+
}@inputs:
let
user = "olaf";
diff --git a/modules/darwin/casks.nix b/modules/darwin/casks.nix
index 43d71bd..0af226c 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"
"blender"
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 a7a8efb..9772f99 100644
--- a/modules/shared/packages.nix
+++ b/modules/shared/packages.nix
@@ -33,7 +33,8 @@ with pkgs;
ninja
pkg-config
llvm
-
+ clang-tools
+ dfu-util
# Encryption and security tools
age
sops
@@ -82,36 +83,6 @@ with pkgs;
rustc
cargo
- # 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 = "platformio-ide";
- publisher = "platformio";
- version = "3.3.4";
- sha256 = "sha256-QF5jdHKOjlxPaPD5OnzgzaQIWmmENVtsmocedpfkrPw=";
- }
- ];
- })
-
# Tex and LaTex
pandoc
mdbook