languages/angular: init

Author: snoweuph

docs/manual/release-notes/rl-0.9.md

@@ -45,6 +45,8 @@
 
 [Snoweuph](https://github.com/snoweuph)
 
+- Moved all angular related stuff into its own language module.
+
 - Remove `mind.nvim`. This plugin doesn't exist anymore. The original author
   deleted all their GitHub repositories and moved to
   [sourcehut](https://sr.ht/~hadronized/). Some repositories where migrated.

modules/extra/deprecations.nix

@@ -47,6 +47,13 @@
   mkRemovedFormatPackage = lang: (mkRemovedOptionModule ["vim" "languages" lang "format" "package"] ''
     `vim.languages.${lang}.format.package` is removed, please use `vim.formatter.conform-nvim.formatters.<formatter_name>.command` instead.
   '');
+
+  mkRemovedEnumListOption = optionPath: removedValue: msg: {lib, ...}: {
+    # ''
+    #   The value `${removedValue}` was removed from `${lib.concatStringsSep "." optionPath}`.
+    #   ${msg}
+    # '';
+  };
 in {
   imports = concatLists [
     [
@@ -439,5 +446,15 @@ in {
         Use `vim.formatter.conform-nvim.setupOpts.formatters_by_ft.<ft> = ["<formatter>", ...]` to register extra formatters per filetype.
       '')
     ]
+
+    # 2026-07-03
+    [
+      (mkRemovedEnumListOption ["vim" "languages" "html" "lsp" "servers"] "angular-language-server" ''
+        Use `languages.angular.lsp.servers` instead.
+      '')
+      (mkRemovedEnumListOption ["vim" "languages" "typescript" "lsp" "servers"] "angular-language-server" ''
+        Use `languages.angular.lsp.servers` instead.
+      '')
+    ]
   ];
 }

modules/plugins/languages/angular.nix

@@ -0,0 +1,92 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib.options) literalExpression mkEnableOption mkOption;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.types) enum listOf;
+  inherit (lib) genAttrs elem;
+  inherit (lib.nvim.types) mkGrammarOption;
+
+  cfg = config.vim.languages.angular;
+
+  defaultServers = ["angular-language-server"];
+  servers = ["angular-language-server" "emmet-ls"];
+
+  defaultFormat = ["prettier"];
+  formats = ["prettier" "deno"];
+in {
+  options.vim.languages.angular = {
+    enable = mkEnableOption "Angular language support";
+    treesitter = {
+      enable =
+        mkEnableOption "Angular treesitter support"
+        // {
+          default = config.vim.languages.enableTreesitter;
+          defaultText = literalExpression "config.vim.languages.enableTreesitter";
+        };
+      package = mkGrammarOption pkgs "angular";
+    };
+
+    lsp = {
+      enable =
+        mkEnableOption "Angular LSP support"
+        // {
+          default = config.vim.lsp.enable;
+          defaultText = literalExpression "config.vim.lsp.enable";
+        };
+      servers = mkOption {
+        type = listOf (enum servers);
+        default = defaultServers;
+        description = "Angular LSP server to use";
+      };
+    };
+
+    format = {
+      enable =
+        mkEnableOption "Angular formatting"
+        // {
+          default = config.vim.languages.enableFormat;
+          defaultText = literalExpression "config.vim.languages.enableFormat";
+        };
+
+      type = mkOption {
+        type = listOf (enum formats);
+        default = defaultFormat;
+        description = "Angular formatter to use";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+      };
+    })
+
+    (mkIf cfg.lsp.enable {
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = ["htmlangular"];
+        });
+      };
+    })
+
+    (mkIf (cfg.lsp.enable && elem "angular-language-server" cfg.lsp.servers) {
+      vim.lsp.servers.angular-language-serve.filetypes = ["typescript"];
+    })
+
+    (mkIf (cfg.format.enable && !cfg.lsp.enable) {
+      vim.formatter.conform-nvim = {
+        enable = true;
+        presets = genAttrs cfg.format.type (_: {enable = true;});
+        setupOpts.formatters_by_ft.htmlangular = cfg.format.type;
+      };
+    })
+  ]);
+}

modules/plugins/languages/default.nix

@@ -3,6 +3,7 @@
   inherit (lib.nvim.languages) mkEnable;
 in {
   imports = [
+    ./angular.nix
     ./arduino.nix
     ./asm.nix
     ./astro.nix

modules/plugins/languages/html.nix

@@ -15,7 +15,7 @@
   cfg = config.vim.languages.html;
 
   defaultServers = ["superhtml"];
-  servers = ["superhtml" "emmet-ls" "angular-language-server" "stimulus-language-server"];
+  servers = ["superhtml" "emmet-ls" "stimulus-language-server"];
 
   defaultFormat = ["superhtml"];
   formats = ["superhtml" "biome" "prettier" "deno"];

modules/plugins/languages/typescript.nix

@@ -15,7 +15,7 @@
   cfg = config.vim.languages.typescript;
 
   defaultServers = ["typescript-language-server"];
-  servers = ["typescript-language-server" "deno" "typescript-go" "angular-language-server" "emmet-ls"];
+  servers = ["typescript-language-server" "deno" "typescript-go" "emmet-ls"];
 
   defaultFormat = ["prettier"];
   formats = ["prettier" "biome" "biome-check" "biome-organize-imports" "deno" "astyle"];

modules/plugins/lsp/presets/angular-language-server.nix

@@ -21,6 +21,7 @@ in {
       enable = true;
       cmd = ["${pkgs.angular-language-server}/bin/ngserver" "--stdio"];
       root_markers = ["angular.json" "nx.json"];
+      workspace_required = true;
     };
   };
 }