refactor + add figet/bufferline to neovim config

5 files changed, 80 insertions, 73 deletions

diff --git a/users/seth/programs/neovim/config/general.lua b/users/seth/programs/neovim/config/general.lua
new file mode 100644
index 0000000..349c191
--- /dev/null
+++ b/users/seth/programs/neovim/config/general.lua
@@ -0,0 +1,65 @@
+---- autopairs
+require("nvim-autopairs").setup({
+	disable_filetype = { "TeleScopePrompt" },
+})
+
+---- catppuccin
+local compile_path = vim.fn.stdpath("cache") .. "/catppuccin-nvim"
+vim.fn.mkdir(compile_path, "p")
+vim.opt.runtimepath:append(compile_path)
+
+require("catppuccin").setup({
+	compile_path = compile_path,
+	flavour = "mocha", -- mocha, macchiato, frappe, latte
+	integrations = {
+		barbar = true,
+		cmp = true,
+		gitsigns = true,
+		leap = true,
+		native_lsp = {
+			enabled = true,
+		},
+		nvimtree = true,
+		treesitter_context = true,
+		treesitter = true,
+		telescope = true,
+		lsp_trouble = true,
+	},
+	no_italic = true,
+})
+vim.api.nvim_command("colorscheme catppuccin")
+
+---- bufferline
+require("bufferline").setup({
+	options = {
+		highlights = require("catppuccin.groups.integrations.bufferline").get(),
+		diagnostics = "nvim_lsp",
+		numbers = "ordinal",
+	},
+})
+
+---- gitsigns
+require("gitsigns").setup({})
+
+---- leap
+require("leap").add_default_mappings()
+
+---- lualine
+require("lualine").setup({
+	options = {
+		theme = "catppuccin",
+	},
+	extensions = { "nvim-tree" },
+})
+
+---- nvim-tree
+require("nvim-tree").setup({})
+
+---- treesitter
+require("nvim-treesitter.configs").setup({
+	auto_install = false,
+	highlight = {
+		enable = true,
+		additional_vim_regex_highlighting = false,
+	},
+})
diff --git a/users/seth/programs/neovim/config/init.lua b/users/seth/programs/neovim/config/init.lua
index 34590e6..5555078 100644
--- a/users/seth/programs/neovim/config/init.lua
+++ b/users/seth/programs/neovim/config/init.lua
@@ -14,5 +14,6 @@ cmd("filetype plugin indent on")
 opt.termguicolors = true
 
 require("getchoo.keybinds")
-require("getchoo.plugins")
+require("getchoo.general")
+require("getchoo.lsp")
 require("getchoo.filetypes")
diff --git a/users/seth/programs/neovim/config/keybinds.lua b/users/seth/programs/neovim/config/keybinds.lua
index ab4b3a3..2b0ac70 100644
--- a/users/seth/programs/neovim/config/keybinds.lua
+++ b/users/seth/programs/neovim/config/keybinds.lua
@@ -1,3 +1,5 @@
+vim.g.mapleader = ","
+
 local opts = { noremap = true, silent = true }
 local set = function(mode, key, vimcmd)
 	vim.keymap.set(mode, key, vimcmd, opts)
@@ -9,28 +11,24 @@ end)
 
 for i = 1, 9 do
 	set("n", "<leader>" .. i, function()
-		local vimcmd = "BufferGoto " .. i
+		local vimcmd = "BufferLineGoToBuffer " .. i
 		vim.cmd(vimcmd)
 	end)
 end
 
-set("n", "<leader>p", function()
-	vim.cmd("BufferPick")
-end)
-
 set("n", "<leader>q", function()
-	vim.cmd("BufferClose")
+	vim.cmd("BufferLinePickClose")
 end)
 
-set("n", "<space>e", vim.diagnostic.open_float)
+set("n", "<leader>e", vim.diagnostic.open_float)
 set("n", "[d", vim.diagnostic.goto_prev)
 set("n", "]d", vim.diagnostic.goto_next)
