Refactor vscode language handling

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/user/console/docker/default.nix

@@ -29,12 +29,13 @@ lib.mkMerge [
       };
     };
 
-    home-manager.users.${user}.home = {
+    home-manager.users.${user} = {
+      home = {
         packages = with pkgs; [ docker-compose ];
-
+        sessionVariables.DOCKER_CONFIG = "${home}/.config/docker";
-      sessionVariables = {
-        DOCKER_CONFIG = "${home}/.config/docker";
       };
+
+      programs.vscode.languages.docker.enable = true;
     };
   }
   (lib.mkIf rootless {

hosts/common/configs/user/console/sops/default.nix

@@ -13,5 +13,7 @@
       config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source;
     home.sessionVariables.SOPS_AGE_KEY_FILE =
       config.environment.persistence."/persist"."${home}/.config/sops-nix/key.txt".source;
+
+    programs.vscode.languages.sops.enable = true;
   };
 }

hosts/common/configs/user/gui/vscode/default.nix

@@ -31,6 +31,8 @@ in
   };
 
   home-manager.users.${user} = {
+    imports = [ ./options.nix ];
+
     programs.vscode = {
       enable = true;
 
@@ -39,11 +41,8 @@ in
       extensions = with pkgs.vscode-extensions; [
         mkhl.direnv
         mhutchie.git-graph
-        ms-azuretools.vscode-docker
         ms-vsliveshare.vsliveshare
         naumovs.color-highlight
-        signageos.signageos-vscode-sops
-        humao.rest-client
       ];
 
       userSettings = {
@@ -105,7 +104,6 @@ in
         "window.menuBarVisibility" = "toggle";
         "workbench.editor.historyBasedLanguageDetection" = true;
         "workbench.list.smoothScrolling" = true;
-        "rest-client.enableTelemetry" = false;
       };
     };
 
@@ -115,19 +113,6 @@ in
       password-store = "basic";
     };
 
-    imports = [
-      ./langs/c
-      ./langs/go
-      ./langs/java
-      ./langs/lua
-      ./langs/markdown
-      ./langs/nix
-      ./langs/python
-      ./langs/svelte
-      ./langs/typescript
-      ./langs/yaml
-    ];
-
     wayland.windowManager.hyprland.settings.bind = [ "$mod, c, exec, ${lib.meta.getExe pkgs.vscode}" ];
   };
 }

hosts/common/configs/user/gui/vscode/langs/c/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.c.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     ms-vscode.cpptools
     ms-vscode.cmake-tools

hosts/common/configs/user/gui/vscode/langs/docker/default.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.docker.enable {
+  programs.vscode.extensions = with pkgs.vscode-extensions; [
+    ms-azuretools.vscode-docker
+  ];
+}

hosts/common/configs/user/gui/vscode/langs/go/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.go.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     golang.go
   ];

hosts/common/configs/user/gui/vscode/langs/java/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.java.enable {
   programs.vscode = {
     extensions =
       with pkgs;

hosts/common/configs/user/gui/vscode/langs/jinja/default.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.jinja.enable {
+  programs.vscode.extensions = with pkgs.vscode-extensions; [
+    wholroyd.jinja
+  ];
+}

hosts/common/configs/user/gui/vscode/langs/lua/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.lua.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     sumneko.lua
   ];

hosts/common/configs/user/gui/vscode/langs/markdown/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.markdown.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     yzhang.markdown-all-in-one
   ];

hosts/common/configs/user/gui/vscode/langs/nix/default.nix

