diff options
Diffstat (limited to 'nvim/.config')
50 files changed, 419 insertions, 450 deletions
diff --git a/nvim/.config/nvim/.gitignore b/nvim/.config/nvim/.gitignore index e033bc6..e033bc6 100644..100755 --- a/nvim/.config/nvim/.gitignore +++ b/nvim/.config/nvim/.gitignore diff --git a/nvim/.config/nvim/after/ftplugin/dbui.lua b/nvim/.config/nvim/after/ftplugin/dbui.lua index dccca2f..dccca2f 100644..100755 --- a/nvim/.config/nvim/after/ftplugin/dbui.lua +++ b/nvim/.config/nvim/after/ftplugin/dbui.lua diff --git a/nvim/.config/nvim/after/ftplugin/sql.lua b/nvim/.config/nvim/after/ftplugin/sql.lua index cb4775f..cb4775f 100644..100755 --- a/nvim/.config/nvim/after/ftplugin/sql.lua +++ b/nvim/.config/nvim/after/ftplugin/sql.lua diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 765c55a..8ee3981 100644..100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,31 +1,33 @@ +vim.g.maplocalleader = "," vim.g.mapleader = " " -vim.g.maplocalleader = " " -require("keymaps") -require("autocmds") -require("options") -require("terminal") -require("lsp") +local rocks_config = { + rocks_path = vim.env.HOME .. "/.local/share/nvim/rocks", +} -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" -if not vim.uv.fs_stat(lazypath) then - vim.fn.system { - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", - lazypath, - } -end +vim.g.rocks_nvim = rocks_config --- Add lazy to the `runtimepath`, this allows us to `require` it. ----@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) +local luarocks_path = { + vim.fs.joinpath(rocks_config.rocks_path, "share", "lua", "5.1", "?.lua"), + vim.fs.joinpath(rocks_config.rocks_path, "share", "lua", "5.1", "?", "init.lua"), +} +package.path = package.path .. ";" .. table.concat(luarocks_path, ";") --- Set up lazy, and load my `lua/plugins/` folder -require("lazy").setup({ import = "plugins" }, { - change_detection = { - notify = false, - }, -}) +local luarocks_cpath = { + vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.so"), + vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.so"), + -- Remove the dylib and dll paths if you do not need macos or windows support + vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.dylib"), + vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.dylib"), + vim.fs.joinpath(rocks_config.rocks_path, "lib", "lua", "5.1", "?.dll"), + vim.fs.joinpath(rocks_config.rocks_path, "lib64", "lua", "5.1", "?.dll"), +} +package.cpath = package.cpath .. ";" .. table.concat(luarocks_cpath, ";") + +vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "*", "*")) + +require "keymaps" +require "autocmds" +require "options" +require "terminal" +require "lsp" diff --git a/nvim/.config/nvim/lsp/bashls.lua b/nvim/.config/nvim/lsp/bashls.lua index ff1e16d..ff1e16d 100644..100755 --- a/nvim/.config/nvim/lsp/bashls.lua +++ b/nvim/.config/nvim/lsp/bashls.lua diff --git a/nvim/.config/nvim/lsp/clangd.lua b/nvim/.config/nvim/lsp/clangd.lua index ca25f94..ca25f94 100644..100755 --- a/nvim/.config/nvim/lsp/clangd.lua +++ b/nvim/.config/nvim/lsp/clangd.lua diff --git a/nvim/.config/nvim/lsp/lua_ls.lua b/nvim/.config/nvim/lsp/lua_ls.lua index 3ea54d9..3ea54d9 100644..100755 --- a/nvim/.config/nvim/lsp/lua_ls.lua +++ b/nvim/.config/nvim/lsp/lua_ls.lua diff --git a/nvim/.config/nvim/lua/autocmds.lua b/nvim/.config/nvim/lua/autocmds.lua index a14bd32..a14bd32 100644..100755 --- a/nvim/.config/nvim/lua/autocmds.lua +++ b/nvim/.config/nvim/lua/autocmds.lua diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua index 3d5337e..9b2937c 100644..100755 --- a/nvim/.config/nvim/lua/keymaps.lua +++ b/nvim/.config/nvim/lua/keymaps.lua @@ -1,69 +1,40 @@ -local set = vim.keymap.set +vim.keymap.set("n", "<leader>w", "<cmd>w<cr>", { desc = "Write buffer" }) -set("n", "<leader>w", "<cmd>w<cr>", { desc = "Write buffer" }) - -set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Show diagnostic [E]rror messages" }) - --- execute current file. TODO: think this can be smarter -set("n", "<leader>r", '<cmd>!"%:p"<cr>') +-- execute current file in shell +vim.keymap.set("n", "<leader>r", '<cmd>!"%:p"<cr>') -- ui navigation -set("n", "<m-j>", "<c-w><c-j>") -set("n", "<m-k>", "<c-w><c-k>") -set("n", "<m-l>", "<c-w><c-l>") -set("n", "<m-h>", "<c-w><c-h>") - -set("n", "<m-<>", "<c-w>5<") -set("n", "<m->>", "<c-w>5>") -set("n", "<m-+>", "<c-w>4+") -set("n", "<m-->", "<c-w>4-") +vim.keymap.set("n", "<c-j>", "<c-w><c-j>") +vim.keymap.set("n", "<c-k>", "<c-w><c-k>") +vim.keymap.set("n", "<c-l>", "<c-w><c-l>") +vim.keymap.set("n", "<c-h>", "<c-w><c-h>") -set("n", "<m-v>", "<cmd>vsplit<cr>") -set("n", "<m-s>", "<cmd>split<cr>") +vim.keymap.set("n", "<m-v>", "<cmd>vsplit<cr>") +vim.keymap.set("n", "<m-s>", "<cmd>split<cr>") -set("n", "<m-q>", "<cmd>q<cr>", { desc = "Quit window" }) - -set("n", "<m-t>", "<cmd>tabnew<cr>", { desc = "New Tab" }) -set("n", "<s-m-t>", "<cmd>tabclose<cr>", { desc = "Close Tab" }) -set("n", "<m-n>", "<cmd>tabnext<cr>", { desc = "Next Tab" }) -set("n", "<m-p>", "<cmd>tabprevious<cr>", { desc = "Previous Tab" }) - --- Toggle hlsearch if it's on, otherwise just do "enter" -set("n", "<cr>", function() - ---@diagnostic disable-next-line: undefined-field - if vim.opt.hlsearch:get() then - vim.cmd.nohl() - return "" - else - return "<cr>" - end -end, { expr = true }) +vim.keymap.set("n", "<m-q>", "<cmd>q<cr>", { desc = "Quit window" }) ---swap lines -set("n", "<c-j>", function() - if vim.opt.diff:get() then - vim.cmd [[normal! ]c]] - else - vim.cmd [[m .+1<CR>==]] - end -end) -set("n", "<c-k>", function() - if vim.opt.diff:get() then - vim.cmd [[normal! [c]] - else - vim.cmd [[m .-2<cr>==]] - end -end) +vim.keymap.set("n", "<m-t>", "<cmd>tabnew<cr>", { desc = "New Tab" }) +vim.keymap.set("n", "<s-m-t>", "<cmd>tabclose<cr>", { desc = "Close Tab" }) +vim.keymap.set("n", "<m-n>", "<cmd>tabnext<cr>", { desc = "Next Tab" }) +vim.keymap.set("n", "<m-p>", "<cmd>tabprevious<cr>", { desc = "Previous Tab" }) --lsp -set("n", "grt", vim.lsp.buf.type_definition, { desc = "Go to type definition" }) -set("n", "gd", vim.lsp.buf.definition, { buffer = 0 }) -set("n", "gD", vim.lsp.buf.declaration, { buffer = 0 }) +vim.keymap.set("n", "grt", vim.lsp.buf.type_definition, { desc = "Go to type definition" }) +vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = 0 }) +vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = 0 }) + --ui + local toggle = function(obj) return function() obj.enable(not obj.is_enabled()) end end -set("n", "<leader>uh", toggle(vim.lsp.inlay_hint), { desc = "Toggle inlay hints" }) -set("n", "<leader>ud", toggle(vim.diagnostic), { desc = "Toggle inlay hints" }) + +vim.keymap.set("n", "<leader>th", toggle(vim.lsp.inlay_hint), { desc = "Inlay hints" }) +vim.keymap.set("n", "<leader>td", toggle(vim.diagnostic), { desc = "Diagnostics" }) + +vim.keymap.set("n", "<leader>tn", function() + vim.opt.relativenumber = not vim.o.rnu +end, { desc = "Number" }) diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua index bbe1a8f..bbe1a8f 100644..100755 --- a/nvim/.config/nvim/lua/lsp.lua +++ b/nvim/.config/nvim/lua/lsp.lua diff --git a/nvim/.config/nvim/lua/netrw.lua b/nvim/.config/nvim/lua/netrw.lua index e69de29..e69de29 100644..100755 --- a/nvim/.config/nvim/lua/netrw.lua +++ b/nvim/.config/nvim/lua/netrw.lua diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua index 087b599..443d136 100644..100755 --- a/nvim/.config/nvim/lua/options.lua +++ b/nvim/.config/nvim/lua/options.lua @@ -5,20 +5,20 @@ vim.opt.mouse = "a" vim.opt.clipboard = "unnamedplus" -- Sync clipboard between OS and Neovim. -vim.opt.breakindent = true -- Enable break indent +vim.opt.breakindent = true -- Enable break indent -vim.opt.undofile = true -- Save undo history +vim.opt.undofile = true -- Save undo history -vim.opt.ignorecase = true -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term vim.opt.smartcase = true vim.opt.signcolumn = "yes" -- Keep signcolumn on by default -vim.opt.updatetime = 250 -- Decrease update time +vim.opt.updatetime = 250 -- Decrease update time -vim.opt.timeoutlen = 300 -- Decrease mapped sequence wait time +vim.opt.timeoutlen = 300 -- Decrease mapped sequence wait time -vim.opt.splitright = true -- Configure how new splits should be opened +vim.opt.splitright = true -- Configure how new splits should be opened vim.opt.splitbelow = true vim.opt.list = true -- Sets how neovim will display certain whitespace characters in the editor. @@ -28,7 +28,7 @@ vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } vim.opt.cursorline = true -- Show which line your cursor is on -vim.opt.scrolloff = 10 -- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 -- Minimal number of screen lines to keep above and below the cursor. vim.opt.sidescrolloff = 5 vim.opt.hlsearch = true -- Set highlight on search @@ -38,4 +38,11 @@ vim.opt.background = "dark" vim.opt.laststatus = 3 -vim.diagnostic.config({ virtual_text = true, virtual_line = false }) +vim.opt.completeopt = { "menu", "menuone", "noselect" } +vim.opt.shortmess:append "c" + +vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" + +vim.diagnostic.config { virtual_text = true, virtual_line = false } + +vim.cmd "colorscheme poimandres" diff --git a/nvim/.config/nvim/lua/plugins/auto-session.lua b/nvim/.config/nvim/lua/plugins/auto-session.lua new file mode 100644 index 0000000..a8074a8 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/auto-session.lua @@ -0,0 +1,3 @@ +require("auto-session").setup { + suppressed_dirs = { "~/", "~/Downloads", "/" }, +} diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/.config/nvim/lua/plugins/autopairs.lua index b97128c..447e610 100644..100755 --- a/nvim/.config/nvim/lua/plugins/autopairs.lua +++ b/nvim/.config/nvim/lua/plugins/autopairs.lua @@ -1,13 +1,6 @@ -return { - "windwp/nvim-autopairs", - event = "InsertEnter", - -- Optional dependency - dependencies = { "hrsh7th/nvim-cmp" }, - config = function() - require("nvim-autopairs").setup {} - -- Automatically add `(` after selecting a function or method - local cmp_autopairs = require "nvim-autopairs.completion.cmp" - local cmp = require "cmp" - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) - end, -} +require("nvim-autopairs").setup {} + +-- Automatically add `(` after selecting a function or method +local cmp_autopairs = require "nvim-autopairs.completion.cmp" +local cmp = require "cmp" +cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) diff --git a/nvim/.config/nvim/lua/plugins/better-escape.lua b/nvim/.config/nvim/lua/plugins/better-escape.lua new file mode 100644 index 0000000..387dfd1 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/better-escape.lua @@ -0,0 +1 @@ +require("better_escape").setup() diff --git a/nvim/.config/nvim/lua/plugins/bqf.lua b/nvim/.config/nvim/lua/plugins/bqf.lua index 92630a8..540c57d 100644..100755 --- a/nvim/.config/nvim/lua/plugins/bqf.lua +++ b/nvim/.config/nvim/lua/plugins/bqf.lua @@ -1 +1 @@ -return { "kevinhwang91/nvim-bqf", ft = "qf" } +require("bqf").setup {} diff --git a/nvim/.config/nvim/lua/plugins/celluar-automaton.lua b/nvim/.config/nvim/lua/plugins/celluar-automaton.lua new file mode 100755 index 0000000..e69de29 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/celluar-automaton.lua diff --git a/nvim/.config/nvim/lua/plugins/celluar.lua b/nvim/.config/nvim/lua/plugins/celluar.lua deleted file mode 100644 index f90161e..0000000 --- a/nvim/.config/nvim/lua/plugins/celluar.lua +++ /dev/null @@ -1 +0,0 @@ -return { "Eandrju/cellular-automaton.nvim" } diff --git a/nvim/.config/nvim/lua/plugins/cmake.lua b/nvim/.config/nvim/lua/plugins/cmake.lua index 4e8c610..190b729 100644..100755 --- a/nvim/.config/nvim/lua/plugins/cmake.lua +++ b/nvim/.config/nvim/lua/plugins/cmake.lua @@ -1,4 +1,3 @@ -return {} -- if vim.loop.os_uname().sysname ~= "Darwin" then -- return { -- "daniilrozanov/cmake.nvim", diff --git a/nvim/.config/nvim/lua/plugins/cmp.lua b/nvim/.config/nvim/lua/plugins/cmp.lua index 6c4c89e..1ce382a 100644..100755 --- a/nvim/.config/nvim/lua/plugins/cmp.lua +++ b/nvim/.config/nvim/lua/plugins/cmp.lua @@ -1,88 +1,68 @@ -return { - "hrsh7th/nvim-cmp", - event = "InsertEnter", - priority = 100, - dependencies = { - "onsails/lspkind.nvim", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-path", - "hrsh7th/cmp-buffer", - { - "L3MON4D3/LuaSnip", - build = "make install_jsregexp", - dependencies = { "rafamadriz/friendly-snippets" }, - }, - "saadparwaiz1/cmp_luasnip", - }, - config = function() - vim.opt.completeopt = { "menu", "menuone", "noselect" } - vim.opt.shortmess:append "c" - local lspkind = require "lspkind" - lspkind.init {} +local lspkind = require "lspkind" +lspkind.init {} - local luasnip = require "luasnip" - luasnip.config.setup {} - require("luasnip.loaders.from_vscode").lazy_load() +local luasnip = require "luasnip" +luasnip.config.setup {} - local cmp = require "cmp" +require("luasnip.loaders.from_vscode").lazy_load() - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = "menu,menuone,noinsert" }, - mapping = cmp.mapping.preset.insert { - -- ["<C-n>"] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert }, - -- ["<C-p>"] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert }, - ["<C-y>"] = cmp.mapping( - cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Insert, - select = true, - }, - { "i", "c" } - ), - ["<C-b>"] = cmp.mapping.scroll_docs(-4), - ["<C-f>"] = cmp.mapping.scroll_docs(4), - -- ["<C-y>"] = cmp.mapping.confirm { select = true }, - -- -- Will move you to the right of each of the snippet's expansion locations. - ["<C-l>"] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { "i", "s" }), - -- Will move you to the left of each of the snippet's expansion locations. - ["<C-h>"] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { "i", "s" }), - }, - sources = { - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "path" }, - { name = "buffer" }, - }, - } +local cmp = require "cmp" - -- Setup up vim-dadbod - cmp.setup.filetype({ "sql" }, { - sources = { - { name = "vim-dadbod-completion" }, - { name = "buffer" }, +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = "menu,menuone,noinsert" }, + mapping = cmp.mapping.preset.insert { + -- ["<C-n>"] = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Insert }, + -- ["<C-p>"] = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Insert }, + ["<C-y>"] = cmp.mapping( + cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Insert, + select = true, }, - }) + { "i", "c" } + ), + ["<C-b>"] = cmp.mapping.scroll_docs(-4), + ["<C-f>"] = cmp.mapping.scroll_docs(4), + -- ["<C-y>"] = cmp.mapping.confirm { select = true }, + -- -- Will move you to the right of each of the snippet's expansion locations. + ["<C-l>"] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { "i", "s" }), + -- Will move you to the left of each of the snippet's expansion locations. + ["<C-h>"] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { "i", "s" }), + }, + sources = { + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "path" }, + { name = "buffer" }, + }, +} - luasnip.config.set_config { - history = false, - updateevents = "TextChanged,TextChangedI", - } +-- Setup up vim-dadbod +-- cmp.setup.filetype({ "sql" }, { +-- sources = { +-- { name = "vim-dadbod-completion" }, +-- { name = "buffer" }, +-- }, +-- }) - for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/custom/snippets/*.lua", true)) do - loadfile(ft_path)() - end - end, +luasnip.config.set_config { + history = false, + updateevents = "TextChanged,TextChangedI", } + +for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/custom/snippets/*.lua", true)) do + loadfile(ft_path)() +end diff --git a/nvim/.config/nvim/lua/plugins/comment.lua b/nvim/.config/nvim/lua/plugins/comment.lua index 46f5032..a844323 100644..100755 --- a/nvim/.config/nvim/lua/plugins/comment.lua +++ b/nvim/.config/nvim/lua/plugins/comment.lua @@ -1 +1 @@ -return { 'numToStr/Comment.nvim' } +require('Comment').setup() diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua index 5220a84..83fd33d 100644..100755 --- a/nvim/.config/nvim/lua/plugins/conform.lua +++ b/nvim/.config/nvim/lua/plugins/conform.lua @@ -8,49 +8,10 @@ vim.api.nvim_create_autocmd("BufWritePre", { end, }) -return { - "stevearc/conform.nvim", - opts = { - formatters_by_ft = { - lua = { "stylua" }, - cpp = { "clang-format" }, - c = { "clang-format" }, - }, - } +require("conform").setup { + formatters_by_ft = { + lua = { "stylua" }, + cpp = { "clang-format" }, + c = { "clang-format" }, + }, } --- { --- config = function() --- vim.api.nvim_create_autocmd("LspAttach", { --- callback = function(args) --- local bufnr = args.buf --- local client = assert(vim.lsp.get_client_by_id(args.data.client_id), "must have valid client") --- local builtin = require "telescope.builtin" --- --- vim.opt_local.omnifunc = "v:lua.vim.lsp.omnifunc" --- vim.keymap.set("n", "gd", vim.lsp.buf.definition, { buffer = 0 }) --- vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { buffer = 0 }) --- vim.keymap.set("n", "gT", vim.lsp.buf.type_definition, { buffer = 0 }) --- vim.keymap.set("n", "<leader>ls", builtin.lsp_document_symbols, { desc = "[D]ocument [S]ymbols" }) --- vim.keymap.set("n", "<leader>lw", builtin.lsp_dynamic_workspace_symbols, { desc = "[W]orkspace Symbols" }) --- -- nmap("gd", builtin.lsp_definitions, { desc = "[G]oto [D]efinition" }) --- -- nmap("gr", builtin.lsp_references, { desc = "[G]oto [R]eferences" }) --- --- local filetype = vim.bo[bufnr].filetype --- if disable_semantic_tokens[filetype] then --- client.server_capabilities.semanticTokensProvider = nil --- end --- --- if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then --- vim.keymap.set("n", "<leader>Th", function() --- vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) --- end, { desc = "[T]oggle Inlay [H]ints" }) --- end --- end, --- }) --- --- -- Autoformatting Setup --- require("conform").setup { --- } --- --- end, --- } diff --git a/nvim/.config/nvim/lua/plugins/dadbod.lua b/nvim/.config/nvim/lua/plugins/dadbod.lua deleted file mode 100644 index 8411fa5..0000000 --- a/nvim/.config/nvim/lua/plugins/dadbod.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "kristijanhusak/vim-dadbod-ui", - dependencies = { - { "tpope/vim-dadbod", lazy = true }, - { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, - }, - cmd = { - "DBUI", - "DBUIToggle", - "DBUIAddConnection", - "DBUIFindBuffer", - }, - init = function() - vim.g.db_ui_use_nerd_fonts = 1 - end, -} diff --git a/nvim/.config/nvim/lua/plugins/fidget.lua b/nvim/.config/nvim/lua/plugins/fidget.lua index 2d70394..945f564 100644..100755 --- a/nvim/.config/nvim/lua/plugins/fidget.lua +++ b/nvim/.config/nvim/lua/plugins/fidget.lua @@ -1,6 +1 @@ -return { - "j-hui/fidget.nvim", - opts = { - -- options - }, -} +require("fidget").setup {} diff --git a/nvim/.config/nvim/lua/plugins/gitsigns.lua b/nvim/.config/nvim/lua/plugins/gitsigns.lua index 8856fae..8b99647 100644..100755 --- a/nvim/.config/nvim/lua/plugins/gitsigns.lua +++ b/nvim/.config/nvim/lua/plugins/gitsigns.lua @@ -1,65 +1,83 @@ -return { - "lewis6991/gitsigns.nvim", - config = function() +require("gitsigns").setup { + signs = { + add = { text = "┃" }, + change = { text = "┃" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "┆" }, + }, + signs_staged = { + add = { text = "┃" }, + change = { text = "┃" }, + delete = { text = "_" }, + topdelete = { text = "‾" }, + changedelete = { text = "~" }, + untracked = { text = "┆" }, + }, + on_attach = function(bufnr) local gitsigns = require "gitsigns" - local on_attach = function(bufnr) - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + + -- Navigation + map("n", "]c", function() + if vim.wo.diff then + vim.cmd.normal { "]c", bang = true } + else + gitsigns.nav_hunk "next" + end + end) + + map("n", "[c", function() + if vim.wo.diff then + vim.cmd.normal { "[c", bang = true } + else + gitsigns.nav_hunk "prev" end + end) - -- Navigation - map("n", "]c", function() - if vim.wo.diff then - vim.cmd.normal { "]c", bang = true } - else - gitsigns.nav_hunk "next" - end - end) + -- Actions + map("n", "<leader>gs", gitsigns.stage_hunk, { desc = "Stage hunk" }) + map("n", "<leader>gr", gitsigns.reset_hunk, { desc = "Reset hunk" }) - map("n", "[c", function() - if vim.wo.diff then - vim.cmd.normal { "[c", bang = true } - else - gitsigns.nav_hunk "prev" - end - end) + map("v", "<leader>gs", function() + gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" } + end) - -- Actions - map("n", "<leader>gs", gitsigns.stage_hunk, { desc = "Stage hunk" }) - map("n", "<leader>gr", gitsigns.reset_hunk, { desc = "Reset hunk" }) - map("v", "<leader>gs", function() - gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" } - end, { desc = "Stage hunk" }) - map("v", "<leader>gr", function() - gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" } - end, { desc = "Reset hunk" }) - map("n", "<leader>gS", gitsigns.stage_buffer, { desc = "Stage buffer" }) - map("n", "<leader>gu", gitsigns.undo_stage_hunk, { desc = "Undo stage hunk" }) - map("n", "<leader>gR", gitsigns.reset_buffer, { desc = "Reset buffer" }) - map("n", "<leader>gp", gitsigns.preview_hunk, { desc = "Preview hunk" }) - map("n", "<leader>gb", function() - gitsigns.blame_line { full = true } - end, { desc = "Blame line" }) - map("n", "<leader>Tb", gitsigns.toggle_current_line_blame, { desc = "Toggle blame line" }) - map("n", "<leader>Td", gitsigns.toggle_deleted, { desc = "Toggle deleted" }) - map("n", "<leader>gd", gitsigns.diffthis, { desc = "Diff this" }) - map("n", "<leader>gD", function() - gitsigns.diffthis "~" - end, { desc = "Diff this ~" }) - end + map("v", "<leader>gr", function() + gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" } + end) + + map("n", "<leader>gS", gitsigns.stage_buffer, { desc = "Stage buffer" }) + map("n", "<leader>gR", gitsigns.reset_buffer, { desc = "Reset buffer" }) + map("n", "<leader>gp", gitsigns.preview_hunk, { desc = "Preview hunk" }) + map("n", "<leader>gi", gitsigns.preview_hunk_inline, { desc = "Preview hunk inline" }) + + map("n", "<leader>gb", function() + gitsigns.blame_line { full = true } + end, { desc = "Blame line full" }) + + map("n", "<leader>gd", gitsigns.diffthis, { desc = "Diff" }) + + map("n", "<leader>gD", function() + gitsigns.diffthis "~" + end, { desc = "Diff ~" }) + + map("n", "<leader>gQ", function() + gitsigns.setqflist "all" + end, { desc = "Setqflist all" }) + map("n", "<leader>gq", gitsigns.setqflist, { desc = "Setqflist" }) + + -- Toggles + map("n", "<leader>tb", gitsigns.toggle_current_line_blame, { desc = "Toggle current line blame" }) + map("n", "<leader>tw", gitsigns.toggle_word_diff, { desc = "Toggle word diff" }) - gitsigns.setup { - signs = { - add = { text = "+" }, - change = { text = "~" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - }, - on_attach = on_attach, - } + -- Text object + map({ "o", "x" }, "ih", gitsigns.select_hunk, { desc = "Select hunk" }) end, } diff --git a/nvim/.config/nvim/lua/plugins/harpoon.lua b/nvim/.config/nvim/lua/plugins/harpoon.lua index a464808..dcf3ee2 100644..100755 --- a/nvim/.config/nvim/lua/plugins/harpoon.lua +++ b/nvim/.config/nvim/lua/plugins/harpoon.lua @@ -1,32 +1,25 @@ -return { - "ThePrimeagen/harpoon", - branch = "harpoon2", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local harpoon = require("harpoon") - harpoon:setup() - - vim.keymap.set("n", "<leader>a", function() - harpoon:list():add() - end, { desc = "Add buffer to harpoon" }) - - vim.keymap.set("n", "<leader><leader>", function() - harpoon.ui:toggle_quick_menu(harpoon:list()) - end, { desc = "Toggle harpoon menu" }) - - vim.keymap.set("n", "<c-n>", function() - require("harpoon"):list():next() - end, { desc = "Goto next harpooned" }) - - vim.keymap.set("n", "<c-p>", function() - require("harpoon"):list():prev() - end, { desc = "Goto prev harpooned" }) - - -- Set <space>1..<space>5 be my shortcuts to moving to the files - for _, idx in ipairs { 1, 2, 3, 4, 5 } do - vim.keymap.set("n", string.format("<leader>%d", idx), function() - harpoon:list():select(idx) - end, { desc = string.format("Goto %d harpooned", idx) }) - end - end, -} +-- local harpoon = require "harpoon" +-- harpoon:setup() +-- +-- vim.keymap.set("n", "<leader>a", function() +-- harpoon:list():add() +-- end, { desc = "Add buffer to harpoon" }) +-- +-- vim.keymap.set("n", "<leader><leader>", function() +-- harpoon.ui:toggle_quick_menu(harpoon:list()) +-- end, { desc = "Toggle harpoon menu" }) +-- +-- vim.keymap.set("n", "<c-n>", function() +-- require("harpoon"):list():next() +-- end, { desc = "Goto next harpooned" }) +-- +-- vim.keymap.set("n", "<c-p>", function() +-- require("harpoon"):list():prev() +-- end, { desc = "Goto prev harpooned" }) +-- +-- -- Set <space>1..<space>5 be my shortcuts to moving to the files +-- for _, idx in ipairs { 1, 2, 3, 4, 5 } do +-- vim.keymap.set("n", string.format("<leader>%d", idx), function() +-- harpoon:list():select(idx) +-- end, { desc = string.format("Goto %d harpooned", idx) }) +-- end diff --git a/nvim/.config/nvim/lua/plugins/lazydev.lua b/nvim/.config/nvim/lua/plugins/lazydev.lua index 82739c2..0dfa477 100644..100755 --- a/nvim/.config/nvim/lua/plugins/lazydev.lua +++ b/nvim/.config/nvim/lua/plugins/lazydev.lua @@ -1,10 +1,6 @@ -return { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = "${3rd}/luv/library", words = { "vim%.uv" } }, - }, +require("lazydev").setup { + library = { + -- Load luvit types when the `vim.uv` word is found + { path = "${3rd}/luv/library", words = { "vim%.uv" } }, }, } diff --git a/nvim/.config/nvim/lua/plugins/leap.lua b/nvim/.config/nvim/lua/plugins/leap.lua index 649f96e..97dcc63 100644..100755 --- a/nvim/.config/nvim/lua/plugins/leap.lua +++ b/nvim/.config/nvim/lua/plugins/leap.lua @@ -1,9 +1,3 @@ -return { - "ggandor/leap.nvim", - lazy = false, --TODO: lazy - config = function() - vim.keymap.set("n", "s", "<Plug>(leap)", { desc = "Leap" }) - vim.keymap.set("n", "S", "<Plug>(leap-from-window)", { desc = "Leap other window" }) - require("leap").setup { safe_labels = {} } - end, -} +require("leap").setup { safe_labels = {} } +vim.keymap.set("n", "s", "<Plug>(leap)", { desc = "Leap" }) +vim.keymap.set("n", "S", "<Plug>(leap-from-window)", { desc = "Leap other window" }) diff --git a/nvim/.config/nvim/lua/plugins/leetcode.lua b/nvim/.config/nvim/lua/plugins/leetcode.lua new file mode 100644 index 0000000..1c6d550 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/leetcode.lua @@ -0,0 +1 @@ +require("leetcode").setup {} diff --git a/nvim/.config/nvim/lua/plugins/lualine.lua b/nvim/.config/nvim/lua/plugins/lualine.lua index 661f7fc..c200066 100644..100755 --- a/nvim/.config/nvim/lua/plugins/lualine.lua +++ b/nvim/.config/nvim/lua/plugins/lualine.lua @@ -1,5 +1 @@ -return { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - config = true, -} +require("lualine").setup {} diff --git a/nvim/.config/nvim/lua/plugins/mini.lua b/nvim/.config/nvim/lua/plugins/mini.lua index 654222e..cb1d50a 100644..100755 --- a/nvim/.config/nvim/lua/plugins/mini.lua +++ b/nvim/.config/nvim/lua/plugins/mini.lua @@ -1,8 +1 @@ -return { -- Collection of various small independent plugins/modules - "echasnovski/mini.nvim", - dependencies = "nvim-treesitter/nvim-treesitter", - config = function() - -- Better Around/Inside textobjects - require("mini.ai").setup { n_lines = 500 } - end, -} +require("mini.ai").setup { n_lines = 500 } diff --git a/nvim/.config/nvim/lua/plugins/neogit.lua b/nvim/.config/nvim/lua/plugins/neogit.lua new file mode 100644 index 0000000..3371247 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/neogit.lua @@ -0,0 +1,4 @@ +git = require "neogit" +git.setup {} + +vim.keymap.set("n", "<leader>gg", git.open, { desc = "Neogit" }) diff --git a/nvim/.config/nvim/lua/plugins/neorg.lua b/nvim/.config/nvim/lua/plugins/neorg.lua index 455b80d..3a3ecb1 100644..100755 --- a/nvim/.config/nvim/lua/plugins/neorg.lua +++ b/nvim/.config/nvim/lua/plugins/neorg.lua @@ -1,22 +1,14 @@ -return {} --- return { --- "nvim-neorg/neorg", --- lazy = false, --- version = "*", --- config = function() --- require("neorg").setup { --- load = { --- ["core.defaults"] = {}, --- ["core.concealer"] = {}, --- ["core.dirman"] = { --- config = { --- workspaces = { --- notes = "~/notes" --- }, --- default_workspace = "notes" --- } --- }, --- } --- } --- end, --- } +require("neorg").setup { + load = { + ["core.defaults"] = {}, + ["core.concealer"] = {}, + ["core.dirman"] = { + config = { + workspaces = { + notes = "~/notes" + }, + default_workspace = "notes" + } + }, + } +} diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua new file mode 100644 index 0000000..dbd8197 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/oil.lua @@ -0,0 +1,23 @@ +require("oil").setup { + keymaps = { + ["g?"] = { "actions.show_help", mode = "n" }, + ["<CR>"] = "actions.select", + ["<C-v>"] = { "actions.select", opts = { vertical = true } }, + ["<C-s>"] = { "actions.select", opts = { horizontal = true } }, + ["<C-t>"] = { "actions.select", opts = { tab = true } }, + ["<C-p>"] = "actions.preview", + ["<C-c>"] = { "actions.close", mode = "n" }, + ["<C-m>"] = "actions.refresh", + ["-"] = { "actions.parent", mode = "n" }, + ["_"] = { "actions.open_cwd", mode = "n" }, + ["`"] = { "actions.cd", mode = "n" }, + ["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" }, + ["gs"] = { "actions.change_sort", mode = "n" }, + ["gx"] = "actions.open_external", + ["g."] = { "actions.toggle_hidden", mode = "n" }, + ["g\\"] = { "actions.toggle_trash", mode = "n" }, + }, + use_default_keymaps = false, +} + +vim.keymap.set("n", "<leader>e", "<cmd>Oil<cr>", { desc = "Open file explorer" }) diff --git a/nvim/.config/nvim/lua/plugins/poimandres.lua b/nvim/.config/nvim/lua/plugins/poimandres.lua new file mode 100755 index 0000000..4b43ea7 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/poimandres.lua @@ -0,0 +1 @@ +require('poimandres').setup { } diff --git a/nvim/.config/nvim/lua/plugins/rest.lua b/nvim/.config/nvim/lua/plugins/rest.lua new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/rest.lua diff --git a/nvim/.config/nvim/lua/plugins/sort.lua b/nvim/.config/nvim/lua/plugins/sort.lua index f5483e6..4ee0618 100644..100755 --- a/nvim/.config/nvim/lua/plugins/sort.lua +++ b/nvim/.config/nvim/lua/plugins/sort.lua @@ -1 +1 @@ -return { "sQVe/sort.nvim" } + require("sort").setup({ }) diff --git a/nvim/.config/nvim/lua/plugins/substitude.lua b/nvim/.config/nvim/lua/plugins/substitude.lua index 4e2c02f..7615c91 100644..100755 --- a/nvim/.config/nvim/lua/plugins/substitude.lua +++ b/nvim/.config/nvim/lua/plugins/substitude.lua @@ -1,11 +1,5 @@ -return { - "gbprod/substitute.nvim", - config = function() - require("substitute").setup {} +require("substitute").setup {} - vim.keymap.set("n", ",", require("substitute").operator, { noremap = true }) - vim.keymap.set("n", ",,", require("substitute").line, { noremap = true }) - -- vim.keymap.set("n", "", require("substitute").eol, { noremap = true }) - vim.keymap.set("x", ",", require("substitute").visual, { noremap = true }) - end, -} +vim.keymap.set("n", ";", require("substitute").operator, { noremap = true }) +-- vim.keymap.set("n", ",,", require("substitute").line, { noremap = true }) +vim.keymap.set("x", ";", require("substitute").visual, { noremap = true }) diff --git a/nvim/.config/nvim/lua/plugins/surround.lua b/nvim/.config/nvim/lua/plugins/surround.lua index e3c3c6c..bd6daf2 100644..100755 --- a/nvim/.config/nvim/lua/plugins/surround.lua +++ b/nvim/.config/nvim/lua/plugins/surround.lua @@ -1,6 +1 @@ -return { - "kylechui/nvim-surround", - event = { "BufReadPre", "BufNewFile" }, - version = "*", - config = true, -} +require("nvim-surround").setup {} diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index a8d6484..8644006 100644..100755 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -1,7 +1,7 @@ return { "nvim-telescope/telescope.nvim", event = "VimEnter", - branch = "0.1.x", + branch = "0.1.8", dependencies = { "nvim-lua/plenary.nvim", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, @@ -14,10 +14,6 @@ return { extensions = { fzf = {}, wrap_results = true, - history = { - -- path = vim.fs.joinpath(data, "telescope_history.sqlite3"), - limit = 100, - }, ["ui-select"] = { require("telescope.themes").get_dropdown(), }, diff --git a/nvim/.config/nvim/lua/plugins/textcase.lua b/nvim/.config/nvim/lua/plugins/textcase.lua index e335b38..e335b38 100644..100755 --- a/nvim/.config/nvim/lua/plugins/textcase.lua +++ b/nvim/.config/nvim/lua/plugins/textcase.lua diff --git a/nvim/.config/nvim/lua/plugins/themes.lua b/nvim/.config/nvim/lua/plugins/themes.lua deleted file mode 100644 index 0f9ca03..0000000 --- a/nvim/.config/nvim/lua/plugins/themes.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - { "ellisonleao/gruvbox.nvim", priority = 1000, config = function() - require("gruvbox").setup({}) - vim.cmd([[colorscheme gruvbox]]) - end - }, -} diff --git a/nvim/.config/nvim/lua/plugins/todo-comments.lua b/nvim/.config/nvim/lua/plugins/todo-comments.lua index 4b46f89..4b46f89 100644..100755 --- a/nvim/.config/nvim/lua/plugins/todo-comments.lua +++ b/nvim/.config/nvim/lua/plugins/todo-comments.lua diff --git a/nvim/.config/nvim/lua/plugins/toggleterm.lua b/nvim/.config/nvim/lua/plugins/toggleterm.lua index 7f20237..7f20237 100644..100755 --- a/nvim/.config/nvim/lua/plugins/toggleterm.lua +++ b/nvim/.config/nvim/lua/plugins/toggleterm.lua diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua index 9e01e7d..695dd9b 100644..100755 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -8,19 +8,19 @@ return { ensure_installed = { "bash", "c", + "cmake", + "cpp", "diff", "html", + "http", + "json", "lua", "luadoc", - "json", "markdown", + "proto", + "query", "vim", "vimdoc", - "cpp", - "cmake", - "query", - "http", - "proto", "xml", }, highlight = { enable = true }, diff --git a/nvim/.config/nvim/lua/plugins/which-key.lua b/nvim/.config/nvim/lua/plugins/which-key.lua index 42ebe43..72161bf 100644..100755 --- a/nvim/.config/nvim/lua/plugins/which-key.lua +++ b/nvim/.config/nvim/lua/plugins/which-key.lua @@ -1,24 +1,11 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - opts = { - -- TODO: move this to where mappings created - spec = { - { "<leader>f", desc = "Find" }, - { "<leader>T", desc = "Toggle options" }, - { "<leader>t", desc = "ToggleTerm" }, - { "<leader>g", desc = "Git" }, - { "<leader>l", desc = "LSP" }, - { "<leader><tab>", desc = "Tab pages" }, - } - }, - keys = { - { - "<leader>?", - function() - require("which-key").show({ global = false }) - end, - desc = "Buffer Local Keymaps (which-key)", - }, - }, +local wk = require "which-key" + +wk.setup {} + +wk.add { + { "<leader><tab>", group = "Tab pages" }, + { "<leader>f", group = "Find" }, + { "<leader>g", group = "Git" }, + { "<leader>l", group = "LSP" }, + { "<leader>t", group = "Toggle" }, } diff --git a/nvim/.config/nvim/lua/plugins/zen-mode.lua b/nvim/.config/nvim/lua/plugins/zen-mode.lua new file mode 100644 index 0000000..f857733 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/zen-mode.lua @@ -0,0 +1,5 @@ +zen = require "zen-mode" + +zen.setup {} + +vim.keymap.set("n", "<leader>tz", zen.toggle, { desc = "Zen mode" }) diff --git a/nvim/.config/nvim/lua/terminal.lua b/nvim/.config/nvim/lua/terminal.lua index 2327a34..2327a34 100644..100755 --- a/nvim/.config/nvim/lua/terminal.lua +++ b/nvim/.config/nvim/lua/terminal.lua diff --git a/nvim/.config/nvim/rocks.toml b/nvim/.config/nvim/rocks.toml new file mode 100644 index 0000000..ac5fe83 --- /dev/null +++ b/nvim/.config/nvim/rocks.toml @@ -0,0 +1,93 @@ +[rocks] + +[plugins] +"rocks.nvim" = "2.45.0" +"rocks-git.nvim" = "2.5.3" +"rocks-config.nvim" = "3.1.1" +"rocks-lazy.nvim" = "1.2.0" +"rocks-dev.nvim" = "1.8.0" +"rocks-treesitter.nvim" = "1.3.0" + +"auto-hlsearch.nvim" = { version = "1.1.0", event = "CmdlineEnter" } +"better-escape.nvim" = "2.3.3" +"cellular-automaton.nvim" = "scm" +"comment.nvim" = "0.8.0" +"conform.nvim" = "9.0.0" +"diffview.nvim" = "scm" +"gitsigns.nvim" = "1.0.2" +"kanagawa.nvim" = "scm" +"lazydev.nvim" = {version = "1.9.0", ft = "lua"} +"leap.nvim" = "scm" +"lspkind.nvim" = "scm" +"lualine.nvim" = "scm" +"mini.ai" = "0.16.0" +"oil.nvim" = "2.15.0" +"repeat.vim" = "1.2" +"rest.nvim" = "3.13.0" +"substitute.nvim" = "2.0.0" +"todo-comments.nvim" = "1.4.0" +"toggleterm.nvim" = "2.13.1" +"which-key.nvim" = "3.17.0" +auto-session = "2.5.1" +cmp-buffer = "scm" +cmp-git = "scm" +cmp-nvim-lsp = "scm" +cmp-path = "scm" +cmp_luasnip = "scm" +friendly-snippets = "scm" +harpoon = "scm" +luasnip = "2.4.0" +neogit = "2.0.0" +neorg = {version = "9.3.0", ft = "norg"} +neorg-conceal-wrap = "1.0.1" +nvim-autopairs = { version = "scm", event = "InsertEnter" } +nvim-bqf = { version = "1.1.1", ft = "qf" } +nvim-cmp = { version = "scm", event = "InsertEnter" } +nvim-dap = "0.10.0" +nvim-dap-ui = "4.0.0" +nvim-dap-virtual-text = "scm" +nvim-treesitter-textobjects = "scm" +nvim-web-devicons = "0.100" +telescope = "0.6.0" +vim-cool = { git = "romainl/vim-cool" } +vim-startuptime = "4.5.0" +"zen-mode.nvim" = "1.4.0" + +tree-sitter-bash = "scm" +tree-sitter-c = "scm" +tree-sitter-cmake = "scm" +tree-sitter-comment = "0.0.31" +tree-sitter-cpp = "scm" +tree-sitter-css = "0.0.38" +tree-sitter-diff = "scm" +tree-sitter-ecma = "0.0.30" +tree-sitter-gnuplot = "0.0.30" +tree-sitter-html = "0.0.36" +tree-sitter-http = "scm" +tree-sitter-jsdoc = "0.0.35" +tree-sitter-json = "0.0.36" +tree-sitter-lua = "0.0.35" +tree-sitter-luadoc = "0.0.29" +tree-sitter-markdown = "scm" +tree-sitter-nix = "0.0.59" +tree-sitter-query = "scm" +tree-sitter-scheme = "0.0.35" +tree-sitter-sql = "0.0.41" +tree-sitter-toml = "0.0.31" +tree-sitter-vim = "0.0.34" +tree-sitter-vimdoc = "0.0.34" +tree-sitter-xml = "scm" +tree-sitter-yaml = "0.0.36" +tree-sitter-make = "0.0.30" +"gruvbox.nvim" = "2.0.0" + +[plugins."poimandres.nvim" ] +git = "olivercederborg/poimandres.nvim" +rev = "v0.6.0" + +[plugins."nvim-surround" ] +git = "kylechui/nvim-surround" +rev = "v3.1.2" + +[plugins."sort.nvim" ] +git = "sQVe/sort.nvim" diff --git a/nvim/.config/nvim/stylua.toml b/nvim/.config/nvim/stylua.toml index 364ef9c..364ef9c 100644..100755 --- a/nvim/.config/nvim/stylua.toml +++ b/nvim/.config/nvim/stylua.toml |