diff --git a/lazy-lock.json b/lazy-lock.json index a60986a..4b8d6c2 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,10 +2,10 @@ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "ccc.nvim": { "branch": "main", "commit": "f3d9d31aab7990d50ae6922fd7c1e3a9eb7da183" }, + "ccc.nvim": { "branch": "main", "commit": "847e36084bc54bb1c712f6b10cd75fe3b9d03a0c" }, "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe" }, "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" }, "cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, @@ -28,9 +28,9 @@ "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" }, + "garbage-day.nvim": { "branch": "main", "commit": "3af496f0d1dc6586dcf4ceda6bbf61a8f820ab66" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitignore.nvim": { "branch": "master", "commit": "6f541c1fab844c5ddf6971872bd3a9861abca20d" }, + "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" }, "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, @@ -40,7 +40,7 @@ "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": "af6afefbb46ab29a8a1db69536b04290a9403876" }, + "lazy.nvim": { "branch": "main", "commit": "e888d5b64c34bc41f7ef2e8850a5e67e4b3e2731" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -51,20 +51,21 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "melange-nvim": { "branch": "master", "commit": "ec15b091304580f1d37e711c3a54bc828b09e255" }, - "neoconf.nvim": { "branch": "main", "commit": "9a419c4fa772c4c61839a8f7fdd8e863679a8c94" }, + "neoconf.nvim": { "branch": "main", "commit": "ef304c29977b85c99382fcba821b3f710e144a74" }, "neodev.nvim": { "branch": "main", "commit": "6a533ed9d3435dcaa456380d833ea04da37ea2ed" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, "neogit": { "branch": "master", "commit": "20ab5a688c2de6fa371865528c737ae901989aa5" }, - "neorg": { "branch": "main", "commit": "086891d396ac9fccd91faf1520f563b6eb9eb942" }, + "neorg": { "branch": "main", "commit": "20be50c7651a47813020797075d8c34150e79abd" }, + "neovim": { "branch": "main", "commit": "f48fcd5ccc5f70d8e221e7e2e87ee2003c5eda37" }, "nightfly": { "branch": "master", "commit": "e6be35b24e5ff3736aa9be0d9f39f5c105069f98" }, "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": "c34fa793eafe4623979f780a67f4be6465df5ab5" }, + "nvim": { "branch": "main", "commit": "07679af1af4f446655682ee2557b5840ac551504" }, + "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" }, "nvim-cmp-rust": { "branch": "main", "commit": "1c431ba192a90da36194d8f2fcf14c4ec5afb4a5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-dap": { "branch": "master", "commit": "c1695e500c7d552a0a19953a9aefcc89178fb1af" }, + "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" }, @@ -72,22 +73,22 @@ "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, "nvim-silicon": { "branch": "main", "commit": "ab664633e5090809da7470288404fe5b8735a8c8" }, "nvim-surround": { "branch": "main", "commit": "d47001f8ddf9646c24f16d2732d4d0255acd2121" }, - "nvim-treesitter": { "branch": "master", "commit": "5e4f959d5979730ddb2ee9ae60f5133081502b23" }, + "nvim-treesitter": { "branch": "master", "commit": "aa8d8bc600e00f84d11b9d40c6900d72d0f68fa3" }, "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, "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": "6ed787740a3b275b748328eb2dc7dd22dae1c064" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" }, "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, - "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rainbow_csv": { "branch": "master", "commit": "1fa5483d470d57c54ca65a21aca03bb9c67dc346" }, "runner.nvim": { "branch": "main", "commit": "8358ab780793bc2473ad8117ee487f1a468305bf" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "2d5189e8b63bc004332863bea1fa4909dfda9689" }, + "tailwind-tools.nvim": { "branch": "master", "commit": "b70f182824a3a1832553818ff3045236a8660552" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "4117b6aad1d1fa7526a31bfcdc9741d11ee4a22c" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, @@ -98,15 +99,15 @@ "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": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "telescope-undo.nvim": { "branch": "main", "commit": "d19e2edc8b18d03283bd91f67310ac300ad003ce" }, + "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, - "tokyonight.nvim": { "branch": "main", "commit": "623c3cd60a8081b68edcaf544856c053249a659e" }, - "tree-sitter-hyprlang": { "branch": "master", "commit": "27af9b74acf89fa6bed4fb8cb8631994fcb2e6f3" }, + "tokyonight.nvim": { "branch": "main", "commit": "f4b415bfbce390866a83277db42cf6aa94230728" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" }, "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "typst.vim": { "branch": "main", "commit": "6a68ce290b98b2d88c72fff0de723d7d170287a3" }, + "typst.vim": { "branch": "main", "commit": "86e4fa8dcddd032f9fdbf04602417a8baac8fed3" }, "undotree": { "branch": "master", "commit": "aa93a7e5890dbbebbc064cd22260721a6db1a196" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index bd16b25..a577091 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -85,7 +85,7 @@ return { { name = "buffer", keyword_length = 4 }, { name = "neorg" }, { name = "pypi" }, - { name = "dadbod" }, + { name = "vim-dadbod-completion" }, { name = "env" }, { name = "calc" }, { name = "emoji" }, @@ -119,7 +119,7 @@ return { neorg = "[neorg]", crates = "[crates]", pypi = "[pypi]", - dadbod = "[dadbod]", + vim_dadbod_completion = "[DB]", env = "[env]", buffer = "[buf]", })[entry.source.name] diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index f3949e0..3fbdf41 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -26,4 +26,5 @@ return { { "savq/melange-nvim" }, { "ellisonleao/gruvbox.nvim" }, { "bluz71/vim-nightfly-colors", name = "nightfly" }, + { "rose-pine/neovim" }, } diff --git a/lua/plugins/dadbod.lua b/lua/plugins/dadbod.lua index 7905579..b348510 100644 --- a/lua/plugins/dadbod.lua +++ b/lua/plugins/dadbod.lua @@ -2,8 +2,8 @@ return { "kristijanhusak/vim-dadbod-ui", dependencies = { { "tpope/vim-dotenv" }, - { "tpope/vim-dadbod" }, - { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" } }, + { "tpope/vim-dadbod", lazy = true }, + { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true }, }, cmd = { "DBUI", diff --git a/lua/plugins/lsp/rust.lua b/lua/plugins/lsp/rust.lua deleted file mode 100644 index d6ec3ce..0000000 --- a/lua/plugins/lsp/rust.lua +++ /dev/null @@ -1,12 +0,0 @@ -local M = {} - -M.setup = function(lsp, capabilities) - lsp.rust.setup({ - capabilities = capabilities, - hint = { - enable = true, - }, - }) -end - -return M diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index a498008..de3e170 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,15 +1,32 @@ 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", + { "letieu/harpoon-lualine", dependencies = { + "ThePrimeagen/harpoon", + } }, + }, + opts = { + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + statusline = {}, + winbar = {}, }, - --[[ Available components + ignore_focus = {}, + always_divide_middle = false, + globalstatus = true, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + }, + }, + --[[ Available components `branch` (git branch) `buffers` (shows currently available buffers) `diagnostics` (diagnostics count from your preferred source) @@ -27,23 +44,25 @@ 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", "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" }, + 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" }, }, - }, - { - "letieu/harpoon-lualine", - dependencies = { - { - "ThePrimeagen/harpoon", - }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extentions = { "fzf", "fugitive", "lazy", "mason", "man", "oil", "nvim-dap-ui", "trouble" }, }, } diff --git a/lua/plugins/tailwind_tools.lua b/lua/plugins/tailwind_tools.lua index b8eb9ca..dc7f918 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" }, + ft = { "html" }, opts = { document_color = { enabled = true, -- can be toggled by commands diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index d6a9126..4b6faa9 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,6 +1,6 @@ return { "nvim-telescope/telescope.nvim", - tag = "0.1.5", + version = "*", dependencies = { "nvim-lua/plenary.nvim", { "nvim-tree/nvim-web-devicons" }, @@ -157,10 +157,10 @@ return { [""] = require("telescope.actions").move_selection_previous, [""] = require("telescope.actions").delete_buffer + require("telescope.actions").move_to_top, - [""] = require("trouble").open_with_trouble, + [""] = require("trouble").open_with_trouble, -- [""] = require("telescope.actions").remove_selection }, - n = { [""] = require("trouble").open_with_trouble }, + n = { [""] = require("trouble").open_with_trouble }, }, }, pickers = {