fix: stuff

modules/home-manager/programs/nixvim/presets/languages/angular.nix

@@ -21,8 +21,8 @@ in
               "--ngProbeLocations"
               ""
             ];
-            on_new_config = {
-              __raw = ''
+            on_new_config.__raw = # lua
+              ''
                 function(new_config, new_root_dir)
                   new_config.cmd = {
                     new_root_dir .. "/node_modules/@angular/language-server/bin/ngserver",
@@ -34,7 +34,6 @@ in
                   }
                 end
               '';
-            };
             filetypes = [
               "typescript"
               "html"
@@ -43,15 +42,14 @@ in
               "angular"
               "html.angular"
             ];
-            on_attach = {
-              __raw = ''
+            on_attach.__raw = # lua
+              ''
                 function(client, bufnr)
                   if vim.bo[bufnr].filetype == "html" then
                     vim.bo[bufnr].filetype = "angular"
                   end
                 end
               '';
-            };
           };
         }
       ];

modules/home-manager/programs/nixvim/presets/languages/js.nix

@@ -15,21 +15,24 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    extraConfigLua = lib.mkIf cfg.npm ''
-      require("cmp-npm").setup({})
-    '';
+    extraConfigLua =
+      lib.mkIf cfg.npm # lua
+        ''
+          require("cmp-npm").setup({})
+        '';
     plugins = {
       lspkind = lib.mkIf cfg.npm {
-        cmp.after = ''
-          function(entry, vim_item, kind)
-            if entry.source.name == "npm" then
-              kind.kind = ""
-              kind.kind_hl_group = "CmpItemKindNpm"
+        cmp.after = # lua
+          ''
+            function(entry, vim_item, kind)
+              if entry.source.name == "npm" then
+                kind.kind = ""
+                kind.kind_hl_group = "CmpItemKindNpm"
+              end
+              kind.kind = kind.kind .. " "
+              return kind
             end
-            kind.kind = kind.kind .. " "
-            return kind
-          end
-        '';
+          '';
       };
       cmp.settings.sources = lib.mkIf cfg.npm [
         {

modules/home-manager/programs/nixvim/presets/languages/nix.nix

@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
     plugins = {
       conform-nvim.formattersByFt.nix = [ "nixfmt" ];
-      lsp.servers.nil_ls.enable = true;
+      lsp.servers.nil-ls.enable = true;
       nix.enable = true;
     };
     extraPackages = [ pkgs.nixfmt-rfc-style ];