Add Mason plugin

config/nvim/.stylua.toml

@@ -0,0 +1,6 @@
+column_width = 80
+indent_type = "Spaces"
+indent_width = 2
+
+[sort_requires]
+enabled = true

config/nvim/init.lua

@@ -1,3 +1,3 @@
-require "config.keymaps"
+require("config.keymaps")
-require "config.lazy"
+require("config.lazy")
-require "config.options"
+require("config.options")

config/nvim/lazy-lock.json

@@ -1,12 +1,26 @@
 {
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" },
+  "gruvbox.nvim": { "branch": "main", "commit": "1a8ba635e511148801b55a1128aef933c296a301" },
+  "kanagawa.nvim": { "branch": "master", "commit": "5c4037432f0ae2d0b75d3a7b7cfa3022d7054e4d" },
   "lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
+  "lualine.nvim": { "branch": "master", "commit": "c28a7427c3fb29322db136f0564ec58807b26747" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
+  "nordic.nvim": { "branch": "main", "commit": "fc7ea160bb441f9c0245c2719a3c7b8c22468178" },
   "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" },
+  "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7d5af779acbc8a6ff9dfd7f2d39ae898fb67480f" },
   "nvim-treesitter": { "branch": "master", "commit": "411e771d511442ab81670701f5c830f6c74aadd7" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "b55fe6175f0001347a433c9df358c8cbf8a4e90f" },
   "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
   "onedark.nvim": { "branch": "master", "commit": "dd640f6cfb0e370cfd3db389f04b172508848bd3" },
   "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
   "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },
+  "tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" },
+  "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
   "which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" }
 }

config/nvim/lua/.luarc.json

@@ -0,0 +1,15 @@
+{
+    "workspace.library": [
+        "/Users/danbarber/.config/nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/lazy.nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/nvim-lspconfig",
+        "/Users/danbarber/.local/share/nvim/lazy/nordic.nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/plenary.nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/telescope.nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/tokyonight.nvim",
+        "/Users/danbarber/.local/share/nvim/lazy/which-key.nvim",
+        "/Applications/VimR.app/Contents/Resources/NvimView_NvimView.bundle/Contents/Resources/runtime",
+        "/Users/danbarber/.local/state/nvim/lazy/readme",
+        "${3rd}/luassert/library"
+    ]
+}

config/nvim/lua/config/keymaps.lua

@@ -1,7 +1,7 @@
 local keymap = vim.keymap.set
 
 -- Space as leader
-vim.g.mapleader = ' '
+vim.g.mapleader = " "
 
 -- Better pane navigation
 keymap("n", "<C-h>", "<C-w>h")

config/nvim/lua/config/options.lua

@@ -1,4 +1,4 @@
-require('onedark').load()
+require("onedark").load()
 
 local indent = 2
 

config/nvim/lua/config/plugins/formatter.lua

@@ -0,0 +1,19 @@
+return function()
+  require("formatter").setup({
+    logging = true,
+    log_level = vim.log.levels.WARN,
+    filetype = {
+      lua = {
+        require("formatter.filetypes.lua").stylua,
+      },
+
+      ruby = {
+        require("formatter.filetypes.ruby").standardrb,
+      },
+
+      ["*"] = {
+        require("formatter.filetypes.any").remove_trailing_whitespace,
+      },
+    },
+  })
+end

config/nvim/lua/config/plugins/lspconfig/elixir.lua

@@ -0,0 +1 @@
+require("lspconfig").elixirls.setup({})

config/nvim/lua/config/plugins/lspconfig/emmet.lua

@@ -0,0 +1 @@
+require("lspconfig").emmet_ls.setup({})

config/nvim/lua/config/plugins/lspconfig/init.lua

@@ -0,0 +1,7 @@
+return function()
+  require("config.plugins.lspconfig.elixir")
+  require("config.plugins.lspconfig.emmet")
+  require("config.plugins.lspconfig.javascript")
+  require("config.plugins.lspconfig.lua")
+  require("config.plugins.lspconfig.ruby")
+end

config/nvim/lua/config/plugins/lspconfig/javascript.lua

@@ -0,0 +1,4 @@
+local lspconfig = require("lspconfig")
+
+lspconfig.eslint.setup({})
+lspconfig.tsserver.setup({})

config/nvim/lua/config/plugins/lspconfig/lua.lua