@@ -1,5 +1,10 @@
-{ lib, pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.nix.enable {
   programs.vscode = {
     userSettings = {
       "nix.enableLanguageServer" = true;

hosts/common/configs/user/gui/vscode/langs/python/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.python.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     ms-python.python
     ms-python.vscode-pylance

hosts/common/configs/user/gui/vscode/langs/rest/default.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.rest.enable {
+  programs.vscode = {
+    extensions = with pkgs.vscode-extensions; [
+      humao.rest-client
+    ];
+
+    userSettings = {
+      "rest-client.enableTelemetry" = false;
+    };
+  };
+}

hosts/common/configs/user/gui/vscode/langs/sas/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.sas.enable {
   programs.vscode = {
     extensions = with pkgs.vscode-extensions; [
       sas.sas-lsp

hosts/common/configs/user/gui/vscode/langs/sops/default.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.sops.enable {
+  programs.vscode.extensions = with pkgs.vscode-extensions; [
+    signageos.signageos-vscode-sops
+  ];
+}

hosts/common/configs/user/gui/vscode/langs/svelte/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.svelte.enable {
   programs.vscode = {
     userSettings = {
       "svelte.enable-ts-plugin" = true;

hosts/common/configs/user/gui/vscode/langs/typescript/default.nix

@@ -1,5 +1,10 @@
-{ ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.typescript.enable {
   programs.vscode.userSettings = {
     "typescript.updateImportsOnFileMove.enabled" = "always";
   };

hosts/common/configs/user/gui/vscode/langs/yaml/default.nix

@@ -1,5 +1,10 @@
-{ pkgs, ... }:
 {
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+lib.mkIf config.programs.vscode.languages.yaml.enable {
   programs.vscode.extensions = with pkgs.vscode-extensions; [
     redhat.vscode-yaml
   ];

hosts/common/configs/user/gui/vscode/options.nix

@@ -0,0 +1,73 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.programs.vscode;
+in
+{
+  options.programs.vscode = with lib; {
+    languages = {
+      c.enable = mkEnableOption "C";
+      docker.enable = mkEnableOption "Docker";
+      go.enable = mkEnableOption "Go";
+      java.enable = mkEnableOption "Java";
+      jinja.enable = mkEnableOption "Jinja";
+      lua.enable = mkEnableOption "Lua";
+      markdown.enable = mkEnableOption "Markdown";
+      nix.enable = mkEnableOption "Nix";
+      python.enable = mkEnableOption "Python";
+      rest.enable = mkEnableOption "REST";
+      sas.enable = mkEnableOption "SAS";
+      sops.enable = mkEnableOption "SOPS";
+      svelte.enable = mkEnableOption "Svelte";
+      typescript.enable = mkEnableOption "TypeScript";
+      yaml.enable = mkEnableOption "YAML";
+    };
+
+    copilot.enable = mkEnableOption "GitHub Copilot";
+  };
+
+  imports = [
+    ./langs/c
+    ./langs/docker
+    ./langs/go
+    ./langs/java
+    ./langs/jinja
+    ./langs/lua
+    ./langs/markdown
+    ./langs/nix
+    ./langs/python
+    ./langs/rest
+    ./langs/sas
+    ./langs/sops
+    ./langs/svelte
+    ./langs/typescript
+    ./langs/yaml
+  ];
+
+  config = {
+    programs.vscode = {
+      extensions =
+        with pkgs.vscode-extensions;
+        [ ]
+        ++ lib.lists.optionals cfg.copilot.enable [
+          github.copilot
+          github.copilot-chat
+        ];
+
+      userSettings = lib.mkMerge [
+        (lib.mkIf cfg.copilot.enable {
+          "github.copilot.enable" = {
+            "*" = true;
+            "plaintext" = true;
+            "markdown" = true;
+          };
+          "chat.editing.alwaysSaveWithGeneratedChanges" = true;
+        })
+      ];
+    };
+  };
+}

hosts/eirene/users/nick/configs/gui/vscode/default.nix

@@ -0,0 +1,19 @@
+{
+  user ? throw "user argument is required",
+  home ? throw "home argument is required",
+}:
+{ ... }:
+{
+  home-manager.users.${user}.programs.vscode.languages = {
+    c.enable = true;
+    go.enable = true;
+    java.enable = true;
+    lua.enable = true;
+    markdown.enable = true;
+    nix.enable = true;
+    python.enable = true;
+    rest.enable = true;
+    typescript.enable = true;
+    yaml.enable = true;
+  };
+}

hosts/eirene/users/nick/default.nix

@@ -80,6 +80,7 @@ in
     (import ./configs/console/syncthing { inherit user home; })
 
     (import ./configs/gui/obsidian { inherit user home; })
+    (import ./configs/gui/vscode { inherit user home; })
   ];
 
   # echo "password" | mkpasswd -s

hosts/elara/users/nikara/configs/gui/vscode/default.nix

@@ -2,25 +2,24 @@
   user ? throw "user argument is required",
   home ? throw "home argument is required",
 }:
-{ pkgs, ... }:
+{ ... }:
 {
-  home-manager.users.${user} = {
+  home-manager.users.${user}.programs.vscode = {
-    programs.vscode = {
+    copilot.enable = true;
-      extensions = with pkgs.vscode-extensions; [
-        github.copilot
-        github.copilot-chat
-      ];
 
-      userSettings = {
+    languages = {
-        "github.copilot.enable" = {
+      c.enable = true;
-          "*" = true;
+      go.enable = true;
-          "plaintext" = true;
+      java.enable = true;
-          "markdown" = true;
+      jinja.enable = true;
+      lua.enable = true;
+      markdown.enable = true;
+      nix.enable = true;
+      python.enable = true;
+      rest.enable = true;
+      sas.enable = true;
+      typescript.enable = true;
+      yaml.enable = true;
     };
-        "chat.editing.alwaysSaveWithGeneratedChanges" = true;
-      };
-    };
-
-    imports = [ ./langs/sas ];
   };
 }