diff --git a/lazy-lock.json b/lazy-lock.json index 4d8d4e3cf..17b352bc1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,386 +1,98 @@ { - "Comment.nvim": { - "branch": "master", - "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" - }, - "LuaSnip": { - "branch": "master", - "commit": "480b032f6708573334f4437d3f83307d143f1a72" - }, - "accelerated-jk.nvim": { - "branch": "main", - "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" - }, - "alpha-nvim": { - "branch": "main", - "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" - }, - "autoclose.nvim": { - "branch": "main", - "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" - }, - "better-escape.nvim": { - "branch": "master", - "commit": "7031dc734add47bb71c010e0551829fa5799375f" - }, - "bigfile.nvim": { - "branch": "main", - "commit": "9616b73670ffeb92679677554ded88854ae42cf8" - }, - "bufferline.nvim": { - "branch": "main", - "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" - }, - "catppuccin": { - "branch": "refactor/syntax-highlighting", - "commit": "cd86774aa676828dc637ffec754418e4104ed452" - }, - "clever-f.vim": { - "branch": "master", - "commit": "6a3ac5e3688598af9411ab741737f98c47370c22" - }, - "cmp-buffer": { - "branch": "main", - "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" - }, - "cmp-latex-symbols": { - "branch": "main", - "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" - }, - "cmp-nvim-lsp": { - "branch": "main", - "commit": "44b16d11215dce86f253ce0c30949813c0a90765" - }, - "cmp-nvim-lua": { - "branch": "main", - "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" - }, - "cmp-pandoc-references": { - "branch": "master", - "commit": "0f84af3682be2845775f811b82251edeadb8faf6" - }, - "cmp-path": { - "branch": "main", - "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" - }, - "cmp-spell": { - "branch": "master", - "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" - }, - "cmp-tmux": { - "branch": "main", - "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" - }, - "cmp-treesitter": { - "branch": "master", - "commit": "c8e3a74b51597d69d240085a258636972ce98e15" - }, - "cmp-under-comparator": { - "branch": "master", - "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" - }, - "cmp_luasnip": { - "branch": "master", - "commit": "18095520391186d634a0045dacaa346291096566" - }, - "copilot-cmp": { - "branch": "master", - "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" - }, - "copilot.lua": { - "branch": "master", - "commit": "1a8032ae496916ccc7a7a52ee79194fbef29f462" - }, - "crates.nvim": { - "branch": "main", - "commit": "04a06cee3fb9c584de4f5481eb4080bd6c759336" - }, - "csv.vim": { - "branch": "master", - "commit": "15ff93edf5b26c466affbb356e0696b7d6a3b499" - }, - "diffview.nvim": { - "branch": "main", - "commit": "a111d19ccceac6530448d329c63f998f77b5626e" - }, - "fidget.nvim": { - "branch": "legacy", - "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" - }, - "focus.nvim": { - "branch": "master", - "commit": "40fee169fa502eb0b87bcaa0f8e2af051326ed14" - }, - "friendly-snippets": { - "branch": "main", - "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" - }, - "fzy-lua-native": { - "branch": "master", - "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" - }, - "gitsigns.nvim": { - "branch": "main", - "commit": "bdeba1cec3faddd89146690c10b9a87949c0ee66" - }, - "glance.nvim": { - "branch": "master", - "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" - }, - "hop.nvim": { - "branch": "master", - "commit": "f2508f415b9fe34082696009574ca26f57a66531" - }, - "indent-blankline.nvim": { - "branch": "master", - "commit": "12f4fffcfca59816267b5a364f19f986c8d14040" - }, - "knap": { - "branch": "main", - "commit": "503010f541696e99ed5c62f658620e546cebf8b0" - }, - "lazy.nvim": { - "branch": "main", - "commit": "7ca3bdb566c3ba4492f2d22b37c2c9e26f09470f" - }, - "lsp-format-modifications.nvim": { - "branch": "main", - "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" - }, - "lsp_signature.nvim": { - "branch": "master", - "commit": "46ab0c1fe34aed7e442cc7b747d99197cc0ccf31" - }, - "lspsaga.nvim": { - "branch": "main", - "commit": "b7873e556a5451c5febc0d46ba80767b2beea49e" - }, - "lualine.nvim": { - "branch": "master", - "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" - }, - "markdown-preview.nvim": { - "branch": "master", - "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" - }, - "mason-lspconfig.nvim": { - "branch": "main", - "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" - }, - "mason-null-ls.nvim": { - "branch": "main", - "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" - }, - "mason-nvim-dap.nvim": { - "branch": "main", - "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" - }, - "mason.nvim": { - "branch": "main", - "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" - }, - "neodim": { - "branch": "master", - "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" - }, - "neoscroll.nvim": { - "branch": "master", - "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" - }, - "null-ls.nvim": { - "branch": "main", - "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" - }, - "nvim-bufdel": { - "branch": "main", - "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" - }, - "nvim-cmp": { - "branch": "main", - "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" - }, - "nvim-colorizer.lua": { - "branch": "master", - "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" - }, - "nvim-dap": { - "branch": "master", - "commit": "b3d4408e29d924fe130c9397a7c3b3630b3ea671" - }, - "nvim-dap-ui": { - "branch": "master", - "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" - }, - "nvim-lspconfig": { - "branch": "master", - "commit": "c7077400d004c1a424d210af76ce198250db72fd" - }, - "nvim-notify": { - "branch": "master", - "commit": "94859430020f5cf32a1b97ddd9e596fed9db7981" - }, - "nvim-scrollview": { - "branch": "main", - "commit": "b0737d036cfbb39e066d144702197eda0a4b6cf1" - }, - "nvim-tree.lua": { - "branch": "master", - "commit": "934469b9b6df369e198fb3016969e56393b0dc07" - }, - "nvim-treehopper": { - "branch": "master", - "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" - }, - "nvim-treesitter": { - "branch": "master", - "commit": "cb139d880bcf9b3a6f29f2bd088a7491d1662918" - }, - "nvim-treesitter-context": { - "branch": "master", - "commit": "44d270e9d1647088de596a2e04fdc806a50cd838" - }, - "nvim-treesitter-textobjects": { - "branch": "master", - "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" - }, - "nvim-ts-autotag": { - "branch": "main", - "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" - }, - "nvim-ts-context-commentstring": { - "branch": "main", - "commit": "95e9ba9de4289d221666b66fd930d157c7ca08c6" - }, - "nvim-web-devicons": { - "branch": "master", - "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" - }, - "obsidian.nvim": { - "branch": "main", - "commit": "52c06a056c62cc38a461cde603842af8a533bf63" - }, - "paint.nvim": { - "branch": "main", - "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" - }, - "persisted.nvim": { - "branch": "main", - "commit": "315cd1a8a501ca8e0c1d55f0c245b9cc0e1ffa01" - }, - "plenary.nvim": { - "branch": "master", - "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" - }, - "project.nvim": { - "branch": "main", - "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" - }, - "rainbow-delimiters.nvim": { - "branch": "master", - "commit": "6b9fc617ad52f25372d1855e049cae3af348bc09" - }, - "rust-tools.nvim": { - "branch": "master", - "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" - }, - "smartyank.nvim": { - "branch": "master", - "commit": "7e3905578f646503525b2f7018b8afd17861018c" - }, - "sniprun": { - "branch": "master", - "commit": "1c4bc063522946676dd178d01d6fc130d3e41da5" - }, - "specs.nvim": { - "branch": "main", - "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" - }, - "suda.vim": { - "branch": "master", - "commit": "8b0fc3711760195aba104e2d190cff9af8267052" - }, - "symbols-outline.nvim": { - "branch": "master", - "commit": "512791925d57a61c545bc303356e8a8f7869763c" - }, - "tabout.nvim": { - "branch": "master", - "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" - }, - "telescope-bibtex.nvim": { - "branch": "master", - "commit": "e4dcf64d351db23b14be3563190cf68d5cd49e90" - }, - "telescope-frecency.nvim": { - "branch": "master", - "commit": "eaaabc90ed082b84a2e9b0ce4ab8c6753b7c50f9" - }, - "telescope-fzf-native.nvim": { - "branch": "main", - "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" - }, - "telescope-live-grep-args.nvim": { - "branch": "master", - "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" - }, - "telescope-undo.nvim": { - "branch": "main", - "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" - }, - "telescope-zoxide": { - "branch": "main", - "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" - }, - "telescope.nvim": { - "branch": "master", - "commit": "84d53dfdbefbdf84e861a288abc71ef8ccafd04e" - }, - "toggleterm.nvim": { - "branch": "main", - "commit": "61e8ad370d4da5d84c77e31671027bc094ac06ca" - }, - "trouble.nvim": { - "branch": "main", - "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" - }, - "vim-cool": { - "branch": "master", - "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" - }, - "vim-easy-align": { - "branch": "master", - "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" - }, - "vim-fugitive": { - "branch": "master", - "commit": "99db68d9b3304580bd383da7aaee05c7a954a344" - }, - "vim-go": { - "branch": "master", - "commit": "a2e59981a2d965bed9f4052fa15a08d2ee2f8040" - }, - "vim-illuminate": { - "branch": "master", - "commit": "1b5d70332a51a1de05f281069851865a2bb1e6d7" - }, - "vim-matchup": { - "branch": "master", - "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" - }, - "vim-pencil": { - "branch": "master", - "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" - }, - "vimtex": { - "branch": "master", - "commit": "d08da8034bab1fae423bd36aa606ee3012cf2833" - }, - "which-key.nvim": { - "branch": "main", - "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" - }, - "wilder.nvim": { - "branch": "master", - "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" - } -} + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" }, + "accelerated-jk.nvim": { "branch": "main", "commit": "8fb5dad4ccc1811766cebf16b544038aeeb7806f" }, + "alpha-nvim": { "branch": "main", "commit": "234822140b265ec4ba3203e3e0be0e0bb826dff5" }, + "autoclose.nvim": { "branch": "main", "commit": "37e11589aac55b0e8810dc5865f898f9cb36fef6" }, + "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, + "bigfile.nvim": { "branch": "main", "commit": "9616b73670ffeb92679677554ded88854ae42cf8" }, + "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, + "catppuccin": { "branch": "refactor/syntax-highlighting", "commit": "2c814f46dd02e8b8cc6ab5f5f3c38781573cb20b" }, + "clever-f.vim": { "branch": "master", "commit": "6a3ac5e3688598af9411ab741737f98c47370c22" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-latex-symbols": { "branch": "main", "commit": "165fb66afdbd016eaa1570e41672c4c557b57124" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-pandoc-references": { "branch": "master", "commit": "0f84af3682be2845775f811b82251edeadb8faf6" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, + "cmp-tmux": { "branch": "main", "commit": "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845" }, + "cmp-treesitter": { "branch": "master", "commit": "c8e3a74b51597d69d240085a258636972ce98e15" }, + "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, + "copilot.lua": { "branch": "master", "commit": "688762a3999eeee54b78f447719854f52672ec02" }, + "crates.nvim": { "branch": "main", "commit": "aac57ef84cf4fecf7907114b22e875f84a6128ee" }, + "csv.vim": { "branch": "master", "commit": "4fd88346aed02123aa5daa1a363868a576c6fdcf" }, + "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, + "fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" }, + "focus.nvim": { "branch": "master", "commit": "5269ea70e2003d9dac199584b093323752a472ba" }, + "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, + "fzy-lua-native": { "branch": "master", "commit": "820f745b7c442176bcc243e8f38ef4b985febfaf" }, + "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, + "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, + "hop.nvim": { "branch": "master", "commit": "275dcbc84e8167c7d64b4584770d837f3ce21562" }, + "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, + "knap": { "branch": "main", "commit": "503010f541696e99ed5c62f658620e546cebf8b0" }, + "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" }, + "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" }, + "lsp_signature.nvim": { "branch": "master", "commit": "733d95e7a76eebfb464143b0adadf139002304a4" }, + "lspsaga.nvim": { "branch": "main", "commit": "85f7c38d96924fd3c457ea0a31667cc1bd06b5e0" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" }, + "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, + "neodim": { "branch": "master", "commit": "9477da03b93f1984a81fee3b92e6ac7c6ada6aa4" }, + "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, + "nvim-bufdel": { "branch": "main", "commit": "96c4f7ab053ddab0025bebe5f7c71e4795430e47" }, + "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, + "nvim-dap": { "branch": "master", "commit": "79dbc70eb79271ad801e4ff293887cde324c28d0" }, + "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, + "nvim-lspconfig": { "branch": "master", "commit": "d0467b9574b48429debf83f8248d8cee79562586" }, + "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, + "nvim-scrollview": { "branch": "main", "commit": "e8befc94ea66194700495d2f71419ba112634b0b" }, + "nvim-tree.lua": { "branch": "master", "commit": "7e3c0bee7b246ca835d5f7453db6fa19de359bab" }, + "nvim-treehopper": { "branch": "master", "commit": "5a28bff46c05d28bdb4bcaef67e046eb915a9390" }, + "nvim-treesitter": { "branch": "master", "commit": "efec7115d8175bdb6720eeb4e26196032cb52593" }, + "nvim-treesitter-context": { "branch": "master", "commit": "2806d83e3965017382ce08792ee527e708fa1bd4" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "e69a504baf2951d52e1f1fbb05145d43f236cbf1" }, + "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, + "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, + "obsidian.nvim": { "branch": "main", "commit": "37b0ddccbd223c465ea97faadee2039b41ff1d70" }, + "paint.nvim": { "branch": "main", "commit": "6ce64212804f425073c61ab0d9c2b034f0435260" }, + "persisted.nvim": { "branch": "main", "commit": "deae7ab2021abe31418ff7b088048054fbe79c45" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "df8cdf68234fbf056202a9684931c3dfa89988c1" }, + "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, + "smartyank.nvim": { "branch": "master", "commit": "7e3905578f646503525b2f7018b8afd17861018c" }, + "sniprun": { "branch": "master", "commit": "1c4bc063522946676dd178d01d6fc130d3e41da5" }, + "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" }, + "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "tabout.nvim": { "branch": "master", "commit": "0d275c8d25f32457e67b5c66d6ae43f26a61bce5" }, + "telescope-bibtex.nvim": { "branch": "master", "commit": "4adb8f494b2063a74766e1253f3d18e99117e5f4" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "daf59744f60e34cbb48a40a092e9e735553b6f21" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "telescope-live-grep-args.nvim": { "branch": "master", "commit": "851c0997d55601f2afd7290db0f90dc364e29f58" }, + "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, + "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, + "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" }, + "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, + "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" }, + "vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" }, + "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, + "vim-go": { "branch": "master", "commit": "1401b576c6ac382529188d3d26cff866139f2f9a" }, + "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, + "vim-matchup": { "branch": "master", "commit": "6dbe108230c7dbbf00555b7d4d9f6a891837ef07" }, + "vim-pencil": { "branch": "master", "commit": "6d70438a8886eaf933c38a7a43a61adb0a7815ed" }, + "vimtex": { "branch": "master", "commit": "7785ecd75b9a71a22ac33a8250e3bf4eaca6b439" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, + "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } +} \ No newline at end of file diff --git a/lua/core/init.lua b/lua/core/init.lua index 7eab76f76..60fb8dbe2 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -1,3 +1,4 @@ +local settings = require("core.settings") local global = require("core.global") -- Create cache dir and data dirs @@ -77,18 +78,15 @@ local leader_map = function() vim.api.nvim_set_keymap("x", " ", "", { noremap = true }) end +local gui_config = function() + vim.api.nvim_set_option_value("guifont", settings.gui_config.font_name .. ":h" .. settings.gui_config.font_size, {}) +end + local neovide_config = function() vim.api.nvim_set_option_value("guifont", "Hack:h15", {}) - vim.g.neovide_refresh_rate = 120 - vim.g.neovide_cursor_vfx_mode = "railgun" - vim.g.neovide_no_idle = true - vim.g.neovide_cursor_animation_length = 0.03 - vim.g.neovide_cursor_trail_length = 0.05 - vim.g.neovide_cursor_antialiasing = true - vim.g.neovide_cursor_vfx_opacity = 200.0 - vim.g.neovide_cursor_vfx_particle_lifetime = 1.2 - vim.g.neovide_cursor_vfx_particle_speed = 20.0 - vim.g.neovide_cursor_vfx_particle_density = 5.0 + for name, config in ipairs(settings.neovide_config) do + vim.g["neovide_" .. name] = config + end end local dashboard_config = function() @@ -213,6 +211,7 @@ local load_core = function() disable_distribution_plugins() leader_map() + gui_config() neovide_config() clipboard_config() shell_config() @@ -223,10 +222,8 @@ local load_core = function() require("core.event") require("core.pack") - -- vim.api.nvim_command([[set background=light]]) - vim.api.nvim_command([[colorscheme catppuccin]]) - local colorscheme = require("core.settings").colorscheme - local background = require("core.settings").background + local colorscheme = settings.colorscheme + local background = settings.background vim.api.nvim_command("set background=" .. background) vim.api.nvim_command("colorscheme " .. colorscheme) vim.api.nvim_command("set modelines=" .. 0) diff --git a/lua/core/options.lua b/lua/core/options.lua index d62ca31b1..8edb96346 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -97,7 +97,7 @@ local function load_options() wildignorecase = true, -- Do NOT adjust the following option (winblend) if you're using transparent background winblend = 0, - winminwidth = 1, + winminwidth = 5, winwidth = 30, wrap = false, wrapscan = true, diff --git a/lua/core/settings.lua b/lua/core/settings.lua index 38d62e66a..fd44daf16 100644 --- a/lua/core/settings.lua +++ b/lua/core/settings.lua @@ -161,4 +161,30 @@ settings["treesitter_deps"] = { "yaml", } +-- Set the options for neovim's gui clients like `neovide` and `neovim-qt` here. +-- NOTE: Currently, only the following options related to the GUI are supported. Other entries will be IGNORED. +---@type { font_name: string, font_size: number } +settings["gui_config"] = { + font_name = "JetBrainsMono Nerd Font", + font_size = 12, +} + +-- Set the options specific to `neovide` here. +-- NOTE: You should remove the `neovide_` prefix (with trailing underscore) from all your entries below. +-- Check the below link for all supported entries: +-- https://neovide.dev/configuration.html +---@type table +settings["neovide_config"] = { + no_idle = true, + refresh_rate = 120, + cursor_vfx_mode = "railgun", + cursor_vfx_opacity = 200.0, + cursor_antialiasing = true, + cursor_trail_length = 0.05, + cursor_animation_length = 0.03, + cursor_vfx_particle_speed = 20.0, + cursor_vfx_particle_density = 5.0, + cursor_vfx_particle_lifetime = 1.2, +} + return require("modules.utils").extend_config(settings, "user.settings") diff --git a/lua/keymap/completion.lua b/lua/keymap/completion.lua index dfec1b256..4163db789 100644 --- a/lua/keymap/completion.lua +++ b/lua/keymap/completion.lua @@ -13,26 +13,45 @@ local mapping = {} function mapping.lsp(buf) local map = { -- LSP-related keymaps, ONLY effective in buffers with LSP(s) attached - ["n|li"] = map_cr("LspInfo"):with_buffer(buf):with_desc("lsp: Info"), - ["n|lr"] = map_cr("LspRestart"):with_buffer(buf):with_nowait():with_desc("lsp: Restart"), - ["n|go"] = map_cr("SymbolsOutline"):with_buffer(buf):with_desc("lsp: Toggle outline"), - ["n|g["] = map_cr("Lspsaga diagnostic_jump_prev"):with_buffer(buf):with_desc("lsp: Prev diagnostic"), - ["n|g]"] = map_cr("Lspsaga diagnostic_jump_next"):with_buffer(buf):with_desc("lsp: Next diagnostic"), + ["n|li"] = map_cr("LspInfo"):with_silent():with_buffer(buf):with_desc("lsp: Info"), + ["n|lr"] = map_cr("LspRestart"):with_silent():with_buffer(buf):with_nowait():with_desc("lsp: Restart"), + ["n|go"] = map_cr("SymbolsOutline"):with_silent():with_buffer(buf):with_desc("lsp: Toggle outline"), + ["n|g["] = map_cr("Lspsaga diagnostic_jump_prev") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Prev diagnostic"), + ["n|g]"] = map_cr("Lspsaga diagnostic_jump_next") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Next diagnostic"), ["n|ld"] = map_cr("Lspsaga show_line_diagnostics ++unfocus") + :with_silent() :with_buffer(buf) :with_desc("lsp: Line diagnostic"), ["n|gs"] = map_callback(function() vim.lsp.buf.signature_help() end):with_desc("lsp: Signature help"), - ["n|gr"] = map_cr("Lspsaga rename"):with_buffer(buf):with_desc("lsp: Rename in file range"), - ["n|gR"] = map_cr("Lspsaga rename ++project"):with_buffer(buf):with_desc("lsp: Rename in project range"), - ["n|K"] = map_cr("Lspsaga hover_doc"):with_buffer(buf):with_desc("lsp: Show doc"), - ["nv|ga"] = map_cr("Lspsaga code_action"):with_buffer(buf):with_desc("lsp: Code action for cursor"), - ["n|gd"] = map_cr("Glance definitions"):with_buffer(buf):with_desc("lsp: Preview definition"), - ["n|gD"] = map_cr("Lspsaga goto_definition"):with_buffer(buf):with_desc("lsp: Goto definition"), - ["n|gh"] = map_cr("Glance references"):with_buffer(buf):with_desc("lsp: Show reference"), - ["n|ci"] = map_cr("Lspsaga incoming_calls"):with_buffer(buf):with_desc("lsp: Show incoming calls"), - ["n|co"] = map_cr("Lspsaga outgoing_calls"):with_buffer(buf):with_desc("lsp: Show outgoing calls"), + ["n|gr"] = map_cr("Lspsaga rename"):with_silent():with_buffer(buf):with_desc("lsp: Rename in file range"), + ["n|gR"] = map_cr("Lspsaga rename ++project") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Rename in project range"), + ["n|K"] = map_cr("Lspsaga hover_doc"):with_silent():with_buffer(buf):with_desc("lsp: Show doc"), + ["nv|ga"] = map_cr("Lspsaga code_action") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Code action for cursor"), + ["n|gd"] = map_cr("Glance definitions"):with_silent():with_buffer(buf):with_desc("lsp: Preview definition"), + ["n|gD"] = map_cr("Lspsaga goto_definition"):with_silent():with_buffer(buf):with_desc("lsp: Goto definition"), + ["n|gh"] = map_cr("Glance references"):with_silent():with_buffer(buf):with_desc("lsp: Show reference"), + ["n|ci"] = map_cr("Lspsaga incoming_calls") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Show incoming calls"), + ["n|co"] = map_cr("Lspsaga outgoing_calls") + :with_silent() + :with_buffer(buf) + :with_desc("lsp: Show outgoing calls"), } bind.nvim_load_mapping(map) diff --git a/lua/modules/configs/ui/lualine.lua b/lua/modules/configs/ui/lualine.lua index 9b3fcc951..18f487b2b 100644 --- a/lua/modules/configs/ui/lualine.lua +++ b/lua/modules/configs/ui/lualine.lua @@ -1,4 +1,5 @@ return function() + local has_catppuccin = vim.g.colors_name:find("catppuccin") ~= nil local colors = require("modules.utils").get_palette() local icons = { diagnostics = require("modules.utils.icons").get("diagnostics", true), @@ -13,39 +14,44 @@ return function() group = vim.api.nvim_create_augroup("LualineColorScheme", { clear = true }), pattern = "*", callback = function() + has_catppuccin = vim.g.colors_name:find("catppuccin") ~= nil require("lualine").setup({ options = { theme = custom_theme() } }) end, }) - colors = require("modules.utils").get_palette() - local universal_bg = require("core.settings").transparent_background and "NONE" or colors.mantle - return { - normal = { - a = { fg = colors.lavender, bg = colors.surface0, gui = "bold" }, - b = { fg = colors.text, bg = universal_bg }, - c = { fg = colors.text, bg = universal_bg }, - }, - command = { - a = { fg = colors.peach, bg = colors.surface0, gui = "bold" }, - }, - insert = { - a = { fg = colors.green, bg = colors.surface0, gui = "bold" }, - }, - visual = { - a = { fg = colors.flamingo, bg = colors.surface0, gui = "bold" }, - }, - terminal = { - a = { fg = colors.teal, bg = colors.surface0, gui = "bold" }, - }, - replace = { - a = { fg = colors.red, bg = colors.surface0, gui = "bold" }, - }, - inactive = { - a = { fg = colors.subtext0, bg = universal_bg, gui = "bold" }, - b = { fg = colors.subtext0, bg = universal_bg }, - c = { fg = colors.subtext0, bg = universal_bg }, - }, - } + if has_catppuccin then + colors = require("modules.utils").get_palette() + local universal_bg = require("core.settings").transparent_background and "NONE" or colors.mantle + return { + normal = { + a = { fg = colors.lavender, bg = colors.surface0, gui = "bold" }, + b = { fg = colors.text, bg = universal_bg }, + c = { fg = colors.text, bg = universal_bg }, + }, + command = { + a = { fg = colors.peach, bg = colors.surface0, gui = "bold" }, + }, + insert = { + a = { fg = colors.green, bg = colors.surface0, gui = "bold" }, + }, + visual = { + a = { fg = colors.flamingo, bg = colors.surface0, gui = "bold" }, + }, + terminal = { + a = { fg = colors.teal, bg = colors.surface0, gui = "bold" }, + }, + replace = { + a = { fg = colors.red, bg = colors.surface0, gui = "bold" }, + }, + inactive = { + a = { fg = colors.subtext0, bg = universal_bg, gui = "bold" }, + b = { fg = colors.subtext0, bg = universal_bg }, + c = { fg = colors.subtext0, bg = universal_bg }, + }, + } + else + return "auto" + end end local mini_sections = { @@ -104,18 +110,23 @@ return function() ---@param special_nobg boolean @Disable guibg for transparent backgrounds? ---@param bg string? @Background hl group ---@param gui string? @GUI highlight arguments - ---@return fun():lualine_hlgrp + ---@return nil|fun():lualine_hlgrp gen_hl = function(fg, gen_bg, special_nobg, bg, gui) - return function() - local guifg = colors[fg] - local guibg = gen_bg and require("modules.utils").hl_to_rgb("StatusLine", true, colors.mantle) - or colors[bg] - local nobg = special_nobg and require("core.settings").transparent_background - return { - fg = guifg and guifg or colors.none, - bg = (guibg and not nobg) and guibg or colors.none, - gui = gui and gui or nil, - } + if has_catppuccin then + return function() + local guifg = colors[fg] + local guibg = gen_bg and require("modules.utils").hl_to_rgb("StatusLine", true, colors.mantle) + or colors[bg] + local nobg = special_nobg and require("core.settings").transparent_background + return { + fg = guifg and guifg or colors.none, + bg = (guibg and not nobg) and guibg or colors.none, + gui = gui and gui or nil, + } + end + else + -- Return `nil` if the theme is user-defined + return nil end end, } diff --git a/lua/modules/utils/init.lua b/lua/modules/utils/init.lua index bc402b7ed..c1bfe0ace 100644 --- a/lua/modules/utils/init.lua +++ b/lua/modules/utils/init.lua @@ -260,7 +260,7 @@ local function tbl_recursive_merge(dst, src) dst[key] = value(dst[key]) elseif type(dst[key]) == "table" and vim.tbl_islist(dst[key]) then vim.list_extend(dst[key], value) - elseif type(dst[key]) == "table" and not vim.tbl_islist(dst[key]) then + elseif type(dst[key]) == "table" and type(value) == "table" and not vim.tbl_islist(dst[key]) then tbl_recursive_merge(dst[key], value) else dst[key] = value diff --git a/scripts/install.ps1 b/scripts/install.ps1 index c53f1f832..3447b3dfb 100644 --- a/scripts/install.ps1 +++ b/scripts/install.ps1 @@ -158,7 +158,7 @@ function query_pack { } else { _abort -Msg "Required executable not found." -Type "NotInstalled" -Info_msg @' You must install a modern package manager before installing this Nvim config. -Avaliable choices are: +Available choices are: - Chocolatey https://chocolatey.org/install#individual ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