@@ -0,0 +1,18 @@
+require("lspconfig").lua_ls.setup({
+  settings = {
+    Lua = {
+      runtime = {
+        version = "LuaJIT",
+      },
+      diagnostics = {
+        globals = { "vim" },
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file("", true),
+      },
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+})

config/nvim/lua/config/plugins/lspconfig/ruby.lua

@@ -0,0 +1 @@
+require("lspconfig").ruby_ls.setup({})

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

@@ -0,0 +1,3 @@
+return function()
+  require("lualine").setup()
+end

config/nvim/lua/config/plugins/neo-tree.lua

@@ -0,0 +1,8 @@
+return function()
+  -- Unless you are still migrating, remove the deprecated commands from v1.x
+  vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
+
+  require("neo-tree").setup({
+    hijack_netrw_behavior = "open_default",
+  })
+end

config/nvim/lua/config/plugins/nvim-cmp.lua

@@ -0,0 +1,28 @@
+return function()
+  local cmp = require("cmp")
+
+  cmp.setup({
+    snippet = {
+      expand = function(args)
+        vim.fn["vsnip#anonymous"](args.body)
+      end,
+    },
+    window = {
+      -- completion = cmp.config.window.bordered(),
+      -- documentation = cmp.config.window.bordered(),
+    },
+    mapping = cmp.mapping.preset.insert({
+      ["<C-b>"] = cmp.mapping.scroll_docs(-4),
+      ["<C-f>"] = cmp.mapping.scroll_docs(4),
+      ["<C-Space>"] = cmp.mapping.complete(),
+      ["<C-e>"] = cmp.mapping.abort(),
+      ["<CR>"] = cmp.mapping.confirm({ select = true }),
+    }),
+    sources = cmp.config.sources({
+      { name = "nvim_lsp" },
+      { name = "vsnip" },
+    }, {
+      { name = "buffer" },
+    }),
+  })
+end

config/nvim/lua/config/plugins/tree-sitter.lua

@@ -0,0 +1,36 @@
+return {
+  highlight = { enable = true },
+  indent = { enable = true },
+  context_commentstring = { enable = true, enable_autocmd = false },
+  ensure_installed = {
+    "bash",
+    "c",
+    "css",
+    "dockerfile",
+    "eex",
+    "elixir",
+    "help",
+    "html",
+    "javascript",
+    "json",
+    "lua",
+    "luadoc",
+    "luap",
+    "markdown",
+    "markdown_inline",
+    "python",
+    "query",
+    "regex",
+    "ruby",
+    "rust",
+    "scss",
+    "sql",
+    "swift",
+    "toml",
+    "tsx",
+    "typescript",
+    "vim",
+    "vue",
+    "yaml",
+  },
+}

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

@@ -0,0 +1,10 @@
+return function()
+  vim.o.timeout = true
+  vim.o.timeoutlen = 300
+
+  require("which-key").setup({
+    -- your configuration comes here
+    -- or leave it empty to use the default settings
+    -- refer to the configuration section below
+  })
+end

config/nvim/lua/plugins/colorschemes.lua

@@ -1,3 +1,7 @@
 return {
-  "navarasu/onedark.nvim"
+  "navarasu/onedark.nvim",
+  "folke/tokyonight.nvim",
+  "rebelot/kanagawa.nvim",
+  "ellisonleao/gruvbox.nvim",
+  "AlexvZyl/nordic.nvim",
 }

config/nvim/lua/plugins/formatter.lua

@@ -0,0 +1,5 @@
+return {
+  "mhartington/formatter.nvim",
+
+  config = require("config.plugins.formatter"),
+}

config/nvim/lua/plugins/init.lua

@@ -1,2 +1,14 @@
 return {
+  "hrsh7th/cmp-nvim-lsp",
+  "hrsh7th/cmp-buffer",
+  "hrsh7th/cmp-path",
+  "hrsh7th/cmp-cmdline",
+  "hrsh7th/cmp-vsnip",
+  "hrsh7th/vim-vsnip",
+  {
+    "williamboman/mason.nvim",
+    config = function()
+      require("mason").setup()
+    end,
+  },
 }

config/nvim/lua/plugins/lspconfig.lua

@@ -0,0 +1,5 @@
+return {
+  "neovim/nvim-lspconfig",
+
+  config = require("config.plugins.lspconfig")
+}

config/nvim/lua/plugins/lualine.lua

@@ -0,0 +1,9 @@
+return {
+  "nvim-lualine/lualine.nvim",
+
+  dependencies = {
+    "nvim-tree/nvim-web-devicons",
+  },
+
+  config = require("config.plugins.lualine"),
+}

config/nvim/lua/plugins/neo-tree.lua

@@ -0,0 +1,11 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons",
+    "MunifTanjim/nui.nvim",
+  },
+
+  config = require("config.plugins.neo-tree"),
+}

config/nvim/lua/plugins/neotree.lua

