From f5619a9593a60a5af73487691e612e284f8a7bdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Wed, 28 Feb 2024 03:40:13 +0100
Subject: [PATCH] Improve neovim config

---
 home/editor/neovim/default.nix  |  3 ++
 home/editor/neovim/keybinds.lua | 17 +++++++++++
 home/editor/neovim/plugins.lua  | 52 +++++++++++++++++++++++++++++++--
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/home/editor/neovim/default.nix b/home/editor/neovim/default.nix
index 0e737c1..9453089 100644
--- a/home/editor/neovim/default.nix
+++ b/home/editor/neovim/default.nix
@@ -9,8 +9,11 @@
         undotree
         telescope-nvim
         nvim-cmp
+        cmp-nvim-lsp
         nvim-lspconfig
         lsp-zero-nvim
+        vim-floaterm
+        luasnip
         (nvim-treesitter.withPlugins (p: [
           p.tree-sitter-nix
           p.tree-sitter-go
diff --git a/home/editor/neovim/keybinds.lua b/home/editor/neovim/keybinds.lua
index 131e566..1dc44b4 100644
--- a/home/editor/neovim/keybinds.lua
+++ b/home/editor/neovim/keybinds.lua
@@ -1 +1,18 @@
 -- Keybinds
+
+-- Term
+vim.g.floaterm_keymap_toggle = '<leader>ft'
+
+-- Tabs
+vim.keymap.set('n', '<leader>n', ':tabnew<CR>',
+	{ silent = true, desc = '[N]ew tab' })
+vim.keymap.set('n', '<leader>p', ':tabnext<CR>',
+	{ silent = true, desc = '[p]Next tab' })
+vim.keymap.set('n', '<leader>P', ':tabprev<CR>',
+	{ silent = true, desc = '[P]Previous tab' })
+
+-- Telescope
+vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles,
+	{ desc = '[?] FInd recently opened files' })
+vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
+	{ desc = '[F]ind [F]iles' })
diff --git a/home/editor/neovim/plugins.lua b/home/editor/neovim/plugins.lua
index bd64eb7..3b6a859 100644
--- a/home/editor/neovim/plugins.lua
+++ b/home/editor/neovim/plugins.lua
@@ -1,3 +1,51 @@
 -- Plugins
-require('lsp-zero')
-require('lspconfig').gopls.setup({})
+
+-- LSP stuff
+local lsp_zero = require('lsp-zero')
+
+lsp_zero.on_attach(function(client, bufnr)
+	lsp_zero.default_keymaps({buffer = bufnr})
+end)
+
+require('lspconfig').gopls.setup({
+	settings = {
+		gopls = {
+			analyses = {
+				unusedparams = true,
+			},
+			staticcheck = true,
+			gofumpt = true,
+		}
+	}
+})
+
+-- Cmp
+local cmp = require('cmp')
+local cmp_action = lsp_zero.cmp_action()
+
+cmp.setup({
+	mapping = cmp.mapping.preset.insert({
+		-- Enter to confirm completion
+		['<CR>'] = cmp.mapping.confirm({select = false}),
+		-- Ctrl+Space to open completion menu
+		['<C-Space>'] = cmp.mapping.complete(),
+		-- Move between snippet placeholders
+		['<C-f>'] = cmp_action.luasnip_jump_forward(),
+		['<C-b>'] = cmp_action.luasnip_jump_backward(),
+		-- Scroll in completion docs
+		['<C-k>'] = cmp.mapping.scroll_docs(-4),
+		['<C-j>'] = cmp.mapping.scroll_docs(4),
+	})
+})
+
+-- Telescope
+require('telescope').setup({
+	extensions = {
+		fzf = {
+			fuzzy = true,
+			override_generic_sorter = true,
+			override_file_sorter = true,
+			case_mode = "smart_case",
+		}
+	},
+})