From 166a4d03695b725bd1c0dd2f119d8f4f85d0f6a4 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Tue, 2 Jan 2024 12:27:48 +0800
Subject: [PATCH] feat: neovim - disable mason

---
 .../editors/neovim/astronvim_user/init.lua    | 41 ++++++++++---------
 home/base/desktop/editors/packages.nix        |  1 +
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/home/base/desktop/editors/neovim/astronvim_user/init.lua b/home/base/desktop/editors/neovim/astronvim_user/init.lua
index e2552fe7..4ea063cf 100644
--- a/home/base/desktop/editors/neovim/astronvim_user/init.lua
+++ b/home/base/desktop/editors/neovim/astronvim_user/init.lua
@@ -283,22 +283,34 @@ return {
     -- LSP installations
     {
       "williamboman/mason-lspconfig.nvim",
-      -- overwrite ensure_installed to install lsp via home manager(except emmet_ls)
-      opts = function(_, opts)
-        opts.ensure_installed = {
-          "emmet_ls", -- not exist in nixpkgs, so install it via mason
-        }
-      end,
-    },
-    -- Formatters/Linter installation
-    {
-      "jay-babu/mason-null-ls.nvim",
+      -- mason is unusable on NixOS, disable it.
       -- ensure_installed nothing
       opts = function(_, opts)
         opts.ensure_installed = nil
         opts.automatic_installation = false
       end,
     },
+    -- Formatters/Linter installation
+    {
+      "jay-babu/mason-null-ls.nvim",
+      -- mason is unusable on NixOS, disable it.
+      -- ensure_installed nothing
+      opts = function(_, opts)
+        opts.ensure_installed = nil
+        opts.automatic_installation = false
+      end,
+    },
+    -- Debugger installation
+    {
+      "jay-babu/mason-nvim-dap.nvim",
+      -- mason is unusable on NixOS, disable it.
+      -- ensure_installed nothing
+      opts = function(_, opts)
+        opts.ensure_installed = nil
+        opts.automatic_installation = false
+      end,
+    },
+
     {
       "jose-elias-alvarez/null-ls.nvim",
       opts = function(_, opts)
@@ -348,15 +360,6 @@ return {
         end
       end,
     },
-    -- Debugger installation
-    {
-      "jay-babu/mason-nvim-dap.nvim",
-      -- overrides `require("mason-nvim-dap").setup(...)`
-      opts = function(_, opts)
-        opts.ensure_installed = nil
-        opts.automatic_installation = false
-      end,
-    },
 
     {
       "nvim-telescope/telescope.nvim",
diff --git a/home/base/desktop/editors/packages.nix b/home/base/desktop/editors/packages.nix
index 64801460..5bd5cd21 100644
--- a/home/base/desktop/editors/packages.nix
+++ b/home/base/desktop/editors/packages.nix
@@ -74,6 +74,7 @@
       # HTML/CSS/JSON/ESLint language servers extracted from vscode
       nodePackages.vscode-langservers-extracted
       nodePackages."@tailwindcss/language-server"
+      emmet-ls
 
       #-- CloudNative
       nodePackages.dockerfile-language-server-nodejs