[neovim] Add conform plugin / Fix issue with cmp confirmation key

home/neovim/default.nix

@@ -21,6 +21,7 @@
       ./plugins/auto-dark-mode
       ./plugins/cmp
       ./plugins/comment
+      ./plugins/conform
       ./plugins/gitsigns
       ./plugins/lspconfig
       ./plugins/lualine

home/neovim/plugins/cmp/config.lua

@@ -12,10 +12,14 @@ cmp.setup({
 		documentation = cmp.config.window.bordered(),
 	},
 	mapping = cmp.mapping.preset.insert({
+		["<C-Space>"] = cmp.mapping.complete(),
+		["<C-y>"] = cmp.mapping.confirm({ select = true }),
+
 		["<C-b>"] = cmp.mapping.scroll_docs(-4),
 		["<C-f>"] = cmp.mapping.scroll_docs(4),
-		["<C-Space>"] = cmp.mapping.complete(),
-		["<Tab>"] = cmp.mapping.confirm({ select = true }),
+
+		["<C-n>"] = cmp.mapping.select_next_item(),
+		["<C-p>"] = cmp.mapping.select_prev_item(),
 	}),
 	sources = cmp.config.sources({
 		{ name = "nvim_lsp" },

home/neovim/plugins/conform/config.lua

@@ -0,0 +1,19 @@
+local conform = require("conform")
+
+conform.setup({
+	notify_on_error = false,
+	format_on_save = {
+		timeout_ms = 500,
+		lsp_fallback = true,
+	},
+	formatters_by_ft = {
+		lua = { "stylua" },
+	},
+})
+
+vim.api.nvim_create_autocmd("BufWritePre", {
+	pattern = "*",
+	callback = function(args)
+		require("conform").format({ bufnr = args.buf })
+	end,
+})

home/neovim/plugins/conform/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+[
+  {
+    plugin = pkgs.vimPlugins.conform-nvim;
+    config = builtins.readFile ./config.lua;
+    type = "lua";
+  }
+]

home/neovim/plugins/lspconfig/config.lua

@@ -76,10 +76,5 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction")
 		map("<leader>rn", vim.lsp.buf.rename, "[R]e[n]ame")
 		map("K", vim.lsp.buf.hover, "Hover Documentation")
-
-		-- TODO: Replace this with https://github.com/stevearc/conform.nvim
-		map("<space>f", function()
-			vim.lsp.buf.format({ async = true })
-		end, "[F]ormat [C]ode")
 	end,
 })