diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/user/init.lua | 37 | ||||
| -rw-r--r-- | lua/user/lazy.lua | 37 | ||||
| -rw-r--r-- | lua/user/lsp.lua | 103 | ||||
| -rw-r--r-- | lua/user/main.go | 7 | ||||
| -rw-r--r-- | lua/user/map.lua | 7 | ||||
| -rw-r--r-- | lua/user/set.lua | 5 |
6 files changed, 148 insertions, 48 deletions
diff --git a/lua/user/init.lua b/lua/user/init.lua deleted file mode 100644 index b467dc3..0000000 --- a/lua/user/init.lua +++ /dev/null @@ -1,37 +0,0 @@ -require("user.set") -require("user.map") -require("user.lazy") -require("user.lsp") - -local autocmd = vim.api.nvim_create_autocmd - -local function augroup(name) - return vim.api.nvim_create_augroup("user_" .. name, { clear = true }) -end - --- [[ Highlight on yank ]] -autocmd("TextYankPost", { - group = augroup("highlight_yank"), - callback = function() - vim.highlight.on_yank() - end, -}) - --- [[ Auto create parent directory if it doesn't exist ]] -autocmd("BufWritePre", { - group = augroup("auto_create_dir"), - callback = function(event) - if event.match:match("^%w%w+://") then - return - end - local file = vim.loop.fs_realpath(event.match) or event.match - vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p") - end, -}) - -autocmd("BufWritePre", { - pattern = "*", - callback = function(args) - require("conform").format({ bufnr = args.buf }) - end, -}) diff --git a/lua/user/lazy.lua b/lua/user/lazy.lua index 640e10f..31780ec 100644 --- a/lua/user/lazy.lua +++ b/lua/user/lazy.lua @@ -42,7 +42,9 @@ require("lazy").setup({ "hrsh7th/cmp-path", -- cmp snippy support "dcampos/cmp-snippy", + "hrsh7th/cmp-calc", }, + event = { "InsertEnter", "CmdlineEnter" }, }, -- kind icons "onsails/lspkind.nvim", @@ -53,12 +55,43 @@ require("lazy").setup({ -- better ntrw "tpope/vim-vinegar", -- integration with tmux keybinds - "christoomey/vim-tmux-navigator", + { + "christoomey/vim-tmux-navigator", + cmd = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "<M-h>", "<cmd>TmuxNavigateLeft<cr>" }, + { "<M-j>", "<cmd>TmuxNavigateDown<cr>" }, + { "<M-k>", "<cmd>TmuxNavigateUp<cr>" }, + { "<M-l>", "<cmd>TmuxNavigateRight<cr>" }, + { "<M-\\>", "<cmd>TmuxNavigatePrevious<cr>" }, + }, + }, -- auto close brackets "m4xshen/autoclose.nvim", }, + { + "ray-x/go.nvim", + dependencies = { -- optional packages + "ray-x/guihua.lua", + "neovim/nvim-lspconfig", + "nvim-treesitter/nvim-treesitter", + }, + config = function() + require("go").setup() + end, + event = { "CmdlineEnter" }, + ft = { "go", "gomod" }, + build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries + }, - "mg979/vim-visual-multi", + "mg979/vim-visual-multi", + "jghauser/follow-md-links.nvim", { "dstein64/vim-startuptime", diff --git a/lua/user/lsp.lua b/lua/user/lsp.lua index 2de41ba..1443887 100644 --- a/lua/user/lsp.lua +++ b/lua/user/lsp.lua @@ -1,2 +1,105 @@ +-- [[ Keybinds ]] +local map = vim.keymap.set +map("n", " a", vim.lsp.buf.code_action) +map("n", "gd", vim.lsp.buf.definition) +map("n", " r", vim.lsp.buf.rename) +map("n", " i", vim.lsp.buf.implementation) +map("n", " sh", vim.lsp.buf.signature_help) +map("n", " t", vim.lsp.buf.typehierarchy) +map("n", " r", vim.lsp.buf.references) +map("n", " sl", vim.lsp.buf.document_symbol) +map("n", " td", vim.lsp.buf.type_definition) + +-- [[ LSP Setups ]] local lspconfig = require("lspconfig") + +-- go lspconfig.gopls.setup({}) + +-- lua +-- with neovim support +require("lspconfig").lua_ls.setup({ + on_init = function(client) + local path = client.workspace_folders[1].name + if vim.loop.fs_stat(path .. "/.luarc.json") or vim.loop.fs_stat(path .. "/.luarc.jsonc") then + return + end + + client.config.settings.Lua = vim.tbl_deep_extend("force", client.config.settings.Lua, { + runtime = { + -- Tell the language server which version of Lua you're using + -- (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + }, + -- Make the server aware of Neovim runtime files + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + -- Depending on the usage, you might want to add additional paths here. + -- "${3rd}/luv/library" + -- "${3rd}/busted/library", + }, + -- or pull in all of 'runtimepath'. NOTE: this is a lot slower + -- library = vim.api.nvim_get_runtime_file("", true) + }, + }) + end, + settings = { + Lua = {}, + }, +}) + +-- [[ nvim cmp ]] +local capabilities = require("cmp_nvim_lsp").default_capabilities() +local cmp = require("cmp") +local lspkind = require("lspkind") +cmp.setup({ + snippet = { + expand = function(args) + require("snippy").expand_snippet(args.body) + end, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + mapping = cmp.mapping.preset.insert({ + ["<C-b>"] = cmp.mapping.scroll_docs(-4), + ["<C-f>"] = cmp.mapping.scroll_docs(4), + ["<C-Space>"] = cmp.mapping.complete(), + ["<C-c>"] = cmp.mapping.abort(), + ["<CR>"] = cmp.mapping({ + i = function(fallback) + if cmp.visible() and cmp.get_active_entry() then + cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }) + else + fallback() + end + end, + s = cmp.mapping.confirm({ select = true }), + c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), + }), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + -- { name = "snippy" }, + }, { + { name = "buffer" }, + { name = "calc" }, + }), + formatting = { + format = lspkind.cmp_format({ + mode = "symbol_text", + menu = { + buffer = "(Buffer)", + nvim_lsp = "(LSP)", + luasnip = "(LuaSnip)", + nvim_lua = "(Lua)", + latex_symbols = "(Latex)", + }, + }), + }, +}) + +vim.api.nvim_set_hl(0, "CmpItemMenu", { italic = true }) diff --git a/lua/user/main.go b/lua/user/main.go deleted file mode 100644 index ef25884..0000000 --- a/lua/user/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "fmt" - -func main() { - fmt.Println("Hello, world!") -} diff --git a/lua/user/map.lua b/lua/user/map.lua index ca4142b..230588f 100644 --- a/lua/user/map.lua +++ b/lua/user/map.lua @@ -4,6 +4,11 @@ local map = vim.keymap.set vim.g.mapleader = " " vim.g.maplocalleader = "," +-- open config +map("n", " c", function() + vim.cmd("cd ~/.config/nvim") + vim.cmd("e " .. "init.lua") +end, { desc = "Open neovim config file" }) -- Move text easilly map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selected text up" }) map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selected text down" }) @@ -23,6 +28,8 @@ map("i", "<C-e>", "<C-o>A", { noremap = true }) map("i", "<C-k>", "<C-o>D", { noremap = true }) -- buffers +map("n", "<leader>sp", "<cmd>sp<cr>", { desc = "Open horizontal split" }) +map("n", "<leader>vs", "<cmd>vs<cr>", { desc = "Open vertical split" }) map("n", "gb", "<cmd>buffers<cr>:buffer<Space>", { noremap = true }) map("n", "<Leader>q", "<cmd>q!<cr>", { noremap = true }) map("n", "<Leader>Q", "<cmd>qa!<cr>", { noremap = true }) diff --git a/lua/user/set.lua b/lua/user/set.lua index cb8dba4..6040c72 100644 --- a/lua/user/set.lua +++ b/lua/user/set.lua @@ -3,6 +3,7 @@ local opt = vim.opt -- Don't highlight on search opt.hlsearch = false opt.incsearch = true +opt.conceallevel = 2 -- Enable line numbers by default opt.number = true @@ -79,8 +80,8 @@ opt.backspace = "indent,eol,start" opt.laststatus = 2 opt.history = 200 -opt.encoding = "utf-8" -opt.fileencoding = "utf-8" +-- opt.encoding = "utf-8" +-- opt.fileencoding = "utf-8" opt.smartindent = true opt.scrolloff = 8 |