-set("n", "<space>q", vim.diagnostic.setloclist)
+set("n", "<leader>u", vim.diagnostic.setloclist)
 
-set("n", "<space>f", function()
+set("n", "<leader>f", function()
 	vim.cmd("Telescope")
 end)
 
-set("n", "<space>t", function()
+set("n", "<leader>p", function()
 	vim.cmd("TroubleToggle")
 end)
diff --git a/users/seth/programs/neovim/config/plugins.lua b/users/seth/programs/neovim/config/lsp.lua
index 2ec3f7b..0df0f2f 100644
--- a/users/seth/programs/neovim/config/plugins.lua
+++ b/users/seth/programs/neovim/config/lsp.lua
@@ -1,39 +1,3 @@
----- catppuccin
-local compile_path = vim.fn.stdpath("cache") .. "/catppuccin-nvim"
-vim.fn.mkdir(compile_path, "p")
-vim.opt.runtimepath:append(compile_path)
-
-require("catppuccin").setup({
-	compile_path = compile_path,
-	flavour = "mocha", -- mocha, macchiato, frappe, latte
-	integrations = {
-		barbar = true,
-		cmp = true,
-		gitsigns = true,
-		leap = true,
-		native_lsp = {
-			enabled = true,
-		},
-		nvimtree = true,
-		treesitter_context = true,
-		treesitter = true,
-		telescope = true,
-		lsp_trouble = true,
-	},
-	no_italic = true,
-})
-vim.api.nvim_command("colorscheme catppuccin")
-
----- bufferline
-require("bufferline").setup({
-	animation = true,
-	auto_hide = true,
-	highlights = require("catppuccin.groups.integrations.bufferline").get(),
-	icons = true,
-	maximum_padding = 2,
-	semantic_letters = true,
-})
-
 ---- cmp
 local cmp = require("cmp")
 local luasnip = require("luasnip")
@@ -102,11 +66,8 @@ require("cmp").setup({
 	on_attach = cmp_on_attach,
 })
 
----- gitsigns
-require("gitsigns").setup({})
-
----- leap
-require("leap").add_default_mappings()
+---- fidget
+require("fidget").setup({})
 
 ---- lsp sources
 local null_ls = require("null-ls")
@@ -164,14 +125,6 @@ for server, settings in pairs(servers) do
 	require("lspconfig")[server].setup(settings)
 end
 
----- lualine
-require("lualine").setup({
-	options = {
-		theme = "catppuccin",
-	},
-	extensions = { "nvim-tree" },
-})
-
 ---- null-ls
 -- auto-format
 local lsp_formatting = function(bufnr)
@@ -202,17 +155,5 @@ require("null-ls").setup({
 	sources = sources.null_ls,
 })
 
----- nvim-tree
-require("nvim-tree").setup({})
-
----- treesitter
-require("nvim-treesitter.configs").setup({
-	auto_install = false,
-	highlight = {
-		enable = true,
-		additional_vim_regex_highlighting = false,
-	},
-})
-
 ---- trouble
 require("trouble").setup({})
diff --git a/users/seth/programs/neovim/default.nix b/users/seth/programs/neovim/default.nix
index 0b154cc..6d5809b 100644
--- a/users/seth/programs/neovim/default.nix
+++ b/users/seth/programs/neovim/default.nix
@@ -22,7 +22,7 @@
       yapf
     ];
     plugins = with pkgs.vimPlugins; [
-      barbar-nvim
+      bufferline-nvim
       catppuccin-nvim
       cmp-nvim-lsp
       cmp-buffer
@@ -30,10 +30,12 @@
       cmp-path
       cmp-vsnip
       editorconfig-nvim
+      fidget-nvim
       gitsigns-nvim
       leap-nvim
       lualine-nvim
       luasnip
+      nvim-autopairs
       nvim-cmp
       nvim-lspconfig
       null-ls-nvim