From 772a83c24fc8614ab3c572fe56573bb2db87185c Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Thu, 23 May 2024 12:26:18 +0300 Subject: [PATCH] Update 2024-05-23 --- README.md | 2 +- after/ftplugin/rust.lua | 18 +++ after/plugin/snips/javascript.lua | 38 ++++++ after/plugin/snips/javascriptreact.lua.bak | 38 ++++++ lazy-lock.json | 152 ++++++++++----------- lua/plugins/clang_extensions.lua | 1 + lua/plugins/cmp.lua | 16 +-- lua/plugins/codeium.lua | 6 +- lua/plugins/colorizer.lua | 15 +- lua/plugins/colorscheme.lua | 10 ++ lua/plugins/conform.lua | 47 +++++++ lua/plugins/copilot.lua | 48 ------- lua/plugins/gitpad.lua | 43 ++++++ lua/plugins/harpoon.lua | 10 +- lua/plugins/ibl.lua | 68 +++++---- lua/plugins/inlay-hints.lua | 8 ++ lua/plugins/inlay_hints.lua | 38 ------ lua/plugins/lsp/c.lua | 9 -- lua/plugins/lsp/clangd.lua | 21 +++ lua/plugins/lsp/emmet.lua | 4 +- lua/plugins/lsp/ruff.lua | 14 ++ lua/plugins/lsp/tsserver.lua | 35 +++++ lua/plugins/lsp/typst.lua | 12 ++ lua/plugins/lspconfig.lua | 49 +++++-- lua/plugins/neoconf.lua | 2 +- lua/plugins/neogit.lua | 11 +- lua/plugins/neorg.lua | 6 +- lua/plugins/null_ls.lua | 9 +- lua/plugins/nvim-lint.lua | 39 ++++++ lua/plugins/octo.lua | 9 ++ lua/plugins/ohne_accidents.lua | 2 +- lua/plugins/oil.lua | 4 +- lua/plugins/persistence.lua | 36 +++++ lua/plugins/presence.lua | 4 +- lua/plugins/rainbow-delimeters.lua | 10 ++ lua/plugins/rust_tools.lua | 12 -- lua/plugins/rustaceanvim.lua | 48 +++++++ lua/plugins/tailwind-fold.lua | 7 + lua/plugins/tailwind-tools.lua | 34 +++++ lua/plugins/tailwind_tools.lua | 1 + lua/plugins/tmux_navigator.lua | 2 +- lua/plugins/treesitter.lua | 35 ----- lua/plugins/ts-autotag.lua | 17 +++ lua/plugins/typecheck.lua | 16 +++ lua/plugins/typescrip-tools.lua | 59 ++++++++ lua/plugins/typst.lua | 23 ++-- lua/solo/autocmds.lua | 30 +++- lua/solo/keymaps.lua | 2 - spell/lv.utf-8.add | 31 +++++ spell/lv.utf-8.add.spl | Bin 1843 -> 2205 bytes 50 files changed, 832 insertions(+), 319 deletions(-) create mode 100644 after/ftplugin/rust.lua create mode 100644 after/plugin/snips/javascript.lua create mode 100644 after/plugin/snips/javascriptreact.lua.bak create mode 100644 lua/plugins/conform.lua delete mode 100644 lua/plugins/copilot.lua create mode 100644 lua/plugins/gitpad.lua create mode 100644 lua/plugins/inlay-hints.lua delete mode 100644 lua/plugins/inlay_hints.lua delete mode 100644 lua/plugins/lsp/c.lua create mode 100644 lua/plugins/lsp/clangd.lua create mode 100644 lua/plugins/lsp/ruff.lua create mode 100644 lua/plugins/lsp/tsserver.lua create mode 100644 lua/plugins/lsp/typst.lua create mode 100644 lua/plugins/nvim-lint.lua create mode 100644 lua/plugins/octo.lua create mode 100644 lua/plugins/persistence.lua create mode 100644 lua/plugins/rainbow-delimeters.lua create mode 100644 lua/plugins/rustaceanvim.lua create mode 100644 lua/plugins/tailwind-fold.lua create mode 100644 lua/plugins/tailwind-tools.lua create mode 100644 lua/plugins/ts-autotag.lua create mode 100644 lua/plugins/typecheck.lua create mode 100644 lua/plugins/typescrip-tools.lua diff --git a/README.md b/README.md index 9e797f4..97e6c0c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# Neovim configuration +# Neovim configuration \ No newline at end of file diff --git a/after/ftplugin/rust.lua b/after/ftplugin/rust.lua new file mode 100644 index 0000000..69be1c3 --- /dev/null +++ b/after/ftplugin/rust.lua @@ -0,0 +1,18 @@ +local bufnr = vim.api.nvim_get_current_buf() +local opts = { silent = true, buffer = bufnr } +local nmap = require("solo.mappings").nmap + +-- nmap("a", function() +-- vim.cmd.RustLsp("codeAction") +-- end) + +nmap("re", vim.cmd.RustExpandMacro, "[E]xpand macro") +nmap("rc", vim.cmd.RustOpenCargo, "Open [C]argo.toml") +nmap("rp", vim.cmd.RustParentModule, "[P]arent module") +nmap("rh", vim.cmd.RustHoverActions, "[H]over actions") +nmap("rg", vim.cmd.RustViewCrateGraph, "View Create [G]raph") +nmap("rd", vim.cmd.RustOpenExternalDocs, "Open External [D]ocs") +nmap("rr", vim.cmd.RustRunnables, "Open [R]unnables") +nmap("ra", vim.cmd.RustCodeAction, "Code [A]ction Groups") +nmap("rD", vim.cmd.RustDebuggables, "[D]ebug") +nmap("drd", vim.cmd.RustDebuggables, "[D]ebug") diff --git a/after/plugin/snips/javascript.lua b/after/plugin/snips/javascript.lua new file mode 100644 index 0000000..81b6f4a --- /dev/null +++ b/after/plugin/snips/javascript.lua @@ -0,0 +1,38 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local fmt = require("luasnip.extras.fmt").fmt + +ls.add_snippets({ "javascript", "javascriptreact" }, { + s( + "jsd", + fmt( + [[ + /** + * @param {{{}}} {} + * @return {} + */ + ]], + { + i(1), + i(2), + i(0), + } + ) + ), + s( + "clog", + fmt( + [[ + console.log({}) + ]], + { + i(0), + } + ) + ), +}) diff --git a/after/plugin/snips/javascriptreact.lua.bak b/after/plugin/snips/javascriptreact.lua.bak new file mode 100644 index 0000000..8a01b08 --- /dev/null +++ b/after/plugin/snips/javascriptreact.lua.bak @@ -0,0 +1,38 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local fmt = require("luasnip.extras.fmt").fmt + +ls.add_snippets("javascriptreact", { + s( + "jsd", + fmt( + [[ + /** + * @param {{{}}} {} + * @return {} + */ + ]], + { + i(1), + i(2), + i(0), + } + ) + ), + s( + "clog", + fmt( + [[ + console.log({}) + ]], + { + i(0), + } + ) + ), +}) diff --git a/lazy-lock.json b/lazy-lock.json index 976650c..5deee1b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,96 +1,95 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, + "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "ccc.nvim": { "branch": "main", "commit": "46b8a38a3bc287f27789800d3d26480d093d65b5" }, + "ccc.nvim": { "branch": "main", "commit": "f388f1981d222967c741fe9927edf9ba5fa3bcbe" }, "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, - "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe" }, + "cheatsheet.nvim": { "branch": "master", "commit": "8ee4d76b6f902c4017dc28eddd79d925dfc55066" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "f36d788f05cfb73d4fd2e606e6ad15f8b842124f" }, "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" }, - "cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" }, + "cmake-tools.nvim": { "branch": "master", "commit": "d84e9ec2b71f18a39e8d8c4301796c77d64b80ef" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, + "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-dotenv": { "branch": "main", "commit": "fd78929551010bc20602e7e663e42a5e14d76c96" }, - "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-dotenv": { "branch": "main", "commit": "7af67e7ed4fd9e5b20127a624d22452fbd505ccd" }, + "cmp-git": { "branch": "main", "commit": "b9603f18496bc3ca07e6bd474607081af709e750" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pypi": { "branch": "main", "commit": "69a3c7eca2d430dabb8d8df5b17f4ce11b256f25" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.nvim": { "branch": "main", "commit": "a070f57c0f54bd940436b94c8b679bcad5a48811" }, - "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, + "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, + "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, "crates.nvim": { "branch": "main", "commit": "8437522d12a8c523da2aee9db2979d070b2ecc33" }, - "darkplus.nvim": { "branch": "master", "commit": "fb0ac9cb20b11cef4b42f89ea5dc23f3b3abf534" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, + "darkplus.nvim": { "branch": "master", "commit": "75548e02e34ee21e8bdef1739f96f19125160000" }, + "diffview.nvim": { "branch": "main", "commit": "0bae1a371ac68be86ead374ee2c4f36bd96bb6c6" }, "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "garbage-day.nvim": { "branch": "main", "commit": "3af496f0d1dc6586dcf4ceda6bbf61a8f820ab66" }, + "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, + "garbage-day.nvim": { "branch": "main", "commit": "dcadabd7e5f371c827d59d84b7fd63d9893370ac" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" }, - "gitsigns.nvim": { "branch": "main", "commit": "955d16e6336026a6f6b336625a03b78a58213acc" }, - "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, - "harpoon": { "branch": "harpoon2", "commit": "4ad05be8fe98092f0dec3bc3b47abebb59c3814a" }, - "harpoon-lualine": { "branch": "master", "commit": "0cb6e32c201118ad6a18113e142ee6d6c4232e38" }, - "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" }, + "gitpad.nvim": { "branch": "main", "commit": "0c06ade8876fac93369183341d6d7125b859071b" }, + "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "gruvbox.nvim": { "branch": "main", "commit": "96a8ec336fb48a11cefbd57508888361431aac26" }, + "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, + "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" }, + "hlargs.nvim": { "branch": "main", "commit": "30fe1b3de2b7614f061be4fc9c71984a2b87e50a" }, "hypersonic.nvim": { "branch": "main", "commit": "aee42425b24a92febc46a42a9cabebe5f96f021b" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "inlay-hints.nvim": { "branch": "main", "commit": "006b0898f5d3874e8e528352103733142e705834" }, - "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "indent-blankline.nvim": { "branch": "master", "commit": "5da5546947f3125dfd6aa85ab21074dc83f776d5" }, + "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, + "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, - "luarocks.nvim": { "branch": "main", "commit": "d73f4bbbeea9eeb9b66a0c6431db402654f43cb8" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "luarocks.nvim": { "branch": "main", "commit": "d3dda396d66e484590f253d1ac6d8980e3130807" }, "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": "9dfcf2036c223920826140f0151d929a43f9eceb" }, - "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, + "markdown.nvim": { "branch": "master", "commit": "951b7b567668608d60637d2c9e97f4baea5fdbbe" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, "melange-nvim": { "branch": "master", "commit": "5feb4a08876b81ccb61cae1adaffa2e737124922" }, - "neoconf.nvim": { "branch": "main", "commit": "f41d28e3f9c873de17ecab12e767fc8cfd94c7a2" }, + "neoconf.nvim": { "branch": "main", "commit": "9092129e9a42ae26375001bd2e6118f8d57c7f2a" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, - "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" }, - "neorg": { "branch": "main", "commit": "c72b91563d4a09cb93061a905f0b45e3566e2cb8" }, - "neovim": { "branch": "main", "commit": "19055dfe90bfa46a1e5b0a706d13980bdffa2dee" }, - "nightfly": { "branch": "master", "commit": "06cd078edc8d92ded2d37270649bd8ed23dec43d" }, - "nightfox.nvim": { "branch": "main", "commit": "e352a32e0f54feb2550ebdab815ae8f7f26ed63b" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "5731487c760f8813e9341f598a1c7c105085803b" }, - "none-ls.nvim": { "branch": "main", "commit": "fff481b65d88415933b9574dc0e1947724bcf64a" }, - "nvim": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, + "neorg": { "branch": "main", "commit": "f7c3fe69bea1f111ebd3dbd16e7b0f3f50a8cd8b" }, + "neovim": { "branch": "main", "commit": "b6fe88c3282cf9f117a3e836d761c2d78d02f417" }, + "nightfly": { "branch": "master", "commit": "06c4ee680519f01ee6e61b891647feefc72da42e" }, + "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" }, + "nvim": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-cmp-rust": { "branch": "main", "commit": "1c431ba192a90da36194d8f2fcf14c4ec5afb4a5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, - "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" }, - "nvim-lspconfig": { "branch": "master", "commit": "96e5711040df23583591391ce49e556b8cd248d8" }, - "nvim-nio": { "branch": "master", "commit": "173f285eebb410199273fa178aa517fd2d7edd80" }, + "nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" }, + "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" }, + "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, + "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, + "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" }, + "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, "nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" }, - "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, - "nvim-treesitter": { "branch": "master", "commit": "cc0e29727a9651e27869b7444e835c44fb1e7b4c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "45f90966a53a4e1bac374fe9aac530b7b5925c76" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, - "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "ohne-accidents": { "branch": "main", "commit": "2e60be53d205ddcad93f1cc3b530a278c1d8f64e" }, - "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" }, - "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" }, + "nvim-treesitter": { "branch": "master", "commit": "6d56c5f404d3b116bab167bc03993cfb0a83f8aa" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, + "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, + "octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" }, + "ohne-accidents": { "branch": "main", "commit": "f5ba799e64ef202aa45a8fd2731fa7c17c9912f7" }, + "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" }, + "onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" }, + "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "rainbow_csv": { "branch": "master", "commit": "1fa5483d470d57c54ca65a21aca03bb9c67dc346" }, - "runner.nvim": { "branch": "main", "commit": "8358ab780793bc2473ad8117ee487f1a468305bf" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5d0d30b201566ce1fe31415f41fe2a7bdf56f4a7" }, + "rainbow_csv": { "branch": "master", "commit": "6b914b420fd390103d9d98b3d6a67648ebe59274" }, + "runner.nvim": { "branch": "main", "commit": "fb699ec0545ba3cd9ab5167fc3d07831a836574b" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "2a23bc6ea5fe5f6fc2125d381d0c9525e9a3738b" }, + "tailwind-fold.nvim": { "branch": "main", "commit": "4335dd915073fe3da43a85b06742d12626603973" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "289a6f86ebec06e8ae1590533b732b9981d84900" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, @@ -101,27 +100,28 @@ "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, - "telescope-undo.nvim": { "branch": "main", "commit": "d19e2edc8b18d03283bd91f67310ac300ad003ce" }, - "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, - "thanks.nvim": { "branch": "main", "commit": "5b8b3ee24501edc8bf0f161a3b32dc38968984d7" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, + "tokyonight.nvim": { "branch": "main", "commit": "b9b494fa7f7bbf2fe0747b47fa290fb7a4eddcc7" }, "tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" }, "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, + "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "typst.vim": { "branch": "main", "commit": "86e4fa8dcddd032f9fdbf04602417a8baac8fed3" }, - "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, + "typecheck.nvim": { "branch": "main", "commit": "38f3c135572a287f468bae269f956f4ba53dbddf" }, + "typescript-tools.nvim": { "branch": "master", "commit": "c43d9580c3ff5999a1eabca849f807ab33787ea7" }, + "typst.vim": { "branch": "main", "commit": "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6" }, + "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, - "vim-dadbod": { "branch": "master", "commit": "960bbb7de11b7282a68d579a64e838b487934493" }, - "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, - "vim-dadbod-ui": { "branch": "master", "commit": "066922699bdf1c6e14d517b844454b12b93ce25a" }, + "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" }, + "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" }, + "vim-dadbod-ui": { "branch": "master", "commit": "5aa854ee6017e9a3463d3dc8eee5aac93739f021" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, - "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, - "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }, - "vimtex": { "branch": "master", "commit": "ac0a41b297a70c101df89bc9c8d43341ba00fd4f" }, + "vim-tmux-navigator": { "branch": "master", "commit": "c600cf10db1bf933aab9e357158bf9b202ecf99b" }, + "vimtex": { "branch": "master", "commit": "9665df7f51ee24aa81dbd81782e0a22480209753" }, "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/clang_extensions.lua b/lua/plugins/clang_extensions.lua index 8d08e49..e72cefa 100644 --- a/lua/plugins/clang_extensions.lua +++ b/lua/plugins/clang_extensions.lua @@ -4,6 +4,7 @@ return { opts = { inlay_hints = { inline = vim.fn.has("nvim-0.10") == 1, + autoSetHints = false, -- Options other than `highlight' and `priority' only work -- if `inline' is disabled -- Only show inlay hints for the current line diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index a577091..866ac33 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,7 +1,6 @@ return { "hrsh7th/nvim-cmp", event = { "InsertEnter", "CmdlineEnter" }, - -- commit = "b356f2c", dependencies = { "hrsh7th/cmp-buffer", -- buffer completions "hrsh7th/cmp-cmdline", @@ -18,11 +17,8 @@ return { "SergioRibera/cmp-dotenv", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip", - "hrsh7th/cmp-emoji", "hrsh7th/cmp-calc", - { "zbirenbaum/copilot-cmp", opts = {}, dependencies = { "zbirenbaum/copilot.lua" } }, "Exafunction/codeium.nvim", - "chrisgrieser/cmp-nerdfont", "petertriho/cmp-git", "davidsierradz/cmp-conventionalcommits", "ryo33/nvim-cmp-rust", @@ -63,8 +59,8 @@ return { cmp.setup({ mapping = { - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item({behavior=cmp.SelectBehavior.Insert}), + [""] = cmp.mapping.select_next_item({behavior=cmp.SelectBehavior.Insert}), [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), @@ -74,7 +70,7 @@ return { }), -- Accept currently selected item. If none selected, `select` first item. -- Set `select` to `false` to only confirm explicitly selected items. - [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.confirm({ select = true }), }, sources = { { name = "nvim_lua" }, @@ -88,10 +84,7 @@ return { { name = "vim-dadbod-completion" }, { name = "env" }, { name = "calc" }, - { name = "emoji" }, - { name = "copilot" }, { name = "codeium" }, - { name = "nerdfont" }, { name = "git" }, { name = "conventionalcommits" }, }, @@ -108,12 +101,9 @@ return { git = "[git]", conventionalcommits = "[CC]", calc = "[calc]", - emoji = "[emoji]", - nerdfont = "[nerdfont]", nvim_lsp = "[LSP]", nvim_lua = "[lua]", async_path = "[path]", - copilot = "[copilot]", codeium = "[codeium]", luasnip = "[snip]", neorg = "[neorg]", diff --git a/lua/plugins/codeium.lua b/lua/plugins/codeium.lua index f17bac8..d8385c1 100644 --- a/lua/plugins/codeium.lua +++ b/lua/plugins/codeium.lua @@ -1,8 +1,10 @@ return { "Exafunction/codeium.nvim", - event = "BufEnter", dependencies = { "nvim-lua/plenary.nvim", + "hrsh7th/nvim-cmp", }, - opts = {}, + config = function() + require("codeium").setup({}) + end, } diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua index c2d0450..bd28c60 100644 --- a/lua/plugins/colorizer.lua +++ b/lua/plugins/colorizer.lua @@ -1,7 +1,20 @@ return { "NvChad/nvim-colorizer.lua", opts = { - filetypes = { "html", "css", "javascript", "lua", "yaml", "conf", "toml", "scss", "python", "typst" }, + filetypes = { + "html", + "javascriptreact", + "css", + "javascript", + "lua", + "yaml", + "conf", + "toml", + "scss", + "python", + "typst", + "htmldjango", + }, user_default_options = { RGB = true, -- #RGB hex codes RRGGBB = true, -- #RRGGBB hex codes diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 3fbdf41..d686dd9 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -3,6 +3,16 @@ return { "folke/tokyonight.nvim", lazy = false, priority = 1000, + opts = { + style = "night", + transparent = true, + styles = { + keywords = { italic = false }, + sidebars = "transparent", + floats = "transparent", + }, + lualine_bold = true, + }, config = function() require("tokyonight").setup({ style = "night", diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000..7d7cb24 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,47 @@ +local js = { "biome", "biome-check", "rustywind" } +return { + "stevearc/conform.nvim", + event = { "BufWritePre" }, + cmd = { "ConformInfo" }, + keys = { + { + -- Customize or remove this keymap to your liking + "f", + function() + require("conform").format({ async = true, lsp_fallback = true }) + end, + mode = "", + desc = "[F]ormat buffer", + }, + }, + opts = { + formatters_by_ft = { + lua = { "stylua" }, + python = { "auto_optional", "ruff", "ruff_fix", "ruff_organize_imports" }, + go = { "goimports", "gofmt" }, + -- toml = { "taplo" }, + javascript = js, + javascriptreact = js, + typescript = js, + typescriptreact = js, + markdown = { "cbfmt", "markdownlint" }, + vimwiki = { "cbfmt", "markdownlint" }, + c = { "clang-format" }, + cpp = { "clang-format" }, + cmake = { "cmake_format" }, + htmldjango = { "djlint", "rustywind" }, + html = { "djlint", "rustywind" }, + typst = { "typstyle" }, + rust = { "rustfmt", "leptosfmt", "yew-fmt" }, + sql = { "pg_format" }, + yaml = { "yamlfmt" }, + ["_"] = { "trim_whitespace" }, + }, + format_on_save = { + lsp_fallback = true, + timeout_ms = 500, + }, + log_level = vim.log.levels.ERROR, + notify_on_error = true, + }, +} diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua deleted file mode 100644 index ecc01d6..0000000 --- a/lua/plugins/copilot.lua +++ /dev/null @@ -1,48 +0,0 @@ -return { - "zbirenbaum/copilot.lua", - event = "InsertEnter", - enabled = false, - opts = { - panel = { - enabled = false, - auto_refresh = false, - keymap = { - jump_prev = "[[", - jump_next = "]]", - accept = "", - refresh = "gr", - open = "", - }, - layout = { - position = "bottom", -- | top | left | right - ratio = 0.4, - }, - }, - suggestion = { - enabled = false, - auto_trigger = false, - debounce = 75, - keymap = { - accept = "", - accept_word = false, - accept_line = false, - next = "", - prev = "", - dismiss = "", - }, - }, - filetypes = { - yaml = false, - markdown = false, - help = false, - gitcommit = false, - gitrebase = false, - hgcommit = false, - svn = false, - cvs = false, - ["."] = false, - }, - copilot_node_command = "node", -- Node.js version must be > 18.x - server_opts_overrides = {}, - }, -} diff --git a/lua/plugins/gitpad.lua b/lua/plugins/gitpad.lua new file mode 100644 index 0000000..1573882 --- /dev/null +++ b/lua/plugins/gitpad.lua @@ -0,0 +1,43 @@ +return { + "yujinyuz/gitpad.nvim", + keys = { + { + "p", + function() + require("gitpad").toggle_gitpad() -- or require('gitpad').toggle_gitpad({ title = 'Project notes' }) + end, + desc = "gitpad project", + }, + { + "b", + function() + require("gitpad").toggle_gitpad_branch() -- or require('gitpad').toggle_gitpad_branch({ title = 'Branch notes' }) + end, + desc = "gitpad branch", + }, + -- Daily notes + { + "d", + function() + local date_filename = "daily-" .. os.date("%Y-%m-%d.md") + require("gitpad").toggle_gitpad({ filename = date_filename }) -- or require('gitpad').toggle_gitpad({ filename = date_filename, title = 'Daily notes' }) + end, + desc = "gitpad daily notes", + }, + -- Per file notes + { + "f", + function() + local filename = vim.fn.expand("%:p") -- or just use vim.fn.bufname() + if filename == "" then + vim.notify("empty bufname") + return + end + filename = vim.fn.pathshorten(filename, 2) .. ".md" + require("gitpad").toggle_gitpad({ filename = filename }) -- or require('gitpad').toggle_gitpad({ filename = filename, title = 'Current file notes' }) + end, + desc = "gitpad per file notes", + }, + }, + opts = {}, +} diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua index d71c297..3fc231b 100644 --- a/lua/plugins/harpoon.lua +++ b/lua/plugins/harpoon.lua @@ -6,7 +6,7 @@ return { { "a", function() - require("harpoon"):list():append() + require("harpoon"):list():add() end, desc = "Harpoon [A]dd File", }, @@ -19,28 +19,28 @@ return { desc = "Toggle Harpoon Menu", }, { - "", + "", function() require("harpoon"):list():select(1) end, desc = "Harpoon [1]", }, { - "", + "", function() require("harpoon"):list():select(2) end, desc = "Harpoon [2]", }, { - "", + "", function() require("harpoon"):list():select(3) end, desc = "Harpoon [3]", }, { - "", + "", function() require("harpoon"):list():select(4) end, diff --git a/lua/plugins/ibl.lua b/lua/plugins/ibl.lua index d2ec3c5..b395d35 100644 --- a/lua/plugins/ibl.lua +++ b/lua/plugins/ibl.lua @@ -1,41 +1,39 @@ return { "lukas-reineke/indent-blankline.nvim", main = "ibl", - config = function() - require("ibl").setup({ - - enabled = true, - indent = { - smart_indent_cap = true, + version = "3.5.0", + opts = { + enabled = true, + indent = { + smart_indent_cap = true, + }, + whitespace = { + remove_blankline_trail = true, + }, + scope = { + show_start = true, + show_end = true, + show_exact_scope = true, + }, + exclude = { + filetypes = { + "NvimTree", + "Trouble", + "alpha", + "dashboard", + "help", + "lazy", + "neogitstatus", + "packer", + "startify", + "lspinfo", }, - whitespace = { - remove_blankline_trail = true, + buftypes = { + "terminal", + "nofile", + "quickfix", + "prompt", }, - scope = { - show_start = true, - show_end = true, - show_exact_scope = true, - }, - exclude = { - filetypes = { - "NvimTree", - "Trouble", - "alpha", - "dashboard", - "help", - "lazy", - "neogitstatus", - "packer", - "startify", - "lspinfo", - }, - buftypes = { - "terminal", - "nofile", - "quickfix", - "prompt", - }, - }, - }) - end, + }, + }, } diff --git a/lua/plugins/inlay-hints.lua b/lua/plugins/inlay-hints.lua new file mode 100644 index 0000000..14699fd --- /dev/null +++ b/lua/plugins/inlay-hints.lua @@ -0,0 +1,8 @@ +return { + "MysticalDevil/inlay-hints.nvim", + name = "inlay", + event = "LspAttach", + enabled = false, + dependencies = { "neovim/nvim-lspconfig" }, + opts = {}, +} diff --git a/lua/plugins/inlay_hints.lua b/lua/plugins/inlay_hints.lua deleted file mode 100644 index 0186dbe..0000000 --- a/lua/plugins/inlay_hints.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - "simrat39/inlay-hints.nvim", - opts = { - hints = { - parameter = { - show = true, - highlight = "Comment", - }, - type = { - show = true, - highlight = "Comment", - }, - }, - only_current_line = true, - - eol = { - -- whether to align to the extreme right or not - right_align = false, - - -- padding from the right if right_align is true - right_align_padding = 7, - - parameter = { - separator = ", ", - format = function(hints) - return string.format(" <- (%s)", hints) - end, - }, - - type = { - separator = ", ", - format = function(hints) - return string.format(" => (%s)", hints) - end, - }, - }, - }, -} diff --git a/lua/plugins/lsp/c.lua b/lua/plugins/lsp/c.lua deleted file mode 100644 index 4cbb1d9..0000000 --- a/lua/plugins/lsp/c.lua +++ /dev/null @@ -1,9 +0,0 @@ -local M = {} - -M.setup = function(lsp, capabilities) - lsp.clangd.setup({ - capabilities = capabilities, - }) -end - -return M diff --git a/lua/plugins/lsp/clangd.lua b/lua/plugins/lsp/clangd.lua new file mode 100644 index 0000000..c40c192 --- /dev/null +++ b/lua/plugins/lsp/clangd.lua @@ -0,0 +1,21 @@ +local M = {} + +M.setup = function(lsp, capabilities) + capabilities = capabilities + lsp.clangd.setup({ + capabilities = capabilities, + --[[ settings = { + clangd = { + InlayHints = { + Designators = true, + Enabled = true, + ParameterNames = true, + DeducedTypes = true, + }, + fallbackFlags = { "-std=c++20" }, + }, + }, ]] + }) +end + +return M diff --git a/lua/plugins/lsp/emmet.lua b/lua/plugins/lsp/emmet.lua index a9a0413..0089685 100644 --- a/lua/plugins/lsp/emmet.lua +++ b/lua/plugins/lsp/emmet.lua @@ -6,8 +6,8 @@ M.setup = function(lsp, capabilities) filetypes = { "html", "htmldjango", - "typescriptreact", - "javascriptreact", + -- "typescriptreact", + -- "javascriptreact", "css", "sass", "scss", diff --git a/lua/plugins/lsp/ruff.lua b/lua/plugins/lsp/ruff.lua new file mode 100644 index 0000000..e849192 --- /dev/null +++ b/lua/plugins/lsp/ruff.lua @@ -0,0 +1,14 @@ +local M = {} + +M.setup = function(lsp, capabilities) + capabilities = capabilities + lsp.ruff_lsp.setup({ + init_options = { + settings = { + args = {}, + }, + }, + }) +end + +return M diff --git a/lua/plugins/lsp/tsserver.lua b/lua/plugins/lsp/tsserver.lua new file mode 100644 index 0000000..04e738f --- /dev/null +++ b/lua/plugins/lsp/tsserver.lua @@ -0,0 +1,35 @@ +local M = {} + +M.setup = function(lsp, capabilities) + capabilities = capabilities + lsp.tsserver.setup({ + ssettings = { + typescript = { + inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = true, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayVariableTypeHintsWhenTypeMatchesName = true, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + javascript = { + inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = true, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayVariableTypeHintsWhenTypeMatchesName = true, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + }, + }, + }) +end + +return M diff --git a/lua/plugins/lsp/typst.lua b/lua/plugins/lsp/typst.lua new file mode 100644 index 0000000..f948991 --- /dev/null +++ b/lua/plugins/lsp/typst.lua @@ -0,0 +1,12 @@ +local M = {} + +M.setup = function(lsp, capabilities) + lsp.typst_lsp.setup({ + capabilities = capabilities, + settings = { + exportPdf = "onType", -- Choose onType, onSave or never. + }, + }) +end + +return M diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 1add953..3f9cd91 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -40,7 +40,7 @@ return { nmap("gi", vim.lsp.buf.implementation, "[G]oto [I]mplementation") vim.keymap.set( "i", - "", + "", vim.lsp.buf.signature_help, { buffer = event.buf, desc = "LSP: Signature Documentation" } ) @@ -75,9 +75,6 @@ return { require("trouble").toggle("lsp_references") end, "[G]oto [R]eferences") nmap("gR", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") - nmap("f", function() - vim.lsp.buf.format({ async = true }) - end, "[F]ormat") end, }) @@ -115,6 +112,9 @@ return { vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded", }) + local html_opts = { + filetypes = { "html", "htmldjango" }, + } require("mason-lspconfig").setup({ automatic_installation = true, @@ -132,20 +132,20 @@ return { "tailwindcss", "texlab", "tsserver", - "rust_analyzer", + -- "rust_analyzer", }, handlers = { default_setup, clangd = function() lsp_capabilities.offsetEncoding = { "utf-16" } vim.api.nvim_create_autocmd("LspAttach", { - desc = "Enable Inlay Hints", + desc = "enable inlay hints", callback = function() require("clangd_extensions.inlay_hints").setup_autocmd() require("clangd_extensions.inlay_hints").set_inlay_hints() end, }) - require("plugins.lsp.c").setup(lsp, lsp_capabilities) + require("plugins.lsp.clangd").setup(lsp, lsp_capabilities) end, bashls = function() require("plugins.lsp.bash").setup(lsp, lsp_capabilities) @@ -159,12 +159,37 @@ return { lua_ls = function() require("plugins.lsp.lua").setup(lsp, lsp_capabilities) end, - htmx = function() - local opts = { - filetypes = { "html", "htmldjango" }, - } - require("lspconfig").htmx.setup(opts) + typst_lsp = function() + require("plugins.lsp.typst").setup(lsp, lsp_capabilities) end, + htmx = function() + lsp.htmx.setup(html_opts) + end, + ruff_lsp = function() + require("plugins.lsp.ruff").setup(lsp, lsp_capabilities) + end, + jinja_lsp = function() + lsp.jinja_lsp.setup(html_opts) + end, + html = function() + lsp.html.setup(html_opts) + end, + tsserver = function() + require("plugins.lsp.tsserver").setup(lsp, lsp_capabilities) + end, + --[[ eslint = function() + vim.api.nvim_create_autocmd("LspAttach", { + callback = function(client, bufnr) + vim.api.nvim_create_autocmd("BufWritePre", { + buffer = bufnr, + command = "EslintFixAll", + }) + end, + }) + lsp.eslint.setup({ + capabilities = lsp_capabilities, + }) + end, ]] }, }) end, diff --git a/lua/plugins/neoconf.lua b/lua/plugins/neoconf.lua index b1509c2..e9e9434 100644 --- a/lua/plugins/neoconf.lua +++ b/lua/plugins/neoconf.lua @@ -35,7 +35,7 @@ return { lua_ls = { -- by default, lua_ls annotations are only enabled in your neovim config directory enabled_for_neovim_config = true, - -- explicitely enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file + -- explicitly enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file enabled = false, }, }, diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua index 76f21c7..4470f61 100644 --- a/lua/plugins/neogit.lua +++ b/lua/plugins/neogit.lua @@ -1,13 +1,13 @@ return { "NeogitOrg/neogit", + version = "*", dependencies = { "nvim-lua/plenary.nvim", -- required - "sindrets/diffview.nvim", -- optional - Diff integration - - -- Only one of these is needed, not both. - "nvim-telescope/telescope.nvim", -- optional + "sindrets/diffview.nvim", -- Diff integration + "nvim-telescope/telescope.nvim", }, cmd = { "Neogit" }, + version = "*", keys = { { "gg", @@ -43,6 +43,7 @@ return { ["github.com"] = "https://github.com/${owner}/${repository}/compare/${branch_name}?expand=1", ["bitbucket.org"] = "https://bitbucket.org/${owner}/${repository}/pull-requests/new?source=${branch_name}&t=1", ["gitlab.com"] = "https://gitlab.com/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}", + ["git.modulation.lv"] = "https://git.modulation.lv/${owner}/${repository}/merge_requests/new?merge_request[source_branch]=${branch_name}", }, -- Allows a different telescope sorter. Defaults to 'fuzzy_with_index_bias'. The example below will use the native fzf -- sorter instead. By default, this function returns `nil`. @@ -256,7 +257,7 @@ return { ["u"] = "Unstage", ["U"] = "UnstageStaged", ["$"] = "CommandHistory", - ["#"] = "Console", + -- ["#"] = "Console", ["Y"] = "YankSelected", [""] = "RefreshBuffer", [""] = "GoToFile", diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua index 14609e4..bbf2867 100644 --- a/lua/plugins/neorg.lua +++ b/lua/plugins/neorg.lua @@ -1,9 +1,10 @@ return { "nvim-neorg/neorg", dependencies = { - "vhyrro/luarocks.nvim", + { "vhyrro/luarocks.nvim", config = true }, }, -- cmd = { "Neorg" }, + lazy = false, version = "*", ft = "norg", opts = { @@ -24,7 +25,8 @@ return { name = "[Neorg]", }, }, - ["core.export.markdown"] = {}, + ["core.export"] = {}, + -- ["core.export.markdown"] = {}, ["core.summary"] = { config = { strategy = "default", diff --git a/lua/plugins/null_ls.lua b/lua/plugins/null_ls.lua index 0f17be3..9f538ba 100644 --- a/lua/plugins/null_ls.lua +++ b/lua/plugins/null_ls.lua @@ -1,6 +1,7 @@ return { "jay-babu/mason-null-ls.nvim", event = { "BufReadPre", "BufNewFile" }, + enabled = false, dependencies = { "williamboman/mason.nvim", "nvim-lua/plenary.nvim", @@ -21,7 +22,7 @@ return { -- make sure the source name is supported by null-ls -- https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md formatting.cbfmt.with({ extra_filetypes = { "vimwiki" } }), - formatting.prettier.with({ + --[[ formatting.prettier.with({ extra_filetypes = { "toml" }, extra_args = { "--no-semi", @@ -33,7 +34,7 @@ return { "--html-whitespace-sensitivity", "strict", }, - }), + }), ]] formatting.sql_formatter.with({ extra_args = { "-c", @@ -57,7 +58,7 @@ return { ]], }, }), - formatting.rustywind.with({ extra_filetypes = { "htmldjango" } }), + formatting.rustywind.with({ extra_filetypes = { "htmldjango", "javascriptreact" } }), }, }) require("mason-null-ls").setup({ @@ -65,10 +66,8 @@ return { "clang_format", "cmake_format", "cmake_lint", - "djlint", "google_java_format", "selene", - "mypy", "stylua", "yamlfmt", "rustywind", diff --git a/lua/plugins/nvim-lint.lua b/lua/plugins/nvim-lint.lua new file mode 100644 index 0000000..2d88158 --- /dev/null +++ b/lua/plugins/nvim-lint.lua @@ -0,0 +1,39 @@ +local js = { "biomejs" } +return { + "mfussenegger/nvim-lint", + opts = { + events = { "InsertLeave", "BufWritePost", "BufReadPost", "InsertEnter" }, + linters_by_ft = { + javascript = js, + javascriptreact = js, + typescript = js, + typescriptreact = js, + python = { "mypy" }, + htmldjango = { "djlint" }, + html = { "djlint" }, + lua = { "selene" }, + cmake = { "cmakelint" }, + json = { "jsonlint" }, + ["*"] = { "codespell", "typos" }, + }, + }, + config = function(_, opts) + local lint = require("lint") + lint.linters_by_ft = opts.linters_by_ft + vim.api.nvim_create_autocmd(opts.events, { + group = vim.api.nvim_create_augroup("nvim-lint", { clear = true }), + callback = function() + lint.try_lint() + end, + }) + end, +} + +-- ◍ biome +-- ◍ cmakelang +-- ◍ cmakelint +-- ◍ cpplint +-- ◍ djlint +-- ◍ jinja-lsp jinja_lsp +-- ◍ markdownlint +-- ◍ mypy diff --git a/lua/plugins/octo.lua b/lua/plugins/octo.lua new file mode 100644 index 0000000..cbad72f --- /dev/null +++ b/lua/plugins/octo.lua @@ -0,0 +1,9 @@ +return { + "pwntester/octo.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope.nvim", + "nvim-tree/nvim-web-devicons", + }, + opts = {}, +} diff --git a/lua/plugins/ohne_accidents.lua b/lua/plugins/ohne_accidents.lua index 678e252..d659664 100644 --- a/lua/plugins/ohne_accidents.lua +++ b/lua/plugins/ohne_accidents.lua @@ -4,7 +4,7 @@ return { { "oh", vim.cmd.OhneAccidents, - desc = "", + desc = "Run OhneAccidents", }, }, opts = {}, diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index 31b84b3..9a758c9 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -56,8 +56,8 @@ return { keymaps = { ["g?"] = "actions.show_help", [""] = "actions.select", - ["v"] = "actions.select_vsplit", - ["s"] = "actions.select_split", + [""] = "actions.select_vsplit", + [""] = "actions.select_split", ["t"] = "actions.select_tab", [""] = "actions.preview", [""] = "actions.close", diff --git a/lua/plugins/persistence.lua b/lua/plugins/persistence.lua new file mode 100644 index 0000000..16b435e --- /dev/null +++ b/lua/plugins/persistence.lua @@ -0,0 +1,36 @@ +return { + "folke/persistence.nvim", + event = "BufReadPre", + keys = { + { + "qs", + function() + require("persistence").load() + end, + desc = "Restore the session for the current directory", + }, + { + "ql", + function() + require("persistence").load({ last = true }) + end, + desc = "Restore the last session", + }, + { + "qd", + function() + require("persistence").stop() + end, + desc = "Stop Persistence => session won't be saved on exit", + }, + }, + opts = { + dir = vim.fn.expand(vim.fn.stdpath("state") .. "/sessions/"), -- directory where session files are saved + options = { "buffers", "curdir", "tabpages", "winsize" }, -- sessionoptions used for saving + pre_save = nil, -- a function to call before saving the session + post_save = nil, -- a function to call after saving the session + save_empty = false, -- don't save if there are no open file buffers + pre_load = nil, -- a function to call before loading the session + post_load = nil, -- a function to call after loading the session + }, +} diff --git a/lua/plugins/presence.lua b/lua/plugins/presence.lua index b23ff1a..83b1349 100644 --- a/lua/plugins/presence.lua +++ b/lua/plugins/presence.lua @@ -1,6 +1,6 @@ return { "andweeb/presence.nvim", - --[[ opts = { + opts = { -- General options auto_update = true, -- Update activity based on autocmd events (if `false`, map or manually execute `:lua package.loaded.presence:update()`) neovim_image_text = "The One True Text Editor", -- Text displayed when hovered over the Neovim image @@ -22,5 +22,5 @@ return { reading_text = "Reading %s", -- Format string rendered when a read-only or unmodifiable file is loaded in the buffer (either string or function(filename: string): string) workspace_text = "Working on %s", -- Format string rendered when in a git repository (either string or function(project_name: string|nil, filename: string): string) line_number_text = "Line %s out of %s", -- Format string rendered when `enable_line_number` is set to true (either string or function(line_number: number, line_count: number): string) - }, ]] + }, } diff --git a/lua/plugins/rainbow-delimeters.lua b/lua/plugins/rainbow-delimeters.lua new file mode 100644 index 0000000..ad84571 --- /dev/null +++ b/lua/plugins/rainbow-delimeters.lua @@ -0,0 +1,10 @@ +return { + "HiPhish/rainbow-delimiters.nvim", + config = function() + require("rainbow-delimiters.setup").setup({ + strategy = {}, + query = {}, + highlight = {}, + }) + end, +} diff --git a/lua/plugins/rust_tools.lua b/lua/plugins/rust_tools.lua index 5ecc6df..429efbd 100644 --- a/lua/plugins/rust_tools.lua +++ b/lua/plugins/rust_tools.lua @@ -2,18 +2,6 @@ return { "simrat39/rust-tools.nvim", dependencies = { "neovim/nvim-lspconfig" }, ft = "rust", - keys = { - { "re", vim.cmd.RustExpandMacro, desc = "[E]xpand macro" }, - { "rc", vim.cmd.RustOpenCargo, desc = "Open [C]argo.toml" }, - { "rp", vim.cmd.RustParentModule, desc = "[P]arent module" }, - { "rh", vim.cmd.RustHoverActions, desc = "[H]over actions" }, - { "rg", vim.cmd.RustViewCrateGraph, desc = "View Create [G]raph" }, - { "rd", vim.cmd.RustOpenExternalDocs, desc = "Open External [D]ocs" }, - { "rr", vim.cmd.RustRunnables, desc = "Open [R]unnables" }, - { "ra", vim.cmd.RustCodeAction, desc = "Code [A]ction Groups" }, - { "rD", vim.cmd.RustDebuggables, desc = "[D]ebug" }, - { "drd", vim.cmd.RustDebuggables, desc = "[D]ebug" }, - }, opts = { tools = { -- on_initialized = nil, diff --git a/lua/plugins/rustaceanvim.lua b/lua/plugins/rustaceanvim.lua new file mode 100644 index 0000000..721f7fb --- /dev/null +++ b/lua/plugins/rustaceanvim.lua @@ -0,0 +1,48 @@ +return { + "mrcjkb/rustaceanvim", + version = "^4", -- Recommended + lazy = false, -- This plugin is already lazy + enabled = false, + config = function() + vim.g.rustaceanvim = { + server = { + settings = { + ["rust-analyzer"] = { + inlayHints = { + bindingModeHints = { + enable = false, + }, + chainingHints = { + enable = true, + }, + closingBraceHints = { + enable = true, + minLines = 25, + }, + closureReturnTypeHints = { + enable = true, + }, + lifetimeElisionHints = { + enable = true, + useParameterNames = true, + }, + maxLength = 25, + parameterHints = { + enable = true, + }, + reborrowHints = { + enable = true, + }, + renderColons = true, + typeHints = { + enable = true, + hideClosureInitialization = true, + hideNamedConstructor = true, + }, + }, + }, + }, + }, + } + end, +} diff --git a/lua/plugins/tailwind-fold.lua b/lua/plugins/tailwind-fold.lua new file mode 100644 index 0000000..3469fad --- /dev/null +++ b/lua/plugins/tailwind-fold.lua @@ -0,0 +1,7 @@ +return { + "razak17/tailwind-fold.nvim", + opts = {}, + dependencies = { "nvim-treesitter/nvim-treesitter" }, + cmd = { "TailwindFoldEnable", "TailwindFoldDisable", "TailwindFoldToggle" }, + ft = { "html", "htmldjango", "svelte", "astro", "vue", "javascriptreact", "typescriptreact", "php", "blade" }, +} diff --git a/lua/plugins/tailwind-tools.lua b/lua/plugins/tailwind-tools.lua new file mode 100644 index 0000000..dfae4ad --- /dev/null +++ b/lua/plugins/tailwind-tools.lua @@ -0,0 +1,34 @@ +return { + "luckasRanarison/tailwind-tools.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + enabled = false, + ft = { "html", "htmldjango", "svelte", "astro", "vue", "javascriptreact", "typescriptreact", "php", "blade" }, + cmd = { + "TailwindConcealEnable", + "TailwindConcealDisable", + "TailwindConcealToggle", + "TailwindColorEnable", + "TailwindColorDisable", + "TailwindColorToggle", + "TailwindSort", + "TailwindSortSelection", + "TailwindNextClass", + "TailwindPrevClass", + }, + opts = { + document_color = { + enabled = true, -- can be toggled by commands + kind = "background", -- "inline" | "foreground" | "background" + inline_symbol = "󰝤 ", -- only used in inline mode + debounce = 200, -- in milliseconds, only applied in insert mode + }, + conceal = { + enabled = false, -- can be toggled by commands + symbol = "󱏿", -- only a single character is allowed + highlight = { -- extmark highlight options, see :h 'highlight' + fg = "#38BDF8", + }, + }, + custom_filetypes = {}, -- see the extension section to learn how it works + }, +} diff --git a/lua/plugins/tailwind_tools.lua b/lua/plugins/tailwind_tools.lua index dc7f918..f7d0b0a 100644 --- a/lua/plugins/tailwind_tools.lua +++ b/lua/plugins/tailwind_tools.lua @@ -1,6 +1,7 @@ return { "luckasRanarison/tailwind-tools.nvim", dependencies = { "nvim-treesitter/nvim-treesitter" }, + enabled = false, ft = { "html" }, opts = { document_color = { diff --git a/lua/plugins/tmux_navigator.lua b/lua/plugins/tmux_navigator.lua index 93cefa1..f45f031 100644 --- a/lua/plugins/tmux_navigator.lua +++ b/lua/plugins/tmux_navigator.lua @@ -1,6 +1,6 @@ return { "christoomey/vim-tmux-navigator", - cmds = { + cmd = { "TmuxNavigateLeft", "TmuxNavigateDown", "TmuxNavigateUp", diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 48e8361..ba35ebe 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -2,7 +2,6 @@ return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", dependencies = { - "p00f/nvim-ts-rainbow", "nvim-treesitter/nvim-treesitter-context", "mechatroner/rainbow_csv", "JoosepAlviste/nvim-ts-context-commentstring", @@ -49,40 +48,6 @@ return { indent = { enable = true, }, - autotag = { - enable = true, - enable_rename = true, - enable_close = true, - enable_close_on_slash = true, - filetypes = { - "astro", - "glimmer", - "handlebars", - "hbs", - "html", - "htmldjango", - "javascript", - "javascriptreact", - "jsx", - "markdown", - "php", - "rescript", - "svelte", - "tsx", - "typescript", - "typescriptreact", - "vue", - "xml", - }, - }, - rainbow = { - enable = true, - -- disable = { "jsx", "cpp" }, list of languages you want to disable the plugin for - extended_mode = true, -- Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean - max_file_lines = nil, -- Do not enable for files with more than n lines, int - -- colors = {}, -- table of hex strings - -- termcolors = {}, -- table of colour name strings - }, incremenral_selection = { enable = true, keymaps = { diff --git a/lua/plugins/ts-autotag.lua b/lua/plugins/ts-autotag.lua new file mode 100644 index 0000000..66f96ac --- /dev/null +++ b/lua/plugins/ts-autotag.lua @@ -0,0 +1,17 @@ +return { + "windwp/nvim-ts-autotag", + ft = { "javascriptreact", "typescriptreact", "php" }, + events = { "BufReadPre" }, + opts = { + opts = { + -- Defaults + enable_close = true, -- Auto close tags + enable_rename = true, -- Auto rename pairs of tags + enable_close_on_slash = true, -- Auto close on trailing lt", + vim.cmd.Typecheck, + desc = "Run Type Check", + }, + }, +} diff --git a/lua/plugins/typescrip-tools.lua b/lua/plugins/typescrip-tools.lua new file mode 100644 index 0000000..374f391 --- /dev/null +++ b/lua/plugins/typescrip-tools.lua @@ -0,0 +1,59 @@ +return { + "pmizio/typescript-tools.nvim", + dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" }, + opts = { + handlers = {}, + settings = { + -- spawn additional tsserver instance to calculate diagnostics on it + separate_diagnostic_server = true, + -- "change"|"insert_leave" determine when the client asks the server about diagnostic + publish_diagnostic_on = "insert_leave", + -- array of strings("fix_all"|"add_missing_imports"|"remove_unused"| + -- "remove_unused_imports"|"organize_imports") -- or string "all" + -- to include all supported code actions + -- specify commands exposed as code_actions + expose_as_code_action = {}, + -- string|nil - specify a custom path to `tsserver.js` file, if this is nil or file under path + -- not exists then standard path resolution strategy is applied + tsserver_path = nil, + -- specify a list of plugins to load by tsserver, e.g., for support `styled-components` + -- (see 💅 `styled-components` support section) + tsserver_plugins = {}, + -- this value is passed to: https://nodejs.org/api/cli.html#--max-old-space-sizesize-in-megabytes + -- memory limit in megabytes or "auto"(basically no limit) + tsserver_max_memory = "auto", + -- described below + tsserver_format_options = {}, + tsserver_file_preferences = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = false, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayVariableTypeHintsWhenTypeMatchesName = false, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, + }, + -- locale of all tsserver messages, supported locales you can find here: + -- https://github.com/microsoft/TypeScript/blob/3c221fc086be52b19801f6e8d82596d04607ede6/src/compiler/utilitiesPublic.ts#L620 + tsserver_locale = "en", + -- mirror of VSCode's `typescript.suggest.completeFunctionCalls` + complete_function_calls = false, + include_completions_with_insert_text = true, + -- CodeLens + -- WARNING: Experimental feature also in VSCode, because it might hit performance of server. + -- possible values: ("off"|"all"|"implementations_only"|"references_only") + code_lens = "all", + -- by default code lenses are displayed on all referencable values and for some of you it can + -- be too much this option reduce count of them by removing member references from lenses + disable_member_code_lens = true, + -- JSXCloseTag + -- WARNING: it is disabled by default (maybe you configuration or distro already uses nvim-ts-autotag, + -- that maybe have a conflict if enable this feature. ) + jsx_close_tag = { + enable = false, + filetypes = { "javascriptreact", "typescriptreact" }, + }, + }, + }, +} diff --git a/lua/plugins/typst.lua b/lua/plugins/typst.lua index 6c313e1..cae123a 100644 --- a/lua/plugins/typst.lua +++ b/lua/plugins/typst.lua @@ -1,14 +1,21 @@ return { "kaarmu/typst.vim", ft = "typst", + keys = { + { + "ow", + vim.cmd.TypstWatch, + desc = "Typst watch", + }, + }, config = function() - vim.g.typst_cmd = "typst" -- Specifies the location of the Typst executable. Default: 'typst' - vim.g.typst_pdf_viewer = "zathura" -- Specifies pdf viewer that typst watch --open will use. Default: '' - vim.g.typst_conceal = 0 -- Enable concealment. Default: 0 - vim.g.typst_conceal_math = vim.g.typst_conceal -- Enable concealment for math symbols in math mode (i.e. replaces symbols with their actual unicode character). Default: g:typst_conceal - vim.g.typst_conceal_emoji = vim.g.typst_conceal -- Enable concealing emojis, e.g. #emoji.alien becomes 👽. Default: g:typst_conceal - vim.g.typst_auto_close_toc = 0 -- Specifies whether TOC will be automatically closed after using it. Default: 0 - vim.g.typst_auto_open_quickfix = 1 -- Specifies whether the quickfix list should automatically open when there are errors from typst. Default: 1 - vim.g.typst_embedded_languages = { "python", "rust", "c", "cpp" } -- A list of languages that will be highlighted in code blocks. Typst is always highlighted. Default: [] + -- vim.g.typst_cmd = "typst" -- Specifies the location of the Typst executable. Default: 'typst' + -- vim.g.typst_pdf_viewer = "zathura" -- Specifies pdf viewer that typst watch --open will use. Default: '' + -- vim.g.typst_conceal = 0 -- Enable concealment. Default: 0 + -- vim.g.typst_conceal_math = vim.g.typst_conceal -- Enable concealment for math symbols in math mode (i.e. replaces symbols with their actual unicode character). Default: g:typst_conceal + -- vim.g.typst_conceal_emoji = vim.g.typst_conceal -- Enable concealing emojis, e.g. #emoji.alien becomes 👽. Default: g:typst_conceal + -- vim.g.typst_auto_close_toc = 0 -- Specifies whether TOC will be automatically closed after using it. Default: 0 + -- vim.g.typst_auto_open_quickfix = 1 -- Specifies whether the quickfix list should automatically open when there are errors from typst. Default: 1 + -- vim.g.typst_embedded_languages = { "python", "rust", "c", "cpp" } -- A list of languages that will be highlighted in code blocks. Typst is always highlighted. Default: [] end, } diff --git a/lua/solo/autocmds.lua b/lua/solo/autocmds.lua index 9e8d60c..326b1db 100644 --- a/lua/solo/autocmds.lua +++ b/lua/solo/autocmds.lua @@ -29,6 +29,18 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, { end, }) +vim.api.nvim_create_autocmd({ "BufWritePre" }, { + pattern = { "*.py" }, + callback = function() + vim.lsp.buf.code_action({ + context = { + only = { "source.fixAll.ruff" }, + }, + apply = true, + }) + end, +}) + -- Center on InsertEnter vim.api.nvim_create_autocmd({ "InsertEnter" }, { callback = function() @@ -36,6 +48,20 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, { end, }) +vim.api.nvim_create_autocmd({ "BufWinEnter" }, { + pattern = "**/Codnity/**", + callback = function() + vim.opt.colorcolumn = "92" + end, +}) + +vim.api.nvim_create_autocmd({ "BufWinEnter" }, { + pattern = "**/Codnity/**/*.html", + callback = function() + vim.cmd("setf htmldjango") + end, +}) + -- Autocommand that sources neovim files on save --[[ vim.api.nvim_create_autocmd({ "BufWritePost" }, { group = vim.api.nvim_create_augroup("AutoReloadConfig", { clear = true }), @@ -47,5 +73,7 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, { }) ]] vim.filetype.add({ - pattern = { [".*/hypr/.*%.conf"] = "hyprlang" }, + pattern = { + [".*/hypr/.*%.conf"] = "hyprlang", + }, }) diff --git a/lua/solo/keymaps.lua b/lua/solo/keymaps.lua index 3d36788..20d2c91 100644 --- a/lua/solo/keymaps.lua +++ b/lua/solo/keymaps.lua @@ -40,8 +40,6 @@ nmap("", "m .-2==", "Move line up") nmap("", "m .+1==", "Move line down") nmap("", ":%s///gI", "[S]ubstitute word") --- nmap("", "w!!compiler '%:p'") --- nmap("", "w!!opout '%:p'") nmap("Q", "@qj", "Run macro") diff --git a/spell/lv.utf-8.add b/spell/lv.utf-8.add index 061b858..e84f10a 100644 --- a/spell/lv.utf-8.add +++ b/spell/lv.utf-8.add @@ -134,3 +134,34 @@ spēj kursa datorredzes datorredze +Vissliktāk +jāveic +doto +nosaka +varbūtiskā +atcerēties +apakšproblēmas +apakšproblēmās +dekompozīcijai +apakšproblēmu +sauc +atgriež +Binārs +Pašorganizējošs +binārs +izvietoti +tuvoties +Pamatoperācija +iekavu +Kortežu +relācijās +Relācijai +kortežu +relācijas +relāciju +Relācijā +atrodams +prioritizēšanu +projektējumu +dotā +algoritmus diff --git a/spell/lv.utf-8.add.spl b/spell/lv.utf-8.add.spl index 0b55d2fead51f8ac2bd498d6a0aa2d9ca41c7d6a..0f7c3207f8b628263a36642d1fe38c4a659f8186 100644 GIT binary patch literal 2205 zcmYLKzpEov6rOV@@3G4kHfv|U3~Zy7rWVA)R3a7+;U<|EZ{{cSBSm0~v9OcyNNJT_ zS&*~=VR@vQEdC1{OF^&|YxVoiojl(oGxwf*?m6H2&X4)(^DpW$PScP64T9@W-?!6w ze7kVVB+c@otm>v+^`~o>=4I2$T2|sDmPQH*%!029f<`iFMS>uzaac(%7P4OUs%{Ln zscvgY@TOvCEH@|FNr@YUOjTtoS%~AYrB17=;|{heTPIT_OgYV zW1U}~kBFXFE2&Lj%$1E@u?{PcH-$P}o|kx6_>Tc%EwKq0Ypom4F87U@C2*9f ztrP(yfI_BIh2~(xLtjH)~p!@S23nk9#pA;|fh~uD7V)B9IKwsJ*3yabs)+lqLg9Ki`OupE7n zGa$KZMs}X96m@|(t$N(!$b2?Mem%uRwWF+L7TG|M{7~SuGc% za72`aw1I}gqs7b_0nxXxkmA?NE9@{m$ju+%hD_t>wirAq$KsG>Z=+QXC*%R2(>Xb`N*bajg%~4nM5eSh}7fi zpHr2vG4{}48-!0Y9Th%Zsy#`ModCrU+_`cyBuDgcpV--@0CwBBAy}z$NvH?} z!nF`UaJBjd6>;gm2$bZUJE9N?Kvu9uCh#fy_pYDw_zq?Jl6-bOj-nK4)vx(t%zDM^wI5@6C|HONB0 zJKguEMd-#y+z5K3132xSG;pw#KHfijP^WX)@ifQ--g+Ra_0-88cK2Ad$Gx4y?OGmb zKi|Vz-?raQt@HIJZ4t^0=Q!Q2@NDt#z-%MVB+&&IF;=cSnFGF5>IKN=fb?)y5Mt-e zvd|^t!^Rm+@ci1r1kZmgF5Z9xc@7W^dzm#A=o&x5=H=cUt>x`O%!%=}3R~$d+V|jC z!Y!?Dh_LI7ZNXp->Q!p%QC1+~6udOZgGxoi0oSg$-XUv1db4nOQ6X5kpomxaFd}BP z6;BBycj>ZQ!}~#Vr^;WJ>WmmI%ohL%CV?jka|1A^I?H4a^*iH&Quf&VOjc8iw9;^; zTr5fkFLFLxrsQUc3pwa~0GC)>j7KJ2Y8R!ltr4YFhX`R^9)dO=cv1T^-};jiqpbyBS`Y z9u@)_(Z5%&IGhGJ2eWIRx_UIWF*E9})$=1jET|4@F(W<}&pg*X+Bx3+n5SsQ*AhUt zsas^!yc^*-kM%so1>W?okLW3c5UK%?pkjK&Git+zBpg9=FQsbap zyjGrC--gkY8(briI0ooM&cDH&vM@a~m-EuN)|4Y44q8~T`T_Jby!5Xo622w3#IFGv zgOJHWfgIMc+zAS%Fw0nRC-C+OCIvpD++u~6WE5Wz1?2$f^9=|F9VC^ODl;JG-A~r% zMboWEvkV%DMN#8ws7=mnx33!g!G35|Bl4s7Yi|nn4A>x}42>mqr5TdvBU|Q-1HfER z;W#IhBI`V((3v)3fc7{h_yXy`^R6-I;|jMqoJ`)vR?k*!^#~ikHQFQ8aVSsFwbG8DcJ3GR%i&1ECfBykP50gs(