From 7dcd592eae886dc8edde2dc65d6e6323201a2aaf Mon Sep 17 00:00:00 2001 From: Raymaekers Luca Date: Sat, 14 Sep 2024 19:48:38 +0200 Subject: checkpoint - changed installation of tmux-navigator - removed init.lua file in user/ directory - added autocmd for terminal in insert mode - added keybind for opening terminal - added keybinds for lsp commands - added lua lsp setup - added nvim-cmp - added keybind for editing config - added keybinds for opening splits - added conceallevel = 2 - commented encoding options - plugins: - added go.nvim - added cmp-calc - markdown: - disable pairs for quotes - added pairs in markdown - go: - added go lsp - added autoformat of go files on save --- after/plugin/autoclose.lua | 34 ++++++++++++++++++++++++---------- after/plugin/conform.lua | 10 ++++++++++ after/plugin/vim-tmux-navigator.lua | 6 ------ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 after/plugin/conform.lua delete mode 100644 after/plugin/vim-tmux-navigator.lua (limited to 'after/plugin') diff --git a/after/plugin/autoclose.lua b/after/plugin/autoclose.lua index 543d7d9..b742fc6 100644 --- a/after/plugin/autoclose.lua +++ b/after/plugin/autoclose.lua @@ -1,20 +1,34 @@ -require("autoclose").setup({ +local filetypes = require("autoclose").setup({ keys = { ["("] = { escape = false, close = true, pair = "()" }, - ["["] = { escape = false, close = true, pair = "[]" }, - ["{"] = { escape = false, close = true, pair = "{}" }, - - [">"] = { escape = true, close = false, pair = "<>" }, [")"] = { escape = true, close = false, pair = "()" }, + ["["] = { escape = false, close = true, pair = "[]" }, ["]"] = { escape = true, close = false, pair = "[]" }, + ["{"] = { escape = false, close = true, pair = "{}" }, ["}"] = { escape = true, close = false, pair = "{}" }, - - ['"'] = { escape = true, close = true, pair = '""' }, - ["'"] = { escape = true, close = true, pair = "''" }, - ["`"] = { escape = true, close = true, pair = "``" }, + [">"] = { escape = true, close = false, pair = "<>" }, + ['"'] = { + escape = true, + close = true, + pair = '""', + disabled_filetypes = { "text", "telekasten", "groff", "diff", "gitcommit", "fugitive", "markdown" }, + }, + ["'"] = { + escape = true, + close = true, + pair = "''", + disabled_filetypes = { "text", "telekasten", "groff", "diff", "gitcommit", "fugitive", "markdown" }, + }, + ["`"] = { + escape = true, + close = true, + pair = "``", + disabled_filetypes = { "text", "telekasten", "groff", "diff", "gitcommit", "fugitive" }, + }, + ["*"] = { escape = true, close = true, pair = "**", enabled_filetypes = { "markdown" } }, + ["_"] = { escape = true, close = true, pair = "__", enabled_filetypes = { "markdown" } }, }, options = { - disabled_filetypes = { "text", "telekasten", "groff", "diff", "gitcommit", "fugitive" }, disable_when_touch = true, }, }) diff --git a/after/plugin/conform.lua b/after/plugin/conform.lua new file mode 100644 index 0000000..13961b6 --- /dev/null +++ b/after/plugin/conform.lua @@ -0,0 +1,10 @@ +require("conform").setup({ + formatters_by_ft = { + lua = { "stylua" }, + }, + format_on_save = { + -- These options will be passed to conform.format() + timeout_ms = 500, + lsp_format = "fallback", + }, +}) diff --git a/after/plugin/vim-tmux-navigator.lua b/after/plugin/vim-tmux-navigator.lua deleted file mode 100644 index 1574080..0000000 --- a/after/plugin/vim-tmux-navigator.lua +++ /dev/null @@ -1,6 +0,0 @@ -vim.g.tmux_navigator_no_mappings = true -vim.keymap.set("n", "", ":TmuxNavigateLeft", { silent = true }) -vim.keymap.set("n", "", ":TmuxNavigateDown", { silent = true }) -vim.keymap.set("n", "", ":TmuxNavigateUp", { silent = true }) -vim.keymap.set("n", "", ":TmuxNavigateRight", { silent = true }) -vim.keymap.set("n", "", ":TmuxNavigatePrevious", { silent = true }) -- cgit v1.2.3