moar plugins

6 files changed, 47 insertions, 23 deletions

diff --git a/.config/nvim/lua/getchoo/lsp/config/cmp.lua b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
index bfade29..868b6f1 100644
--- a/.config/nvim/lua/getchoo/lsp/config/cmp.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/cmp.lua
@@ -21,10 +21,6 @@ M.config = {
     end,
   },
   mapping = mapping.preset.insert({
-    ["<C-Space>"] = mapping.complete(),
-    ["<CR>"] = mapping.confirm({
-      select = true,
-    }),
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
@@ -54,8 +50,8 @@ M.config = {
     { name = "nvim_lsp" },
     { name = "luasnip" },
     { name = "vsnip" },
-  }, {
     { name = "buffer" },
+    { name = "path" },
   }),
 }
 
diff --git a/.config/nvim/lua/getchoo/lsp/config/init.lua b/.config/nvim/lua/getchoo/lsp/config/init.lua
index e6549e6..7cb2cbb 100644
--- a/.config/nvim/lua/getchoo/lsp/config/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/init.lua
@@ -7,13 +7,38 @@ local null_ls = require("getchoo.lsp.config.null_ls")
 local M = {}
 
 M.bufferline = {
-  options = {
-    numbers = "ordinal",
-    diagnostics = "nvim_lsp",
-    always_show_bufferline = false,
+  animation = true,
+  auto_hide = true,
+  icons = true,
+  maximum_padding = 2,
+  semantic_letters = true,
+}
+
+local db = require("dashboard")
+db.custom_center = {
+  {
+    desc = "find a file",
+    action = "Telescope fd",
+  },
+  {
+    desc = "update plugins",
+    action = "PackerSync",
+  },
+  {
+    desc = "update treesitter parsers",
+    actions = "TSUpdate",
   },
 }
 
+db.custom_header = {
+  " ███╗   ██╗ ███████╗ ██████╗  ██╗   ██╗ ██╗ ███╗   ███╗",
+  " ████╗  ██║ ██╔════╝██╔═══██╗ ██║   ██║ ██║ ████╗ ████║",
+  " ██╔██╗ ██║ █████╗  ██║   ██║ ██║   ██║ ██║ ██╔████╔██║",
+  " ██║╚██╗██║ ██╔══╝  ██║   ██║ ╚██╗ ██╔╝ ██║ ██║╚██╔╝██║",
+  " ██║ ╚████║ ███████╗╚██████╔╝  ╚████╔╝  ██║ ██║ ╚═╝ ██║",
+  " ╚═╝  ╚═══╝ ╚══════╝ ╚═════╝    ╚═══╝   ╚═╝ ╚═╝     ╚═╝",
+}
+
 M.cmp = cmp.config
 
 M.lsp_servers = lsp_config.servers
@@ -27,6 +52,10 @@ M.tree = {}
 
 M.treesitter = {
   auto_install = true,
+  highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = false,
+  },
 }
 
 M.trouble = {}
diff --git a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
index 4bf69e4..6b13d19 100644
--- a/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/lsp_config.lua
@@ -8,8 +8,8 @@ local on_attach = function(client, bufnr)
 end
 
 local all_config = {
-  on_attach = on_attach,
   capabilities = cmp.capabilities,
+  on_attach = on_attach,
 }
 
 local servers = {}
@@ -18,6 +18,7 @@ for _, server in ipairs(sources.lsp_servers) do
 end
 
 servers["sumneko_lua"] = {
+  capabilities = cmp.capabilities,
   on_attach = on_attach,
   settings = {
     Lua = {
@@ -30,9 +31,6 @@ servers["sumneko_lua"] = {
       workspace = {
         library = vim.api.nvim_get_runtime_file("", true),
       },
-      telemetry = {
-        enable = false,
-      },
     },
   },
 }
diff --git a/.config/nvim/lua/getchoo/lsp/init.lua b/.config/nvim/lua/getchoo/lsp/init.lua
index b4f61f8..a2ef780 100644
--- a/.config/nvim/lua/getchoo/lsp/init.lua
+++ b/.config/nvim/lua/getchoo/lsp/init.lua
@@ -6,6 +6,7 @@ require("getchoo.lsp.keymap")
 local config = require("getchoo.lsp.config")
 
 require("bufferline").setup(config.bufferline)
+require("gitsigns").setup()
 require("nvim-tree").setup(config.tree)
 require("nvim-treesitter.configs").setup(config.treesitter)
 require("trouble").setup(config.trouble)
diff --git a/.config/nvim/lua/getchoo/lsp/keymap.lua b/.config/nvim/lua/getchoo/lsp/keymap.lua
index 3264851..0df41d2 100644
--- a/.config/nvim/lua/getchoo/lsp/keymap.lua
+++ b/.config/nvim/lua/getchoo/lsp/keymap.lua
@@ -13,28 +13,28 @@ set("n", "]d", vim.diagnostic.goto_next)
 set("n", "<space>q", vim.diagnostic.setloclist)
 
 set("n", "<space>f", function()
-  vim.cmd([[:Clap]])
+  vim.cmd("Telescope")
 end)
 
 set("n", "<leader>t", function()
-  vim.cmd([[:NvimTreeToggle]])
+  vim.cmd("NvimTreeToggle")
 end)
 
 set("n", "<space>t", function()
-  vim.cmd([[:TroubleToggle]])
+  vim.cmd("TroubleToggle")
 end)
 
-local bufferline = require("bufferline")
 for i = 1, 9 do
   set("n", "<leader>" .. i, function()
-    bufferline.go_to_buffer(i, true)
+    local cmd = "BufferGoto " .. i
+    vim.cmd(cmd)
   end)
 end
 
 set("n", "<leader>p", function()
-  bufferline.pick_buffer()
+  vim.cmd("BufferPick")
 end)
 
 set("n", "<leader>q", function()
-  bufferline.close_buffer_with_pick()
+  vim.cmd("BufferClose")
 end)
diff --git a/.config/nvim/lua/getchoo/lsp/server.lua b/.config/nvim/lua/getchoo/lsp/server.lua
index 62a84e9..9c35aaf 100644
--- a/.config/nvim/lua/getchoo/lsp/server.lua
+++ b/.config/nvim/lua/getchoo/lsp/server.lua
@@ -12,9 +12,9 @@ require("mason-lspconfig").setup(config.mason_lspconfig)
 require("mason-tool-installer").setup(config.mason_tool_installer)
 vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/")
 
+null_ls.setup(config.null_ls)
+cmp.setup(config.cmp)
+
 for server, settings in pairs(config.lsp_servers) do
   lspconfig[server].setup(settings)
 end
-
-cmp.setup(config.cmp)
-null_ls.setup(config.null_ls)