From eb0ea0f0c13e79d423db5b6488373085ccd44b88 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Fri, 30 Aug 2024 12:19:20 -0400 Subject: [PATCH] Fixed VSCode(ish) And Adding SetupKeyFile from Sops For Netbird --- flake.nix | 3 --- hosts/kim/netbird.nix | 1 + modules/common/programming/vscode.nix | 7 +++++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 076634e..037892d 100644 --- a/flake.nix +++ b/flake.nix @@ -26,9 +26,6 @@ catppuccin-vsc = { url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; }; - # nix-vscode-extensions = { - # url = "github:nix-community/nix-vscode-extensions"; - # }; # solaar = { # url = "github:Svenum/Solaar-Flake/latest"; diff --git a/hosts/kim/netbird.nix b/hosts/kim/netbird.nix index 28c6408..28944f9 100644 --- a/hosts/kim/netbird.nix +++ b/hosts/kim/netbird.nix @@ -6,6 +6,7 @@ opts = { management_url = "https://netbird.moosenet.work:443"; admin_url = "https://netbird.moosenet.work"; + setup_key_file = config.sops.secrets."netbird/setup_keys/end_user".path; }; }; } diff --git a/modules/common/programming/vscode.nix b/modules/common/programming/vscode.nix index 4123e87..279c62b 100644 --- a/modules/common/programming/vscode.nix +++ b/modules/common/programming/vscode.nix @@ -11,8 +11,14 @@ config = lib.mkIf (config.gui.enable && config.vscode.enable) { home-manager.users.${config.user} = { nixpkgs.config.allowUnfree = true; + programs.vscode = { enable = true; + + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; + mutableExtensionsDir = false; + extensions = with pkgs.vscode-extensions; [ catppuccin.catppuccin-vsc ms-azuretools.vscode-docker @@ -22,6 +28,7 @@ firefox-devtools.vscode-firefox-debug davidanson.vscode-markdownlint bbenoist.nix + brettm12345.nixfmt-vscode golang.go mkhl.direnv ms-vscode-remote.remote-ssh