From f37a67d62f23cffdb3459ba1b4d750e70bc0a739 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sat, 16 Sep 2023 19:53:03 +0300 Subject: [PATCH] Update 16.09.2023 --- after/ftplugin/norg.lua | 6 +++ after/plugin/lsp.lua | 8 ++-- after/plugin/lualine.lua | 2 +- after/plugin/luasnip.lua | 4 +- after/plugin/neorg.lua | 31 ++++++++++++++ after/plugin/snips/norg.lua | 34 --------------- after/plugin/snips/python.lua | 29 +++++++++++++ after/plugin/snips/rust.lua | 67 ++++++++++++++++++----------- after/plugin/whichkey.lua | 2 +- lazy-lock.json | 71 +++++++++++++++++-------------- lua/plugins.lua | 20 ++++++++- lua/solo/init.lua | 4 +- lua/solo/lazy.lua | 4 ++ {lua/solo => plugin}/keymaps.lua | 19 +++++---- {lua/solo => plugin}/options.lua | 14 +++--- spell/lv.utf-8.add | 33 ++++++++++++++ spell/lv.utf-8.add.spl | Bin 0 -> 591 bytes 17 files changed, 229 insertions(+), 119 deletions(-) create mode 100644 after/ftplugin/norg.lua create mode 100644 after/plugin/neorg.lua delete mode 100644 after/plugin/snips/norg.lua create mode 100644 after/plugin/snips/python.lua rename {lua/solo => plugin}/keymaps.lua (65%) rename {lua/solo => plugin}/options.lua (92%) create mode 100644 spell/lv.utf-8.add create mode 100644 spell/lv.utf-8.add.spl diff --git a/after/ftplugin/norg.lua b/after/ftplugin/norg.lua new file mode 100644 index 0000000..1dba760 --- /dev/null +++ b/after/ftplugin/norg.lua @@ -0,0 +1,6 @@ +vim.opt_local.tabstop = 2 +vim.opt_local.shiftwidth = 2 +vim.opt_local.softtabstop = 2 +vim.opt_local.wrap = true +vim.opt_local.spell = true +vim.opt_local.spelllang = "lv_LV" diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index 10d3900..500d471 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -190,9 +190,7 @@ null_ls.setup({ "strict", }, }), - formatting.markdownlint.with({ - extra_filetypes = { "vimwiki" }, - }), + -- formatting.markdownlint.with({ extra_filetypes = { "vimwiki" }, }), formatting.markdown_toc.with({ extra_filetypes = { "vimwiki" } }), -- formatting.shellharden.with({ extra_filetypes = { "bash", "csh", "ksh", "zsh" } }), -- formatting.shfmt.with({ extra_filetypes = { "bash", "csh", "ksh", "zsh" } }), @@ -285,6 +283,7 @@ cmp.setup({ { name = "path" }, { name = "luasnip" }, { name = "buffer" }, + { name = "neorg" }, }, snippet = { expand = function(args) @@ -299,9 +298,10 @@ cmp.setup({ nvim_lsp = "[LSP]", nvim_lua = "[api]", luasnip = "[snip]", - buffer = "[buf]", path = "[path]", emoji = "[emoji]", + neorg = "[neorg]", + buffer = "[buf]", gh_issues = "[issues]", })[entry.source.name] return vim_item diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua index 3953720..c2b169b 100644 --- a/after/plugin/lualine.lua +++ b/after/plugin/lualine.lua @@ -27,7 +27,7 @@ require("lualine").setup({ sections = { lualine_a = { "mode" }, lualine_b = { "branch" }, - lualine_c = { "filename", "diff" }, + lualine_c = { "filename", "diff", "lsp_progress" }, lualine_x = { "diagnostics", "encoding", "filetype", "filesize" }, lualine_y = { "progress" }, lualine_z = { "location" }, diff --git a/after/plugin/luasnip.lua b/after/plugin/luasnip.lua index 5db6f6a..86c7e10 100644 --- a/after/plugin/luasnip.lua +++ b/after/plugin/luasnip.lua @@ -48,13 +48,13 @@ vim.keymap.set({ "i" }, "", function() if ls.choice_active() then ls.change_choice(1) end -end) +end, { silent = true }) vim.keymap.set({ "i" }, "", function() if ls.choice_active() then ls.change_choice(-1) end -end) +end, { silent = true }) ls.config.set_config({ -- This tells LuaSnip to remember to keep around the last snippet. diff --git a/after/plugin/neorg.lua b/after/plugin/neorg.lua new file mode 100644 index 0000000..567877c --- /dev/null +++ b/after/plugin/neorg.lua @@ -0,0 +1,31 @@ +if not pcall(require, "neorg") then + return +end + +require("neorg").setup({ + load = { + ["core.defaults"] = {}, -- Loads default behaviour + ["core.concealer"] = {}, -- Adds pretty icons to your documents + ["core.dirman"] = { -- Manages Neorg workspaces + config = { + workspaces = { + university = "~/neorg/University", + }, + default_workspace = "university", + }, + }, + ["core.completion"] = { + config = { + engine = "nvim-cmp", + name = "[Neorg]", + }, + }, + ["core.export.markdown"] = {}, + ["core.summary"] = { + config = { + strategy = "default", + }, + }, + -- ["core.ui.calendar"] = {}, + }, +}) diff --git a/after/plugin/snips/norg.lua b/after/plugin/snips/norg.lua deleted file mode 100644 index 154c18e..0000000 --- a/after/plugin/snips/norg.lua +++ /dev/null @@ -1,34 +0,0 @@ -if not pcall(require, "luasnip") then - return -end - -local ls = require("luasnip") -local s = ls.snippet -local t = ls.text_node -local i = ls.insert_node -local c = ls.choice_node -local fmt = require("luasnip.extras.fmt").fmt - -ls.add_snippets("norg", { - s( - "meta", - fmt( - [[ - @document.meta - title: {} - author: {} - categories: {} - @end - ]], - { - i(1), - c(2, { - t("Kristofers Solo"), - t("Kristiāns Francis Cagulis, kc22015"), - t("Kristiāns Francis Cagulis"), - }), - i(0), - } - ) - ), -}) diff --git a/after/plugin/snips/python.lua b/after/plugin/snips/python.lua new file mode 100644 index 0000000..3828968 --- /dev/null +++ b/after/plugin/snips/python.lua @@ -0,0 +1,29 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local t = ls.text_node +local fmt = require("luasnip.extras.fmt").fmt +local c = ls.choice_node + +ls.add_snippets("python", { + s( + "main", + fmt( + [[ + def main() -> None: + {} + + + if __name__ == "__main__": + main() + ]], + { + i(1, "pass"), + } + ) + ), +}) diff --git a/after/plugin/snips/rust.lua b/after/plugin/snips/rust.lua index cdca205..0aada9a 100644 --- a/after/plugin/snips/rust.lua +++ b/after/plugin/snips/rust.lua @@ -4,32 +4,10 @@ end local ls = require("luasnip") local s = ls.snippet -local sn = ls.snippet_node -local isn = ls.indent_snippet_node -local t = ls.text_node local i = ls.insert_node -local f = ls.function_node -local c = ls.choice_node -local d = ls.dynamic_node -local r = ls.restore_node -local events = require("luasnip.util.events") -local ai = require("luasnip.nodes.absolute_indexer") -local extras = require("luasnip.extras") -local l = extras.lambda -local rep = extras.rep -local p = extras.partial -local m = extras.match -local n = extras.nonempty -local dl = extras.dynamic_lambda local fmt = require("luasnip.extras.fmt").fmt -local fmta = require("luasnip.extras.fmt").fmta -local conds = require("luasnip.extras.expand_conditions") -local postfix = require("luasnip.extras.postfix").postfix -local types = require("luasnip.util.types") -local parse = require("luasnip.util.parser").parse_snippet -local ms = ls.multi_snippet - local shared = require("solo.snips") +local same = shared.same ls.add_snippets("rust", { s( @@ -38,13 +16,50 @@ ls.add_snippets("rust", { [[ #[cfg(test)] mod tests {{ - {} + use super::*; + {} }} ]], { - c(1, { t(" use super::*;"), t("") }), - i(0), + i(1), + } + ) + ), + s( + "tmain", + fmt( + [[ + #[tokio::main] + async fn main() -> Result<()> {{ + Ok(()) + }} + ]], + {} + ) + ), + s("pd", fmt([[println!("{}: {{:?}}", {});]], { same(1), i(1) })), + s( + "dead", + fmt( + [[ + #[allow(dead_code)] + ]], + {} + ) + ), + s( + "some", + fmt( + [[ + if let Some({}) = torrent.{}{{ + torrent_fields.push({}.to_string()); + }} + ]], + { + same(1), + i(1), + same(1), } ) ), diff --git a/after/plugin/whichkey.lua b/after/plugin/whichkey.lua index 338511c..ba2fe7c 100644 --- a/after/plugin/whichkey.lua +++ b/after/plugin/whichkey.lua @@ -205,7 +205,7 @@ local mappings = { g = { vim.cmd.RustViewCrateGraph, "View Create [G]raph" }, d = { vim.cmd.RustOpenExternalDocs, "Open External [D]ocs" }, r = { vim.cmd.RustRunnables, "Open [R]unnables" }, - ca = { vim.cmd.RustCodeAction, "[C]ode [A]ction Groups" }, + a = { vim.cmd.RustCodeAction, "Code [A]ction Groups" }, }, L = { name = "[L]anguage settings", diff --git a/lazy-lock.json b/lazy-lock.json index 4287130..b264272 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -4,71 +4,80 @@ "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "323b00de2ee18cad1ac45eb95e680386c4ff4366" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "bafed83f79b5779f5b43e8e015e13ca99dcd8b3a" }, "cloak.nvim": { "branch": "main", "commit": "ff5e746e787de14675396beb642bf5010b8bc96d" }, - "cmake-tools.nvim": { "branch": "master", "commit": "d1600ed7a9a13bdbcb7be9d3745d0a59b589c65d" }, + "cmake-tools.nvim": { "branch": "master", "commit": "86bad7cb3ebc1cac51046e88cf62d5b962e8a1cc" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, + "crates.nvim": { "branch": "main", "commit": "db629b5cfb2aa8de9e44efb795657297ee95ca91" }, + "darkplus.nvim": { "branch": "master", "commit": "7c236649f0617809db05cd30fb10fed7fb01b83b" }, "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, - "distant.nvim": { "branch": "v0.3", "commit": "17bcd37f8d91dcb987456be456d8a95db1a772ba" }, - "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, + "distant.nvim": { "branch": "v0.3", "commit": "998724f62386c8022a4e6c885f4509cf9477451a" }, + "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, + "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, - "gitsigns.nvim": { "branch": "main", "commit": "d927caa075df63bf301d92f874efb72fd22fd3b4" }, + "gitsigns.nvim": { "branch": "main", "commit": "907ae8636016aab2f283576fc60d46ca3427e579" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, + "kanagawa.nvim": { "branch": "master", "commit": "a4e99f089110c6d00bc33f5497709200e914e763" }, "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, - "lazygit.nvim": { "branch": "main", "commit": "18060f9841e7443e8a22af14e67c0ba86c6188d3" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, + "lazygit.nvim": { "branch": "main", "commit": "75c920883f44243f2bbb172be423e484a58f7c45" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "f3ad7327a92c4bf82dd43eaaef4e7e8109064187" }, + "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, - "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, - "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, + "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" }, + "melange-nvim": { "branch": "master", "commit": "517518347e41301bb2d1189d257f3918551a2ea5" }, + "neodev.nvim": { "branch": "main", "commit": "3ed1daafa0a6b64bf28ae083f1dedfd2f6fc0dcc" }, "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" }, + "neorg": { "branch": "main", "commit": "0b29eee79e08aa7e378748fd48f17dd69218749c" }, + "nightfly": { "branch": "master", "commit": "2737ba5b8d22ad6803bb0f51099f90c61bab566c" }, + "nightfox.nvim": { "branch": "main", "commit": "e886e39e592e89f316536a6f070365a9d88901c9" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "a52fc6eeec116746110b703381777c46d89d9e27" }, + "nvim": { "branch": "main", "commit": "85e93601e0f0b48aa2c6bbfae4d0e9d7a1898280" }, + "nvim-autopairs": { "branch": "master", "commit": "defad64afbf19381fe31488a7582bbac421d6e38" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" }, + "nvim-dap": { "branch": "master", "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, - "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, + "nvim-lspconfig": { "branch": "master", "commit": "57139c690dc8d594b2f9de8d1e609f2854a4fe45" }, "nvim-surround": { "branch": "main", "commit": "1c2ef599abeeb98e40706830bcd27e90e259367a" }, - "nvim-treesitter": { "branch": "master", "commit": "17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, + "nvim-treesitter": { "branch": "master", "commit": "5ec42175676bc4e6248b8ca9603acbc86497c68e" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, - "obsidian.nvim": { "branch": "main", "commit": "6b17ee6cbd81f5f091712a59473b4257007ae336" }, - "oil.nvim": { "branch": "master", "commit": "ca2560cae8a680c424a338fbeca8f0ab84e9791d" }, + "nvim-web-devicons": { "branch": "master", "commit": "925e2aa30dc9fe9332060199c19f132ec0f3d493" }, + "obsidian.nvim": { "branch": "main", "commit": "256ca787b975923ff781bfbcb581ec685791477e" }, + "oil.nvim": { "branch": "master", "commit": "9e036c6a4868b971127f3cb6bac6197bb4103723" }, + "onedark.nvim": { "branch": "master", "commit": "dac8c39812dae025255c9069a260e1f69d967927" }, "playground": { "branch": "master", "commit": "429f3e76cbb1c59fe000b690f7a5bea617b890c0" }, - "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, + "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rainbow_csv": { "branch": "master", "commit": "2dbf302ed77d40bac6d1db3028c66c301606f087" }, - "runner.nvim": { "branch": "autocmd", "commit": "d89540a00dfda7878b056909474d9e6e580455d1" }, + "runner.nvim": { "branch": "main", "commit": "237f7b72c10c34f60c55022d2d79a5f8e5a531a5" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" }, "tagbar": { "branch": "master", "commit": "402e3e117fc7b47e43dbb87c51064daae3bc3bf3" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "e4dcf64d351db23b14be3563190cf68d5cd49e90" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, - "telescope-git-diffs.nvim": { "branch": "main", "commit": "3cce2eb1079ebee65b322638bca47b1a2307456a" }, - "telescope-heading.nvim": { "branch": "main", "commit": "dbd3bde034117e4dc716732093e8290462e1e388" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, + "telescope-heading.nvim": { "branch": "main", "commit": "23ce2c9ef252aecbaa37300c1209b5ef2b51e6c5" }, "telescope-http.nvim": { "branch": "main", "commit": "b44065749560b3adfdb94bfd751642f0e480af4f" }, "telescope-lazy.nvim": { "branch": "main", "commit": "686cbcfc384f3874bc7f7e55f85ce9b7a08921a0" }, "telescope-luasnip.nvim": { "branch": "master", "commit": "849c4ee1951f34041a26744d2a88284545564ff0" }, "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, - "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, "telescope-software-licenses.nvim": { "branch": "master", "commit": "cf47d9be3cc75c52ccbc13d1c212c13bc850a51a" }, "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "3fae9c1e14910e6669bb8ecbb473aba6a9e13b33" }, + "telescope.nvim": { "branch": "master", "commit": "59812c26d826e8c717e29406267ea1260f71e103" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, @@ -76,12 +85,12 @@ "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" }, "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" }, - "vim-dadbod-ui": { "branch": "master", "commit": "200aebf70e6fc4b0eb1d3ecf0d57028e198d8dc6" }, - "vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" }, - "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, + "vim-dadbod-ui": { "branch": "master", "commit": "8157b4cf7d2111c40db28473114cab362020b7d1" }, + "vim-fugitive": { "branch": "master", "commit": "6fcb0ad03982de646e3fecb6915e585651b9a9fb" }, + "vim-illuminate": { "branch": "master", "commit": "8c910b2f84ae6acd9b4b17330bb94dd783c0c11a" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "addb64a772cb4a3ae1f1363583012b2cada2cd66" }, - "vimtex": { "branch": "master", "commit": "ad17583ce399b6830b4c2888ef2a12d52c5eb607" }, + "vimtex": { "branch": "master", "commit": "2b8a5f16a5768b3ae1780c266b73022dbb658af1" }, "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } diff --git a/lua/plugins.lua b/lua/plugins.lua index 4324ada..817734b 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -34,7 +34,7 @@ return { end, }, { "laytan/cloak.nvim" }, - { "numToStr/Comment.nvim" }, + { "numToStr/Comment.nvim", event = { "BufReadPre", "BufNewFile" } }, { "folke/which-key.nvim", lazy = true }, { "MarcHamamji/runner.nvim", @@ -216,7 +216,9 @@ return { config = true, version = "*", }, - { "nvim-lualine/lualine.nvim" }, + { "nvim-lualine/lualine.nvim", dependencies = { + "arkav/lualine-lsp-progress", + } }, { "folke/tokyonight.nvim", lazy = false, @@ -235,6 +237,15 @@ return { vim.cmd.colorscheme("tokyonight") end, }, + { "lunarvim/darkplus.nvim" }, + { "catppuccin/nvim" }, + { "Mofiqul/dracula.nvim" }, + { "rebelot/kanagawa.nvim" }, + { "EdenEast/nightfox.nvim" }, + { "navarasu/onedark.nvim" }, + { "savq/melange-nvim" }, + { "bluz71/vim-nightfly-colors", name = "nightfly" }, + { "nvim-tree/nvim-web-devicons" }, -- git @@ -254,6 +265,11 @@ return { "BufReadPre " .. vim.fn.expand("~") .. "/obsidian/**/*.md", }, }, + { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + dependencies = { "nvim-lua/plenary.nvim" }, + }, { "lervag/vimtex" }, { "iamcco/markdown-preview.nvim", diff --git a/lua/solo/init.lua b/lua/solo/init.lua index 8b645bd..ab61fea 100644 --- a/lua/solo/init.lua +++ b/lua/solo/init.lua @@ -1,5 +1,5 @@ -require("solo.options") -require("solo.keymaps") +--require("solo.options") +--require("solo.keymaps") require("solo.vimwiki") require("solo.lazy") require("solo.autocmds") diff --git a/lua/solo/lazy.lua b/lua/solo/lazy.lua index 38eda2a..b2fbc36 100644 --- a/lua/solo/lazy.lua +++ b/lua/solo/lazy.lua @@ -1,4 +1,8 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + +vim.g.mapleader = " " +vim.g.maplocalleader = " " + if not vim.loop.fs_stat(lazypath) then vim.fn.system({ "git", diff --git a/lua/solo/keymaps.lua b/plugin/keymaps.lua similarity index 65% rename from lua/solo/keymaps.lua rename to plugin/keymaps.lua index 92faf2c..edf4bcf 100644 --- a/lua/solo/keymaps.lua +++ b/plugin/keymaps.lua @@ -14,10 +14,13 @@ nmap("", "zz") nmap("n", "nzzzv") nmap("N", "Nzzzv") -nmap("", vim.cmd.TmuxNavigateLeft, "Focus window left") -nmap("", vim.cmd.TmuxNavigateDown, "Focus window down") -nmap("", vim.cmd.TmuxNavigateUp, "Focus window up") -nmap("", vim.cmd.TmuxNavigateRight, "Focus window right") +vim.keymap.set({ "n" }, "j", "gj", { desc = "Allows to navigate though wrapped lines", noremap = true }) +vim.keymap.set({ "n" }, "k", "gk", { desc = "Allows to navigate though wrapped lines", noremap = true }) + +vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateLeft, { desc = "Focus window left" }) +vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateDown, { desc = "Focus window down" }) +vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateUp, { desc = "Focus window up" }) +vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateRight, { desc = "Focus window right" }) nmap("", "resize -2", "Resize window up") nmap("", "resize +2", "Resize window down") @@ -52,7 +55,7 @@ vmap("<", "", ":m '<-2gv=gv", "Move lines up") vmap("", ":m '>+1gv=gv", "Move lines down") -tmap("t", "", "h") -tmap("t", "", "j") -tmap("t", "", "k") -tmap("t", "", "l") +-- tmap("t", "", "h") +-- tmap("t", "", "j") +-- tmap("t", "", "k") +-- tmap("t", "", "l") diff --git a/lua/solo/options.lua b/plugin/options.lua similarity index 92% rename from lua/solo/options.lua rename to plugin/options.lua index e5c6bb2..ed0802d 100644 --- a/lua/solo/options.lua +++ b/plugin/options.lua @@ -4,7 +4,7 @@ vim.opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboar vim.opt.cmdheight = 1 -- more space in the neovim command line for displaying messages vim.opt.colorcolumn = "120" vim.opt.completeopt = { "menuone", "noselect" } -- mostly just for cmp -vim.opt.conceallevel = 0 -- so that `` is visible in markdown files +vim.opt.conceallevel = 2 -- so that `` is visible in markdown files vim.opt.cursorcolumn = true -- highlight the current column vim.opt.cursorline = true -- highlight the current line vim.opt.expandtab = true -- convert tabs to spaces @@ -54,10 +54,8 @@ vim.opt_local.path:prepend(vim.fn.stdpath("config") .. "/lua") vim.opt_local.suffixesadd:prepend(".lua") vim.opt_local.suffixesadd:prepend("init.lua") -vim.g.mapleader = " " -vim.g.maplocalleader = " " -vim.g.netrw_banner = 0 -vim.g.netrw_browse_split = 0 -vim.g.netrw_keepdir = 0 -vim.g.netrw_localcopydircmd = "cp -r" -vim.g.netrw_winsize = 30 +-- vim.g.netrw_banner = 0 +-- vim.g.netrw_browse_split = 0 +-- vim.g.netrw_keepdir = 0 +-- vim.g.netrw_localcopydircmd = "cp -r" +-- vim.g.netrw_winsize = 30 diff --git a/spell/lv.utf-8.add b/spell/lv.utf-8.add new file mode 100644 index 0000000..1f6d14f --- /dev/null +++ b/spell/lv.utf-8.add @@ -0,0 +1,33 @@ +analīskā +Sintētiskā +Vispārīgums +atspoguļo +visaugstāk +darbojas +maksa +nākamai +Normatīvā +slāpes +Uzņēmējspējas +pēta +sastopamas +sastopamie +bažas +daudzviet +ģeopolitiskus +ilgtspējīgi +nepietiekamība +ilgtspējību +ietver +saskaras +ilgtspējīgas +saskarties +siltumnīcefekta +galvenajiem +ilgtspējīgām +ilgtspējas +uzņēmējspējas +pirmkoda +Sponsoru +lietotne +tērzētava diff --git a/spell/lv.utf-8.add.spl b/spell/lv.utf-8.add.spl new file mode 100644 index 0000000000000000000000000000000000000000..e72ae32ecf16d821128e70c3c4d9a1509ccc21ad GIT binary patch literal 591 zcmYLHJ5s|i5YJ2YkB^uytKcXOr;nfaX>@mTk)N*b)F=}{W_m{728IcIgu$~M_xfUF-vuw3- z6k>}?+l(vC2%%pjQ_b2ckv6fl6iN~V_K>q%mF+_1A|vS&F5;BgdM!ow&}h zmP>|ZYu=Jea3PyJZmCUfr!(hchrtH1*Jrgt!{VkSxD&FRX6n(~*pO;ut40a$DC<63 z{|qYPpfXkbdmcS!e=ehMXsM+PHu{i9IPkpJUC2ew#P|&lniGp0;QuIz8LXi<&)szt lQL!k#XSux2WIf}PzH+TZ1D+^PjI{hC{ExUGwasXLzi+tbfkglS literal 0 HcmV?d00001