chore(plugins): Remove all special inputs

Author: DashieTM

config/opts.nix

@@ -44,6 +44,21 @@
     filetypes = {};
   };
   autoCmd = [
+    {
+      desc = "Roslyn init";
+      event = ["FileType"];
+      group = "filetypes";
+      pattern = "cs";
+      callback = {
+        __raw = ''
+          function()
+            require("easy-dotnet").setup()
+            require("roslyn").setup({
+              exe = 'Microsoft.CodeAnalysis.LanguageServer',
+            })
+          end'';
+      };
+    }
     {
       desc = "Haskell mappings";
       event = ["FileType"];

config/plugins/dap.nix

@@ -1,15 +1,6 @@
 {pkgs, ...}: {
   extraPlugins = with pkgs.vimPlugins; [
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "debugmaster-nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "miroshQa";
-        repo = "debugmaster.nvim";
-        rev = "ddc0fe1ff2c30b67ff1e49ba3b60c9c54ada14d0";
-        hash = "sha256-I6FJEeuAcypFOiWKP326Cogut/llrXxKSQD8fhT5RqA=";
-      };
-      dependencies = [nvim-dap];
-    })
+    debugmaster-nvim
     nvim-dap-vscode-js
     nvim-dap-virtual-text
     nvim-dap-python

config/plugins/editor/general.nix

@@ -18,52 +18,10 @@ in {
   package = pkgs.neovim-unwrapped;
   extraPlugins = with pkgs.vimPlugins; [
     overseer-nvim
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "patterns.nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "OXY2DEV";
-        repo = "patterns.nvim";
-        rev = "0315318de9295fbf10b660a1f3cd1cc23e655744";
-        hash = "sha256-jx6HHDhoH+M8QTJFPbS5jo4QZa8nyND5qdT9h6mTT0g=";
-      };
-    })
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "multicursor.nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "jake-stewart";
-        repo = "multicursor.nvim";
-        rev = "86537c3771f1989592568c9d92da2e201297867a";
-        hash = "sha256-/UV+oHQ2Lr4zNiqgJM44o1RhkftrfSzf3U58loszEz8=";
-      };
-    })
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "endec.nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "ovk";
-        repo = "endec.nvim";
-        rev = "949ece728ecc0cacf3c6c81bbcda186fe3fef5cf";
-        hash = "sha256-Tai94rM9EnL0TRAdgiuT3Hx1NVMQJf53N7xwwRC+uKk=";
-      };
-    })
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "unified.nvim";
-      src = pkgs.fetchFromGitHub {
-        owner = "axkirillov";
-        repo = "unified.nvim";
-        rev = "0d8eebd3909b86ca30407d79b547a245185082c2";
-        hash = "sha256-26YKaI6OCDlc326Ks4y67SDOXcaK9z99unlSmAdsd+Q=";
-      };
-    })
-    # TODO enable when no longer broken
-    #(pkgs.vimUtils.buildVimPlugin {
-    #  name = "clasp.nvim";
-    #  src = pkgs.fetchFromGitHub {
-    #    owner = "xzbdmw";
-    #    repo = "clasp.nvim";
-    #    rev = "e4361348b76684154ec88c8e0fbf5aa8dbd3e048";
-    #    hash = "sha256-11atWGsDWAQF48rFozf26X3tU+sRNAWTz5b3QXpvsIM=";
-    #  };
-    #})
+    patterns-nvim
+    multicursor-nvim
+    endec-nvim
+    unified-nvim
   ];
   extraConfigLua =
     /*

config/plugins/editor/live-share.nix

@@ -1,14 +1,6 @@
 {pkgs, ...}: {
   extraPlugins = [
-    (pkgs.vimUtils.buildVimPlugin {
-      name = "live-share";
-      src = pkgs.fetchFromGitHub {
-        owner = "azratul";
-        repo = "live-share.nvim";
-        rev = "bf5e8e087c368aae0325a09d1ea43f2a08f5e9aa";
-        hash = "sha256-fUYFdeP+T+KwGpvm0eh5GcAS35ZU5f0N9A/JsqBgHGA=";
-      };
-    })
+    pkgs.vimPlugins.live-share-nvim
   ];
   extraConfigLua =
     # lua

config/plugins/editor/neotree.nix

@@ -10,7 +10,6 @@
         hideGitignored = false;
       };
       bindToCwd = false;
-      followCurrentFile.enabled = true;
     };
     window = {
       position = "right";

config/plugins/lsp/special_servers.nix

@@ -8,15 +8,7 @@
 in
   lib.mkIf config'.lsp.useDefaultSpecialLspServers {
     extraPlugins = with pkgs.vimPlugins; [
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "ng";
-        src = pkgs.fetchFromGitHub {
-          owner = "joeveiga";
-          repo = "ng.nvim";
-          rev = "38af07e77f066e2d6e3f74d966816662075ff4cd";
-          hash = "sha256-Dh7RUB7JfurQFtl0UGANs8Tc38IaEum+i0ghN9iCsQk=";
-        };
-      })
+      ng-nvim
       roslyn-nvim
       image-nvim
       haskell-tools-nvim
@@ -36,9 +28,32 @@ in
           };
         };
       };
+      # /*
+      # lua
+      # */
+      # ''
+      #   name = "@angular/language-service",
+      # ''
       typescript-tools = {
         lazyLoad.settings.ft = "typescript";
         enable = true;
+        settings.settings = {
+          tsserver_plugins =
+            if config'.lsp.special.useAngular
+            then [
+              /*
+              lua
+              */
+              {
+                __raw = ''
+                  name = "@angular/language-server",
+                  location = "${pkgs.angular-language-server}",
+                  enableForWorkspaceTypeScriptVersions = false,
+                '';
+              }
+            ]
+            else [];
+        };
         settings.on_attach =
           /*
           lua
@@ -47,7 +62,10 @@ in
             function(client, bufnr)
               local function is_angular_project(root_dir)
                 local util = require("lspconfig.util")
-                return util.path.exists(util.path.join(root_dir, "angular.json"))
+                local ang = util.path.exists(util.path.join(root_dir, "angular.json"));
+                local angTemp = util.path.exists(util.path.join(root_dir, "angular-template.json"));
+                local isAngular = ang or angTemp
+                return isAngular
               end
 
               local root_dir = client.config.root_dir
@@ -92,10 +110,6 @@ in
     };
     extraConfigLua = ''
       local inNeovide = vim.g.neovide or false
-      require("easy-dotnet").setup()
-      require("roslyn").setup({
-        exe = 'Microsoft.CodeAnalysis.LanguageServer',
-      })
       require("ng")
       require("litee.lib").setup()
       require("litee.gh").setup()

flake.lock

@@ -2,7 +2,6 @@
   description = "A nixvim configuration";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    dashpkgs.url = "github:DashieTM/nixpkgs/gh";
     nixvim.url = "github:nix-community/nixvim";
     flake-parts.url = "github:hercules-ci/flake-parts";
     base16.url = "github:SenchoPens/base16.nix";

flake.nix

@@ -179,17 +179,7 @@ in {
           eslint = {
             enable = true;
             filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact"];
-            onAttach.function =
-              /*
-              lua
-              */
-              ''
-                function(client, bufnr)
-                    client.server_capabilities.documentFormattingProvider = false
-                    client.server_capabilities.documentRangeFormattingProvider = false
-                    client.server_capabilities.documentOnTypeFormattingProvider = false
-                end
-              '';
+            settings.format = false;
           };
           bashls.enable = true;
           clangd.enable = true;