(neovim) move coding related components to extra loaded configuration

config/common/nvim/init.lua

@@ -1,2 +1,8 @@
+if os.getenv("NVIM_MAIN_HOST") then
+  MainHost = true
+else
+  MainHost = false
+end
+
 require("config")
 require("core")

config/common/nvim/lsp/lua.lua

@@ -5,8 +5,9 @@ return {
     Lua = {
       diagnostics = {
         globals = {
-          "vim",
+          "MainHost",
           "Snacks",
+          "vim",
         },
       },
     },

config/common/nvim/lua/config/keymaps.lua

@@ -54,14 +54,6 @@ map("n", "<leader>bl", function()
 end, { desc = "buffer list", remap = true })
 map("n", "<leader>bn", "<cmd>enew<CR>", { desc = "buffer create", remap = true })
 
-map("n", "<leader>cd", vim.diagnostic.open_float, { desc = "Line Diagnostics" })
-map({ "n", "v" }, "<leader>cf", function()
-  require("conform").format({
-    lsp_fallback = true,
-    async = false,
-  })
-end, { desc = "format", remap = true })
-
 map("n", "<leader>e", function()
   Snacks.explorer()
 end, { desc = "explorer", remap = true })

config/common/nvim/lua/core/lazy.lua

@@ -16,7 +16,11 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
   spec = {
-    { import = "plugins" },
+    { import = "plugins.common" },
+    {
+      import = "plugins.extra",
+      cond = MainHost,
+    },
   },
   defaults = {
     lazy = true,

config/common/nvim/lua/plugins/common/lualine.lua

@@ -0,0 +1,64 @@
+local lualine_sections = {
+  lualine_a = { "mode" },
+  lualine_b = {
+    { "branch" },
+    {
+      "diff",
+      symbols = {
+        added = " ",
+        modified = " ",
+        removed = " ",
+      },
+    },
+  },
+  lualine_c = {
+    { "filename", file_status = true, path = 1 },
+  },
+  lualine_x = {},
+  lualine_y = {
+    { "searchcount" },
+    { "progress", padding = { left = 1, right = 0 }, separator = " " },
+    { "location", padding = { left = 0, right = 1 } },
+  },
+  lualine_z = {},
+}
+
+if MainHost then
+  table.insert(lualine_sections.lualine_x, {
+    "diagnostics",
+    symbols = {
+      error = " ",
+      warn = " ",
+      info = " ",
+      hint = " ",
+    },
+  })
+  table.insert(lualine_sections.lualine_x, {
+    "lsp_status",
+    symbols = {
+      spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" },
+      done = "✓",
+      separator = " ",
+    },
+  })
+end
+
+return {
+  "nvim-lualine/lualine.nvim",
+  event = "VeryLazy",
+  config = function()
+    require("lualine").setup({
+      options = {
+        theme = "powerline",
+        section_separators = "",
+        component_separators = "",
+        globalstatus = false,
+        disabled_filetypes = { statusline = { "snacks_dashboard" } },
+      },
+      sections = lualine_sections,
+      tabline = {
+        lualine_a = { "buffers" },
+      },
+    })
+  end,
+}

config/common/nvim/lua/plugins/common/monokai.lua

@@ -1,4 +1,5 @@
 return {
+  {
   "echasnovski/mini.pairs",
   event = "VeryLazy",
   config = function()
@@ -10,4 +11,21 @@ return {
       markdown = true,
     })
   end,
+
+  },
+  {
+  "loctvl842/monokai-pro.nvim",
+  priority = 10000,
+  lazy = false,
+  dependencies = {
+    "echasnovski/mini.icons",
+    "echasnovski/mini.pairs",
+  },
+  config = function()
+    require("monokai-pro").setup({
+      filter = "classic",
+    })
+    vim.cmd.colorscheme("monokai-pro")
+  end,
+  }
 }

config/common/nvim/lua/plugins/common/treesitter.lua

@@ -0,0 +1,37 @@
+local treesitter_modules = {
+  "bash",
+  "markdown_inline",
+  "markdown",
+}
+
+if MainHost then
+  vim.list_extend(treesitter_modules, {
+    "git_config",
+    "git_rebase",
+    "gitattributes",
+    "gitcommit",
+    "gitignore",
+    "gotmpl",
+    "hcl",
+    "helm",
+    "json",
+    "lua",
+    "python",
+    "regex",
+    "terraform",
+    "yaml",
+  })
+end
+
+return {
+  "nvim-treesitter/nvim-treesitter",
+  build = ":TSUpdate",
+  event = "VeryLazy",
+  config = function()
+    require("nvim-treesitter.configs").setup({
+      ensure_installed = treesitter_modules,
+      highlight = { enable = true },
+      indent = { enable = true },
+    })
+  end,
+}

config/common/nvim/lua/plugins/common/which-key.lua

@@ -0,0 +1,52 @@
+local whichkey_spec = {
+  mode = { "n", "v" },
+  { "<leader>b", group = "buffer" },
+  { "<leader>f", group = "find" },
+  { "<leader>h", group = "history" },
+  { "<leader>u", group = "ui" },
+}
+
+if MainHost then
+  vim.list_extend(whichkey_spec, {
+    { "<leader>c", group = "code" },
+    { "<leader>cd", vim.diagnostic.open_float, { desc = "diagnostics", remap = true } },
+    {
+      "<leader>cf",
+      function()
+        require("conform").format({
+          lsp_fallback = true,
+          async = false,
+        })
+      end,
+      { desc = "format", remap = true },
+    },
+  })
+end
+
+return {
+  "folke/which-key.nvim",
+  event = "VeryLazy",
+  config = function()
+    require("which-key").setup({
+      preset = "helix",
+      delay = 300,
+      icons = {
+        rules = false,
+        breadcrumb = " ",
+        separator = "󱦰  ",
+        group = "󰹍 ",
+      },
+      plugins = {
+        spelling = {
+          enabled = false,
+        },
+      },
+      win = {
+        height = {
+          max = math.huge,
+        },
+      },
+      spec = whichkey_spec,
+    })
+  end,
+}

config/common/nvim/lua/plugins/extra/linters.lua

@@ -64,7 +64,7 @@ return {
       local markdownlint = require("lint").linters["markdownlint-cli2"]
       markdownlint.args = {
         "--config",
-        vim.fn.stdpath("config") .. "/cfg_linters/global.markdownlint-cli2.yaml",
+        vim.fn.stdpath("config") .. "/lua/config/global.markdownlint-cli2.yaml",
       }
 
       vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {

config/common/nvim/lua/plugins/lualine.lua

@@ -1,61 +0,0 @@
-return {
-  "nvim-lualine/lualine.nvim",
-  event = "VeryLazy",
-  config = function()
-    require("lualine").setup({
-      options = {
-        theme = "powerline",
-        section_separators = "",
-        component_separators = "",
-        globalstatus = false,
-        disabled_filetypes = { statusline = { "snacks_dashboard" } },
-      },
-      sections = {
-        lualine_a = { "mode" },
-        lualine_b = {
-          { "branch" },
-          {
-            "diff",
-            symbols = {
-              added = " ",
-              modified = " ",
-              removed = " ",
-            },
-          },
-          {
-            "diagnostics",
-            symbols = {
-              error = " ",
-              warn = " ",
-              info = " ",
-              hint = " ",
-            },
-          },
-        },
-        lualine_c = {
-          { "filetype", icon_only = true, separator = "", padding = { left = 1, right = 0 } },
-          { "filename", file_status = true, path = 1 },
-        },
-        lualine_x = {
-          {
-            "lsp_status",
-            symbols = {
-              spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" },
-              done = "✓",
-              separator = " ",
-            },
-          },
-        },
-        lualine_y = {
-          { "searchcount" },
-          { "progress", separator = " ", padding = { left = 1, right = 0 } },
-          { "location", padding = { left = 0, right = 1 } },
-        },
-        lualine_z = {},
-      },
-      tabline = {
-        lualine_a = { "buffers" },
-      },
-    })
-  end,
-}

config/common/nvim/lua/plugins/monokai.lua

@@ -1,14 +0,0 @@
-return {
-  "loctvl842/monokai-pro.nvim",
-  priority = 10000,
-  lazy = false,
-  dependencies = {
-    "echasnovski/mini.icons",
-  },
-  config = function()
-    require("monokai-pro").setup({
-      filter = "classic",
-    })
-    vim.cmd.colorscheme("monokai-pro")
-  end,
-}

config/common/nvim/lua/plugins/treesitter.lua

@@ -1,32 +0,0 @@
-return {
-  "nvim-treesitter/nvim-treesitter",
-  build = ":TSUpdate",
-  event = "VeryLazy",
-  config = function()
-    require("nvim-treesitter.configs").setup({
-      ensure_installed = {
-        "bash",
-        "diff",
-        "git_config",
-        "git_rebase",
-        "gitattributes",
-        "gitcommit",
-        "gitignore",
-        "gotmpl",
-        "hcl",
-        "helm",
-        "json",
-        "lua",
-        "markdown_inline",
-        "markdown",
-        "python",
-        "regex",
-        "terraform",
-        "vim",
-        "yaml",
-      },
-      highlight = { enable = true },
-      indent = { enable = true },
-    })
-  end,
-}

config/common/nvim/lua/plugins/which-key.lua

@@ -1,38 +0,0 @@
-return {
-  "folke/which-key.nvim",
-  event = "VeryLazy",
-  config = function()
-    require("which-key").setup({
-      preset = "helix",
-      delay = 300,
-      icons = {
-        rules = false,
-        breadcrumb = " ",
-        separator = "󱦰  ",
-        group = "󰹍 ",
-      },
-      plugins = {
-        spelling = {
-          enabled = false,
-        },
-      },
-      win = {
-        height = {
-          max = math.huge,
-        },
-      },
-      spec = {
-        {
-          mode = { "n", "v" },
-          { "[", group = "previous..." },
-          { "]", group = "next..." },
-          { "<leader>b", group = "buffer" },
-          { "<leader>c", group = "code" },
-          { "<leader>f", group = "find" },
-          { "<leader>h", group = "history" },
-          { "<leader>u", group = "ui" },
-        },
-      },
-    })
-  end,
-}