From 1c8d7d92a826f153cd3eae275199f65e3f72fdd9 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Fri, 22 Mar 2024 12:52:52 +0200 Subject: [PATCH] chore: add new plugins --- after/ftplugin/markdown.lua | 3 ++ after/plugin/snips/lua.lua | 2 +- lazy-lock.json | 72 ++++++++++++++++++-------------- lua/plugins/cmp.lua | 32 ++++++++++++-- lua/plugins/dap.lua | 30 +++---------- lua/plugins/fugitive.lua | 1 + lua/plugins/garbage_day.lua | 8 ++++ lua/plugins/gitignore.lua | 17 ++++++++ lua/plugins/lualine.lua | 44 +++++++++++-------- lua/plugins/luasnip.lua | 2 +- lua/plugins/neodev.lua | 5 ++- lua/plugins/neogit.lua | 1 - lua/plugins/null_ls.lua | 5 ++- lua/plugins/project_starter.lua | 20 +++++++++ spell/lv.utf-8.add | 3 ++ spell/lv.utf-8.add.spl | Bin 1815 -> 1843 bytes 16 files changed, 163 insertions(+), 82 deletions(-) create mode 100644 lua/plugins/garbage_day.lua create mode 100644 lua/plugins/gitignore.lua create mode 100644 lua/plugins/project_starter.lua diff --git a/after/ftplugin/markdown.lua b/after/ftplugin/markdown.lua index c5b5580..b55966e 100644 --- a/after/ftplugin/markdown.lua +++ b/after/ftplugin/markdown.lua @@ -1,2 +1,5 @@ vim.opt_local.wrap = true vim.opt_local.spell = true +vim.opt_local.tabstop = 2 +vim.opt_local.shiftwidth = 2 +vim.opt_local.softtabstop = 2 diff --git a/after/plugin/snips/lua.lua b/after/plugin/snips/lua.lua index 97540d4..de1736b 100644 --- a/after/plugin/snips/lua.lua +++ b/after/plugin/snips/lua.lua @@ -49,7 +49,7 @@ ls.add_snippets("lua", { ) ), s( - "f", + "fn", fmt( [[ function({}) diff --git a/lazy-lock.json b/lazy-lock.json index 770c053..0be5a15 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,73 +6,82 @@ "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" }, "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" }, - "cloak.nvim": { "branch": "main", "commit": "9abe4e986e924fc54a972c1b0ff52b65a0622624" }, - "cmake-tools.nvim": { "branch": "master", "commit": "055d7bb37d5c4038ce1e400656b6504602934ce7" }, + "cloak.nvim": { "branch": "main", "commit": "462e84e1659d984196d09f7d16690b19b9aee804" }, + "cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, "cmp-dotenv": { "branch": "main", "commit": "fd78929551010bc20602e7e663e42a5e14d76c96" }, - "cmp-emoji": { "branch": "main", "commit": "0acd702358230abeb6576769f7116e766bca28a0" }, + "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, "cmp-git": { "branch": "main", "commit": "8d8993680d627c8f13bd85094eba84604107dbdd" }, "cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pypi": { "branch": "main", "commit": "69a3c7eca2d430dabb8d8df5b17f4ce11b256f25" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.nvim": { "branch": "main", "commit": "cd5913ff5481229b15186293d1d46dd9500789f9" }, + "codeium.nvim": { "branch": "main", "commit": "a070f57c0f54bd940436b94c8b679bcad5a48811" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" }, - "darkplus.nvim": { "branch": "master", "commit": "8b150ab676d63a4c452aa04990fcef7ae43adcb6" }, + "darkplus.nvim": { "branch": "master", "commit": "fb0ac9cb20b11cef4b42f89ea5dc23f3b3abf534" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "garbage-day.nvim": { "branch": "main", "commit": "29d6abeed654bf142e0f5e741e1968b16f59357a" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, + "gitignore.nvim": { "branch": "master", "commit": "6f541c1fab844c5ddf6971872bd3a9861abca20d" }, + "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, + "harpoon-lualine": { "branch": "master", "commit": "169881ba41831cf3526a534312e410b98de775d2" }, "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" }, - "hypersonic.nvim": { "branch": "main", "commit": "a98dbd6b5ac1aac3cd895990e08d1ea40e67a9e3" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "hypersonic.nvim": { "branch": "main", "commit": "aee42425b24a92febc46a42a9cabebe5f96f021b" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, + "lazy.nvim": { "branch": "main", "commit": "3132d7d27d56d6bb4bdd0a09623d162b3cf1c588" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "markdown-togglecheck": { "branch": "main", "commit": "5e9ee3184109a102952c01ef816babe8835b299a" }, "markdown.nvim": { "branch": "master", "commit": "fd3d4c65041c62c4f51824ede751c2cf032b7c62" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "55716a879568a498fa236593c8119789054a3b8e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, - "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, + "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "melange-nvim": { "branch": "master", "commit": "ec15b091304580f1d37e711c3a54bc828b09e255" }, - "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, + "neodev.nvim": { "branch": "main", "commit": "6a533ed9d3435dcaa456380d833ea04da37ea2ed" }, "neogen": { "branch": "main", "commit": "e5460f2ad8de3afaf0864497d2c9c0490b702625" }, + "neogit": { "branch": "master", "commit": "bf2a353108b9046e907fc112701f6d876b50e465" }, "neorg": { "branch": "main", "commit": "086891d396ac9fccd91faf1520f563b6eb9eb942" }, - "nightfly": { "branch": "master", "commit": "e17c27c27372dd3db4aeb9a86d294c506de85ae6" }, - "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" }, - "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" }, - "nvim": { "branch": "main", "commit": "045e3499d9ec8d84635fb08877ae44fd33f6a38d" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nightfly": { "branch": "master", "commit": "e61adcb7bfadc0526572aa98ff83d513de421be7" }, + "nightfox.nvim": { "branch": "main", "commit": "e352a32e0f54feb2550ebdab815ae8f7f26ed63b" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "4f6ba0c4a317a630157bc02fad110fcd826e9494" }, + "none-ls.nvim": { "branch": "main", "commit": "18910d09d21d7df339805343bfe4a2b2e41c057b" }, + "nvim": { "branch": "main", "commit": "56fb98218d22d5c326387bf9e4076227e7372e6b" }, + "nvim-cmp": { "branch": "main", "commit": "b356f2c80cb6c5bae2a65d7f9c82dd5c3fdd6038" }, + "nvim-cmp-rust": { "branch": "main", "commit": "1c431ba192a90da36194d8f2fcf14c4ec5afb4a5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, + "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, - "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, + "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" }, - "nvim-lspconfig": { "branch": "master", "commit": "99330586c6e1912c890fc39d19d97571fde660cd" }, + "nvim-lspconfig": { "branch": "master", "commit": "24662f92c18edd397ef12d635b11dbdedef2d094" }, + "nvim-nio": { "branch": "master", "commit": "7054695117581bdb0183b8d27d8d82b4a2ac8958" }, "nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" }, "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, - "nvim-treesitter": { "branch": "master", "commit": "488bec03254207b1dd071be8cb1fb78434b6e777" }, - "nvim-treesitter-context": { "branch": "master", "commit": "b8b7e52c1517d401d7c519787d5dc4528c41291a" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "b7a0bfa3e93697ca5b61b15df633404bf8f45883" }, + "nvim-treesitter": { "branch": "master", "commit": "6e7b41106e9b15a5b47d149378d53482c9d9c7a3" }, + "nvim-treesitter-context": { "branch": "master", "commit": "ce37c771550443d0b026c7999deceec1fd57981b" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "75df79feb02d5e0ec114e447453775d4d291ea03" }, - "oil.nvim": { "branch": "master", "commit": "18dfd2458dc741fea683357a17aaa95870b25a3c" }, + "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" }, + "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" }, "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "project-starter.nvim": { "branch": "main", "commit": "240f2d2f3354184d70ffa661933b4b5097de2c4d" }, "rainbow_csv": { "branch": "master", "commit": "6955d13a65e0161e8dad488b6045441d527d62ec" }, "runner.nvim": { "branch": "main", "commit": "8358ab780793bc2473ad8117ee487f1a468305bf" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, @@ -90,12 +99,12 @@ "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, - "tokyonight.nvim": { "branch": "main", "commit": "c025baf23b62f044eff1f4ef561c45de636f0e32" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b" }, + "tokyonight.nvim": { "branch": "main", "commit": "fbe3a27378fdd51a8ddd04f57012455436916a62" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3" }, "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "typst.vim": { "branch": "main", "commit": "ff57d27cf5ee7427941a63fb537714f9a80e0246" }, + "typst.vim": { "branch": "main", "commit": "6a68ce290b98b2d88c72fff0de723d7d170287a3" }, "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, @@ -103,11 +112,10 @@ "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, - "vim-fugitive": { "branch": "master", "commit": "41beedabc7e948c787ea5696e04c3544c3674e23" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }, - "vimtex": { "branch": "master", "commit": "a77d14b2e4391c0d3e860708bb1fd56161ab68eb" }, + "vimtex": { "branch": "master", "commit": "73605f8b7655301ea47a2c355500ab4984f41b91" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 8f92650..75bcd26 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,6 +1,7 @@ return { "hrsh7th/nvim-cmp", event = { "InsertEnter", "CmdlineEnter" }, + commit = "b356f2c", dependencies = { "hrsh7th/cmp-buffer", -- buffer completions "hrsh7th/cmp-cmdline", @@ -13,7 +14,7 @@ return { dependencies = { "nvim-lua/plenary.nvim" }, event = { "BufRead pyproject.toml", "BufRead requirements.txt", "BufRead requirements_dev.txt" }, }, - -- { "kristijanhusak/vim-dadbod-completion", dependencies = { "tpope/vim-dadbod" } }, + { "kristijanhusak/vim-dadbod-completion", dependencies = { "tpope/vim-dadbod" } }, "SergioRibera/cmp-dotenv", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip", @@ -24,10 +25,12 @@ return { "chrisgrieser/cmp-nerdfont", "petertriho/cmp-git", "davidsierradz/cmp-conventionalcommits", + "ryo33/nvim-cmp-rust", }, config = function() local cmp = require("cmp") local luasnip = require("luasnip") + local compare = require("cmp.config.compare") local kind_icons = { Text = "󰉿", Method = "󰆧", @@ -82,7 +85,7 @@ return { { name = "buffer", keyword_length = 4 }, { name = "neorg" }, { name = "pypi" }, - -- { name = "dadbod" }, + { name = "dadbod" }, { name = "env" }, { name = "calc" }, { name = "emoji" }, @@ -116,7 +119,7 @@ return { neorg = "[neorg]", crates = "[crates]", pypi = "[pypi]", - -- dadbod = "[dadbod]", + dadbod = "[dadbod]", env = "[env]", buffer = "[buf]", })[entry.source.name] @@ -136,6 +139,29 @@ return { behavior = cmp.ConfirmBehavior.Replace, select = false, }, + filetypes = { + sorting = { + priority_weight = 2, + comparators = { + -- deprioritize `.box`, `.mut`, etc. + require("cmp-rust").deprioritize_postfix, + -- deprioritize `Borrow::borrow` and `BorrowMut::borrow_mut` + require("cmp-rust").deprioritize_borrow, + -- deprioritize `Deref::deref` and `DerefMut::deref_mut` + require("cmp-rust").deprioritize_deref, + -- deprioritize `Into::into`, `Clone::clone`, etc. + require("cmp-rust").deprioritize_common_traits, + compare.offset, + compare.exact, + compare.score, + compare.recently_used, + compare.locality, + compare.sort_text, + compare.length, + compare.order, + }, + }, + }, }) --[[ cmp.setup.cmdline("/", { diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index 69027f7..51fb32b 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -9,7 +9,7 @@ return { }, dependencies = { "williamboman/mason.nvim", - "rcarriga/nvim-dap-ui", + { "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" } }, "mfussenegger/nvim-dap", { "simrat39/rust-tools.nvim", ft = "rust" }, { "mfussenegger/nvim-dap-python", ft = "python" }, @@ -197,44 +197,26 @@ return { adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path), }, }) - -- dap.configurations.rust = {} -- C/C++ - -- FIX: not working - dap.adapters.lldb = { + dap.adapters.gdb = { type = "executable", - command = codelldb_path, - name = "lldb", + command = "gdb", + args = { "-i", "dap" }, } dap.configurations.cpp = { { name = "Launch", - type = "lldb", + type = "gdb", request = "launch", program = function() return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") end, cwd = "${workspaceFolder}", - stopOnEntry = false, - args = {}, - -- 💀 - -- if you change `runInTerminal` to true, you might need to change the yama/ptrace_scope setting: - -- - -- echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope - -- - -- Otherwise you might get the following error: - -- - -- Error on launch: Failed to attach to the target process - -- - -- But you should be aware of the implications: - -- https://www.kernel.org/doc/html/latest/admin-guide/LSM/Yama.html - -- runInTerminal = false, + stopAtBeginningOfMainSubprogram = false, }, } - - -- If you want to use this for Rust and C, add something like this: - dap.configurations.c = dap.configurations.cpp end, } diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index f56dfc8..8cbe9d6 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -1,6 +1,7 @@ return { "tpope/vim-fugitive", lazy = false, + enabled = false, keys = { { "gg", vim.cmd.G, desc = "[G]it" }, { "gd", vim.cmd.Gdiffsplit, desc = "[G]it [D]iff" }, diff --git a/lua/plugins/garbage_day.lua b/lua/plugins/garbage_day.lua new file mode 100644 index 0000000..2ab8149 --- /dev/null +++ b/lua/plugins/garbage_day.lua @@ -0,0 +1,8 @@ +return { + "zeioth/garbage-day.nvim", + dependencies = { "neovim/nvim-lspconfig" }, + event = "VeryLazy", + opts = { + -- your options here + }, +} diff --git a/lua/plugins/gitignore.lua b/lua/plugins/gitignore.lua new file mode 100644 index 0000000..c9230a2 --- /dev/null +++ b/lua/plugins/gitignore.lua @@ -0,0 +1,17 @@ +return { + "wintermute-cell/gitignore.nvim", + dependencies = { "nvim-telescope/telescope.nvim" }, + cmd = { "Gitignore" }, + keys = { + { + "gi", + function() + require("gitignore").generate() + end, + desc = "[G]it [I]gnore", + }, + }, + config = function() + require("gitignore") + end, +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index a5324f5..a498008 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,14 +1,15 @@ return { - "nvim-lualine/lualine.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - "arkav/lualine-lsp-progress", - }, - opts = { - options = { - component_separators = { left = "|", right = "|" }, + { + "nvim-lualine/lualine.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", + "arkav/lualine-lsp-progress", }, - --[[ Available components + opts = { + options = { + component_separators = { left = "|", right = "|" }, + }, + --[[ Available components `branch` (git branch) `buffers` (shows currently available buffers) `diagnostics` (diagnostics count from your preferred source) @@ -26,14 +27,23 @@ return { `selectioncount` (number of selected characters or lines) `tabs` (shows currently available tabs) `windows` (shows currently available windows) ]] - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", "diff" }, - lualine_c = { "filename", "diff", "lsp_progress" }, - lualine_x = { "diagnostics", "encoding", "filetype", "filesize" }, - lualine_y = { "progress" }, - lualine_z = { "location" }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff" }, + lualine_c = { "filename", "harpoon2", "lsp_progress" }, + lualine_x = { "diagnostics", "encoding", "filetype", "filesize" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + extentions = { "fzf", "fugitive", "lazy", "mason", "man", "oil", "nvim-dap-ui", "trouble" }, + }, + }, + { + "letieu/harpoon-lualine", + dependencies = { + { + "ThePrimeagen/harpoon", + }, }, - extentions = { "fzf", "fugitive", "lazy", "mason", "man", "oil", "nvim-dap-ui", "trouble" }, }, } diff --git a/lua/plugins/luasnip.lua b/lua/plugins/luasnip.lua index 6b6c51c..a044024 100644 --- a/lua/plugins/luasnip.lua +++ b/lua/plugins/luasnip.lua @@ -5,6 +5,7 @@ return { version = "v2.*", dependencies = { "rafamadriz/friendly-snippets", -- a bunch of snippets to use + "saadparwaiz1/cmp_luasnip", }, config = function() local ls = require("luasnip") @@ -79,5 +80,4 @@ return { require("luasnip.loaders.from_vscode").lazy_load() end, }, - "saadparwaiz1/cmp_luasnip", } diff --git a/lua/plugins/neodev.lua b/lua/plugins/neodev.lua index fea62e1..2c1e9a0 100644 --- a/lua/plugins/neodev.lua +++ b/lua/plugins/neodev.lua @@ -1,14 +1,15 @@ return { "folke/neodev.nvim", + dependencies = { "rcarriga/nvim-dap-ui" }, opts = { library = { enabled = true, -- when not enabled, neodev will not change any settings to the LSP server -- these settings will be used for your Neovim config directory runtime = true, -- runtime path types = true, -- full signature, docs and completion of vim.api, vim.treesitter, vim.lsp and others - plugins = true, -- installed opt or start plugins in packpath + -- plugins = true, -- installed opt or start plugins in packpath -- you can also specify the list of plugins to make available as a workspace library - -- plugins = { "nvim-treesitter", "plenary.nvim", "telescope.nvim" }, + plugins = { "nvim-treesitter", "plenary.nvim", "telescope.nvim", "nvim-dap-ui" }, }, setup_jsonls = true, -- configures jsonls to provide completion for project specific .luarc.json files -- for your Neovim config directory, the config.library settings will be used as is diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua index 4a0d018..76f21c7 100644 --- a/lua/plugins/neogit.lua +++ b/lua/plugins/neogit.lua @@ -1,6 +1,5 @@ return { "NeogitOrg/neogit", - enabled = false, dependencies = { "nvim-lua/plenary.nvim", -- required "sindrets/diffview.nvim", -- optional - Diff integration diff --git a/lua/plugins/null_ls.lua b/lua/plugins/null_ls.lua index 3e1a15c..0f17be3 100644 --- a/lua/plugins/null_ls.lua +++ b/lua/plugins/null_ls.lua @@ -4,7 +4,9 @@ return { dependencies = { "williamboman/mason.nvim", "nvim-lua/plenary.nvim", - "nvimtools/none-ls.nvim", + { "nvimtools/none-ls.nvim", dependencies = { + "nvimtools/none-ls-extras.nvim", + } }, }, config = function() local null_ls = require("null-ls") @@ -14,6 +16,7 @@ return { local diagnostics = null_ls.builtins.diagnostics null_ls.setup({ sources = { + require("none-ls.diagnostics.cpplint"), -- Here you can add tools not supported by mason.nvim -- make sure the source name is supported by null-ls -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md diff --git a/lua/plugins/project_starter.lua b/lua/plugins/project_starter.lua new file mode 100644 index 0000000..213533d --- /dev/null +++ b/lua/plugins/project_starter.lua @@ -0,0 +1,20 @@ +return { + "KDesp73/project-starter.nvim", + enabled = false, + cmd = { "CreateProject" }, + config = function() + local home_dir = os.getenv("HOME") + require("project-starter").setup({ + default_paths = { + -- c = "path/to/c/projects/", + cpp = home_dir .. "/Templates/cpp", + -- java = "path/to/java/projects/", -- this includes java swing projects + -- nvim_plugins = "path/to/neovim/plugins", + python = home_dir .. "/Templates/python/", + -- ruby = "path/to/ruby/projects", + -- android = "path/to/android/projects", + }, + cd = true, -- change project directory after creation (default is true) + }) + end, +} diff --git a/spell/lv.utf-8.add b/spell/lv.utf-8.add index f01b654..061b858 100644 --- a/spell/lv.utf-8.add +++ b/spell/lv.utf-8.add @@ -131,3 +131,6 @@ Turklāt grafu grafos spēj +kursa +datorredzes +datorredze diff --git a/spell/lv.utf-8.add.spl b/spell/lv.utf-8.add.spl index 0b51a84fbd88311b2a20e4ee2010c0153e3af74a..0b55d2fead51f8ac2bd498d6a0aa2d9ca41c7d6a 100644 GIT binary patch delta 539 zcmX9)ziSh56u-~=CI^Bfpad&urCgyFo28CY+9^;=#L1;1+_gtZF3E-ap`~4#K^;nj z@&@OCTgMI}h|~2CXqOJUng761YW#e!9K5@G@AKn*-sjp`t@diOoeslZZ*}H4)#oR* zsb`WbM}Qb`oZ~Lv37-(VI6x>4o6G6Rtc`!#MiWgv#Ct>vc?M6{q`BA%_6$K|-y%B& zRS=DkQ6a&AmH(c8lKW4722?DdIJZvA6IL-kJ0t86H@N8^PbALuLKYt-B{fBd!wj)> zGx+Eee|n>N+iW!6bxar+;twUr2<%zqsrqK=!RyE*X-2$HvgN!L>l)K^OTU;G_@;l% z>dV#-($4XLvAf8vaH}t2BK@Ky(U;Q+ze&Ct;XCDWBDo0V5czD6W4c5HmPz+3YY(@| zD_koVPch_Vz-!usR$ebF+jp;{aw}!+5W}T5b)&k@!yZ)w^!0but3OS7!HAixn*7p+ zyKsxj2iEvh*WG!1)i>_FJ6@L>JH`>Q=izXuAKk}|zX6FOO4#swWi}aW;jYx3E8m_X NX9_r#6`i?r{{h)hf}8*V delta 593 zcmYjOziU%b7`^A-Bp}pCT0#YXKyj$C?O+L|AjK{Y9jZe`2odqVyuL?<)X4pP zPg_zRyfQQM5nCy(JK6u*6->A=jMEq=VtNhy{<{pj9x6s&d;89 z9tKc)UA~z6_#m@|)t&lh(x!Ont>?~QJ=S5OTP&YgC>F=36^Ltkt1xOf*27bC%BELbipIEolCAU@-8}jw~W%