From c1756aff12fb6108fbcf930ebaa69e0129a03e1d Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 2 Nov 2023 08:04:44 +0100 Subject: [PATCH 1/2] Vscode: add the nix-ide extension from nix-vscode-extensions --- flake.lock | 74 ++++++++++++++++++++++++++++++- flake.nix | 5 +++ roles/desktop/programs/vscode.nix | 3 +- 3 files changed, 80 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index b24d853..9da0bdf 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,40 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -284,7 +318,45 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "plasma-manager": "plasma-manager" + "plasma-manager": "plasma-manager", + "vscode-extensions": "vscode-extensions" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vscode-extensions": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1698802076, + "narHash": "sha256-9JjcuX4Vf9Gvj6Gr3bu91Q/Twr3NeTMdU8T6+sDGaSQ=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "bc5ea072fb52bacc3a48bc6e716c373b44d76088", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 3547e7a..4f6fb0a 100755 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,11 @@ inputs = { url = "github:catppuccin/vscode"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, plasma-manager, catppuccin-vsc, ... } @inputs: { diff --git a/roles/desktop/programs/vscode.nix b/roles/desktop/programs/vscode.nix index 082b528..38f1b31 100644 --- a/roles/desktop/programs/vscode.nix +++ b/roles/desktop/programs/vscode.nix @@ -5,7 +5,8 @@ let inputs = flakeSelf.inputs; in home-manager.users.toast.programs.vscode = { enable = true; package = pkgs.vscodium; - extensions = [ + extensions = with inputs.vscode-extensions.extensions.x86_64-linux.open-vsx; [ + jnoortheen.nix-ide pkgs.catppuccin-vsc ]; userSettings = { From 7108758182f2f28d02a1c9ce1d8bfe210ce840f6 Mon Sep 17 00:00:00 2001 From: Toast Date: Thu, 2 Nov 2023 08:05:11 +0100 Subject: [PATCH 2/2] School: add xml extension to vscode --- roles/school/programs/default.nix | 1 + roles/school/programs/vscode.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 roles/school/programs/vscode.nix diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix index 2c5fd21..24dba3a 100644 --- a/roles/school/programs/default.nix +++ b/roles/school/programs/default.nix @@ -4,6 +4,7 @@ imports = [ ./virtualbox.nix ./idea.nix + ./vscode.nix ]; environment.systemPackages = with pkgs; [ diff --git a/roles/school/programs/vscode.nix b/roles/school/programs/vscode.nix new file mode 100644 index 0000000..2f2c7ba --- /dev/null +++ b/roles/school/programs/vscode.nix @@ -0,0 +1,12 @@ +{ config, pkgs, lib, flakeSelf, ... }: +let inputs = flakeSelf.inputs; in +{ + home-manager.users.toast.programs.vscode = { + # The redhat xml extension needs an fhs environment + package = lib.mkForce pkgs.vscodium-fhs; + extensions = [ inputs.vscode-extensions.extensions.x86_64-linux.open-vsx.redhat.vscode-xml ]; + userSettings = { + redhat.telemetry.enabled = false; + }; + }; +}