configurations/home-manager/leyla/packages/vscode/default.nix

@@ -33,30 +33,23 @@ in {
               "editor.tabSize" = 2;
               "editor.insertSpaces" = false;
             }
+            (lib.mkIf nix-development-enabled {
+              "nix.enableLanguageServer" = true;
+              "nix.serverPath" = "nil";
+              "[nix]" = {
+                "editor.defaultFormatter" = "kamadorueda.alejandra";
+                "editor.formatOnPaste" = true;
+                "editor.formatOnSave" = true;
+                "editor.formatOnType" = true;
+              };
+              "alejandra.program" = "alejandra";
+            })
           ];
 
+          # TODO: move the rest of the extensions into enable options like this
           extraExtensions = {
-            # vs code feel
             oneDark.enable = true;
             atomKeybindings.enable = true;
-
-            # html development
-            autoRenameTag.enable = true;
-            liveServer.enable = true;
-
-            # js development
-            es7ReactJsSnippets.enable = true;
-            tauriVscode.enable = true;
-            vscodeEslint.enable = true;
-            vscodeJest.enable = true;
-            vscodeStandard.enable = true;
-            vscodeStylelint.enable = true;
-
-            # nix development
-            alejandra.enable = nix-development-enabled;
-            nixIde.enable = nix-development-enabled;
-
-            # ai tooling
             aiCode = {
               enable = ai-tooling-enabled;
               ollamaHost = "http://defiant:11434";
@@ -67,13 +60,26 @@ in {
             extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
           in (
             (
-              with extension-pkgs.open-vsx; [
+              with extension-pkgs.open-vsx; (
+                [
                   # vs code feel extensions
                   streetsidesoftware.code-spell-checker
                   streetsidesoftware.code-spell-checker-german
                   streetsidesoftware.code-spell-checker-italian
                   jeanp413.open-remote-ssh
 
+                  # html extensions
+                  formulahendry.auto-rename-tag
+                  ms-vscode.live-server
+
+                  # js extensions
+                  dsznajder.es7-react-js-snippets
+                  dbaeumer.vscode-eslint
+                  standard.vscode-standard
+                  orta.vscode-jest
+                  stylelint.vscode-stylelint
+                  tauri-apps.tauri-vscode
+
                   # go extensions
                   golang.go
 
@@ -84,6 +90,13 @@ in {
                   # misc extensions
                   tamasfe.even-better-toml
                 ]
+                ++ (lib.lists.optionals nix-development-enabled [
+                  # nix extensions
+                  pinage404.nix-extension-pack
+                  jnoortheen.nix-ide
+                  kamadorueda.alejandra
+                ])
+              )
             )
             ++ (
               with extension-pkgs.vscode-marketplace; (

modules/home-manager-modules/programs/vscode/alejandra.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.alejandra = {
-          enable = lib.mkEnableOption "Enable Alejandra extension for Nix formatting";
-          extension = lib.mkPackageOption pkgsRepository "alejandra" {
-            default = ["kamadorueda" "alejandra"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.alejandra.enable {
-        extensions = [config.extraExtensions.alejandra.extension];
-        userSettings = {
-          "[nix]" = {
-            "editor.defaultFormatter" = "kamadorueda.alejandra";
-            "editor.formatOnPaste" = true;
-            "editor.formatOnSave" = true;
-            "editor.formatOnType" = true;
-          };
-          "alejandra.program" = "alejandra";
-        };
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/autoRenameTag.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.autoRenameTag = {
-          enable = lib.mkEnableOption "should the auto-rename-tag extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "auto-rename-tag" {
-            default = ["formulahendry" "auto-rename-tag"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.autoRenameTag.enable {
-        extensions = [
-          config.extraExtensions.autoRenameTag.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/default.nix

@@ -3,15 +3,5 @@
     ./oneDark.nix
     ./atomKeybindings.nix
     ./aiCode.nix
-    ./alejandra.nix
-    ./nixIde.nix
-    ./autoRenameTag.nix
-    ./es7ReactJsSnippets.nix
-    ./liveServer.nix
-    ./tauriVscode.nix
-    ./vscodeEslint.nix
-    ./vscodeJest.nix
-    ./vscodeStandard.nix
-    ./vscodeStylelint.nix
   ];
 }

modules/home-manager-modules/programs/vscode/es7ReactJsSnippets.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.es7ReactJsSnippets = {
-          enable = lib.mkEnableOption "should the es7-react-js-snippets extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "es7-react-js-snippets" {
-            default = ["dsznajder" "es7-react-js-snippets"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.es7ReactJsSnippets.enable {
-        extensions = [
-          config.extraExtensions.es7ReactJsSnippets.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/liveServer.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.liveServer = {
-          enable = lib.mkEnableOption "should the live-server extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "live-server" {
-            default = ["ms-vscode" "live-server"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.liveServer.enable {
-        extensions = [
-          config.extraExtensions.liveServer.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/nixIde.nix

@@ -1,29 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.nixIde = {
-          enable = lib.mkEnableOption "Enable Nix IDE extension";
-          extension = lib.mkPackageOption pkgsRepository "nix-ide" {
-            default = ["jnoortheen" "nix-ide"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.nixIde.enable {
-        extensions = [config.extraExtensions.nixIde.extension];
-        userSettings = {
-          "nix.enableLanguageServer" = true;
-          "nix.serverPath" = "nil";
-        };
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/tauriVscode.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.tauriVscode = {
-          enable = lib.mkEnableOption "should the tauri-vscode extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "tauri-vscode" {
-            default = ["tauri-apps" "tauri-vscode"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.tauriVscode.enable {
-        extensions = [
-          config.extraExtensions.tauriVscode.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/vscodeEslint.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeEslint = {
-          enable = lib.mkEnableOption "should the vscode-eslint extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-eslint" {
-            default = ["dbaeumer" "vscode-eslint"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeEslint.enable {
-        extensions = [
-          config.extraExtensions.vscodeEslint.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/vscodeJest.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeJest = {
-          enable = lib.mkEnableOption "should the vscode-jest extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-jest" {
-            default = ["orta" "vscode-jest"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeJest.enable {
-        extensions = [
-          config.extraExtensions.vscodeJest.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/vscodeStandard.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeStandard = {
-          enable = lib.mkEnableOption "should the vscode-standard extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-standard" {
-            default = ["standard" "vscode-standard"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeStandard.enable {
-        extensions = [
-          config.extraExtensions.vscodeStandard.extension
-        ];
-      };
-    }));
-  };
-}

modules/home-manager-modules/programs/vscode/vscodeStylelint.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: let
-  pkgsRepositories = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
-  pkgsRepository = pkgsRepositories.open-vsx;
-in {
-  options.programs.vscode.profiles = lib.mkOption {
-    type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
-      options = {
-        extraExtensions.vscodeStylelint = {
-          enable = lib.mkEnableOption "should the vscode-stylelint extension for vscode be enabled";
-          extension = lib.mkPackageOption pkgsRepository "vscode-stylelint" {
-            default = ["stylelint" "vscode-stylelint"];
-          };
-        };
-      };
-      config = lib.mkIf config.extraExtensions.vscodeStylelint.enable {
-        extensions = [
-          config.extraExtensions.vscodeStylelint.extension
-        ];
-      };
-    }));
-  };
-}