@@ -1,18 +0,0 @@
-return {
-  "nvim-neo-tree/neo-tree.nvim",
-
-  dependencies = { 
-    "nvim-lua/plenary.nvim",
-    "nvim-tree/nvim-web-devicons",
-    "MunifTanjim/nui.nvim",
-  },
-
-  config = function ()
-    -- Unless you are still migrating, remove the deprecated commands from v1.x
-    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
-
-    require("neo-tree").setup({
-      hijack_netrw_behavior = "open_default"
-    })
-  end
-}

config/nvim/lua/plugins/nvim-cmp.lua

@@ -0,0 +1,5 @@
+return {
+  "hrsh7th/nvim-cmp",
+
+  config = require("config.plugins.nvim-cmp"),
+}

config/nvim/lua/plugins/telescope.lua

@@ -1,4 +1,5 @@
 return {
   "nvim-telescope/telescope.nvim",
-  dependencies = { "nvim-lua/plenary.nvim" }
+
+  dependencies = { "nvim-lua/plenary.nvim" },
 }

config/nvim/lua/plugins/tree-sitter.lua

@@ -0,0 +1,38 @@
+return {
+  {
+    "nvim-treesitter/nvim-treesitter",
+
+    build = ":TSUpdate",
+
+    event = { "BufReadPost", "BufNewFile" },
+
+    dependencies = {
+      {
+        "nvim-treesitter/nvim-treesitter-textobjects",
+        init = function()
+          -- PERF: no need to load the plugin, if we only need its queries for mini.ai
+          local plugin =
+            require("lazy.core.config").spec.plugins["nvim-treesitter"]
+          local opts = require("lazy.core.plugin").values(plugin, "opts", false)
+          local enabled = false
+          if opts.textobjects then
+            for _, mod in ipairs({ "move", "select", "swap", "lsp_interop" }) do
+              if opts.textobjects[mod] and opts.textobjects[mod].enable then
+                enabled = true
+                break
+              end
+            end
+          end
+          if not enabled then
+            require("lazy.core.loader").disable_rtp_plugin(
+              "nvim-treesitter-textobjects"
+            )
+          end
+        end,
+      },
+    },
+
+    ---@type TSConfig
+    opts = require("config.plugins.tree-sitter"),
+  },
+}

config/nvim/lua/plugins/treesitter.lua

@@ -1,67 +0,0 @@
-return {
-  {
-    "nvim-treesitter/nvim-treesitter",
-    build = ":TSUpdate",
-    event = { "BufReadPost", "BufNewFile" },
-    dependencies = {
-      {
-        "nvim-treesitter/nvim-treesitter-textobjects",
-        init = function()
-          -- PERF: no need to load the plugin, if we only need its queries for mini.ai
-          local plugin = require("lazy.core.config").spec.plugins["nvim-treesitter"]
-          local opts = require("lazy.core.plugin").values(plugin, "opts", false)
-          local enabled = false
-          if opts.textobjects then
-            for _, mod in ipairs({ "move", "select", "swap", "lsp_interop" }) do
-              if opts.textobjects[mod] and opts.textobjects[mod].enable then
-                enabled = true
-                break
-              end
-            end
-          end
-          if not enabled then
-            require("lazy.core.loader").disable_rtp_plugin("nvim-treesitter-textobjects")
-          end
-        end,
-      },
-    },
-
-    ---@type TSConfig
-    opts = {
-      highlight = { enable = true },
-      indent = { enable = true },
-      context_commentstring = { enable = true, enable_autocmd = false },
-      ensure_installed = {
-        "bash",
-        "c",
-        "css",
-        "dockerfile",
-        "eex",
-        "elixir",
-        "help",
-        "html",
-        "javascript",
-        "json",
-        "lua",
-        "luadoc",
-        "luap",
-        "markdown",
-        "markdown_inline",
-        "python",
-        "query",
-        "regex",
-        "ruby",
-        "rust",
-        "scss",
-        "sql",
-        "swift",
-        "toml",
-        "tsx",
-        "typescript",
-        "vim",
-        "vue",
-        "yaml",
-      },
-    },
-  },
-}

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

@@ -0,0 +1,5 @@
+return {
+  "folke/which-key.nvim",
+
+  config = require("config.plugins.which-key"),
+}

config/nvim/lua/plugins/whichkey.lua

@@ -1,13 +0,0 @@
-return {
-  "folke/which-key.nvim",
-
-  config = function()
-    vim.o.timeout = true
-    vim.o.timeoutlen = 300
-    require("which-key").setup({
-      -- your configuration comes here
-      -- or leave it empty to use the default settings
-      -- refer to the configuration section below
-    })
-  end,
-}