diff --git a/lazy-lock.json b/lazy-lock.json index 9b0c187..737634b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,10 @@ { - "CopilotChat.nvim": { "branch": "main", "commit": "1fe19d1fdbf9edcda8bad9b7b2d5e11aa95c1672" }, + "CopilotChat.nvim": { "branch": "main", "commit": "db95d18a4f645ec6b745ef9db91adf4665824f22" }, "arrow.nvim": { "branch": "master", "commit": "5438c977e729a29d96bd54c8da3103154e80dbd1" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-tags": { "branch": "main", "commit": "e126a09ef49f0611c127dea851fa0052aa223f15" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" }, @@ -18,47 +18,48 @@ "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "14e8ac0173009035e975f8582cfae817b455a700" }, + "fzf-lua": { "branch": "main", "commit": "b7e4d478d0ba4cb8495a7b249fe53cf4613072cf" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "grug-far.nvim": { "branch": "main", "commit": "4b19888719e45ed696d140af2e4e4e3840a5387a" }, - "hardtime.nvim": { "branch": "main", "commit": "027d6f991927a71bd510a7673ae5bb404ca2a1c7" }, + "grug-far.nvim": { "branch": "main", "commit": "938ba023eb5cb462436c8c43fa4d9859242b7ba3" }, + "hardtime.nvim": { "branch": "main", "commit": "2b609c27c0a050e43022f8aaf2fea7ed036df5ef" }, "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "lazy.nvim": { "branch": "main", "commit": "3388a26417c48b15d5266d954f62a4d47fe99490" }, + "lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" }, "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" }, "markview.nvim": { "branch": "main", "commit": "72cd34279e94ee96ee33bdf30a87b00e6d45319d" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "noice.nvim": { "branch": "main", "commit": "72e21399c7b292a2470d9230bf63cad5d6375140" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "noice.nvim": { "branch": "main", "commit": "7b1960c48078a8b2fb44a89db82f4fa637b2d7c8" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, - "nvim-dap": { "branch": "master", "commit": "6fd05c6ee98b08a2c6ee7d81e1927a152990df05" }, + "nvim-cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, + "nvim-dap": { "branch": "master", "commit": "b08e05d7cff6024a9c29b64287d295db7c191450" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-highlight-colors": { "branch": "main", "commit": "e967e2ba13fd4ca731b41d0e5cc1ac2edcd6e25e" }, - "nvim-lspconfig": { "branch": "master", "commit": "64073cbed0ce23e988160bfd1a148a75b6af94cc" }, + "nvim-lspconfig": { "branch": "master", "commit": "5a812abc65d529ea7673059a348814c21d7f87ff" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-neoclip.lua": { "branch": "main", "commit": "32e05f2d23dc5b6a284a688c0535a83d1bfc633f" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-rip-substitute": { "branch": "main", "commit": "028ce006ea1a64998acca68092afa090e6970e55" }, + "nvim-rip-substitute": { "branch": "main", "commit": "afa6d8d2dd426eba90d0cd1c6cef6d6b88c5d8f5" }, "nvim-spider": { "branch": "main", "commit": "8b9dc30243336655699179fd095841adb29434cd" }, - "nvim-treesitter": { "branch": "master", "commit": "c56507f6a16d6a9bd73ab8827a49fa5533aa8fc3" }, - "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, + "nvim-treesitter": { "branch": "master", "commit": "5874cac1b76c97ebb3fc03225bd7215d4e671cd2" }, + "nvim-web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }, "oil-vcs-status": { "branch": "main", "commit": "729f65d5ac6f115df0b54ffd24a4f3f0e8834a47" }, - "oil.nvim": { "branch": "master", "commit": "9a59256c8e88b29d2150e99b5960b2f111e51f75" }, + "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, + "oklch-color-picker.nvim": { "branch": "master", "commit": "6b1f741b96c282ed48875f20249d487eb189eff0" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "ror.nvim": { "branch": "main", "commit": "9d31ad3953be83ac8dd542725ca4881c861f64a5" }, - "snacks.nvim": { "branch": "main", "commit": "974bccb126b6b5d7170c519c380207069d23f557" }, - "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, + "snacks.nvim": { "branch": "main", "commit": "1240316b59062d6d88c50d2196249cb0dce19290" }, + "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, "tfm.nvim": { "branch": "main", "commit": "fb0de2c96bf303216ac5d91ce9bdb7f430030f8b" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "15d83cda572d7498b43bbdaa223bc75bf341183e" }, + "tokyonight.nvim": { "branch": "main", "commit": "b262293ef481b0d1f7a14c708ea7ca649672e200" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, @@ -80,6 +81,6 @@ "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" }, - "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }, + "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }, "zinit-vim-syntax": { "branch": "main", "commit": "109eea5ff87dc046b2bc9f5e9a765941936f30e0" } } diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua index 4c95d5c..d0f6f85 100644 --- a/lua/config/mappings.lua +++ b/lua/config/mappings.lua @@ -2,7 +2,6 @@ vim.keymap.set('n', '', ':set nu! rnu!', {noremap = true, silent = true}) vim.keymap.set('n', '', ':set list! list?', {noremap = false, silent = true}) -- Yazi -vim.keymap.set('n', '', ':ZenMode', {noremap = false, silent = true}) vim.keymap.set('n', 'nm', ':Dispatch npm start', {noremap = false, silent = true}) -- Buffers vim.keymap.set('n', 'bn', ':BufSurfForward', {noremap = false, silent = true}) diff --git a/lua/plugins/indent-blankline.lua b/lua/plugins/indent-blankline.lua deleted file mode 100644 index 382ba00..0000000 --- a/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,29 +0,0 @@ -return { - 'lukas-reineke/indent-blankline.nvim', - main = 'ibl', - event = 'UIEnter', - enabled = true, - opts = { - exclude = { - -- stylua: ignore - filetypes = { - 'dbout', 'neo-tree-popup', 'log', 'gitcommit', - 'txt', 'help', 'NvimTree', 'git', 'flutterToolsOutline', - 'undotree', 'markdown', 'norg', 'org', 'orgagenda', - }, - }, - indent = { - char = '│', -- ▏┆ ┊  - tab_char = '│', - }, - scope = { - char = '▎', - }, - }, - config = function(_, opts) - require('ibl').setup(opts) - local hooks = require('ibl.hooks') - hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark) - hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) - end, -} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 9f29208..9a5cfa0 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -165,17 +165,6 @@ return { "jeffkreeftmeijer/vim-numbertoggle", lazy = false, }, - { - "folke/zen-mode.nvim", - cmd = "ZenMode", - opts = { - plugins = { - gitsigns = false, - tmux = false, - twilight = true, - }, - }, - }, { "lambdalisue/suda.vim", event = 'VeryLazy', @@ -184,10 +173,6 @@ return { "chrisbra/csv.vim", event = 'VeryLazy', }, - { - "folke/twilight.nvim", - event = 'VeryLazy', - }, { "zdharma-continuum/zinit-vim-syntax", event = 'VeryLazy', @@ -285,9 +270,22 @@ return { "ton/vim-bufsurf", event = 'VeryLazy', }, + { + 'eero-lehtinen/oklch-color-picker.nvim', + event = 'VeryLazy', + enabled = true, + config = function() + require('oklch-color-picker').setup {} + -- One handed keymaps recommended, you will be using the mouse + vim.keymap.set('n', 'v', function() + require('oklch-color-picker').pick_under_cursor() + end, { desc = 'Color pick under cursor' }) + end, + }, { "brenoprata10/nvim-highlight-colors", event = 'VeryLazy', + enabled = false, config = function() require('nvim-highlight-colors').setup({ render = "virtual", @@ -352,8 +350,8 @@ return { -- ft = "markdown" -- If you decide to lazy-load anyway dependencies = { - "nvim-treesitter/nvim-treesitter", - "nvim-tree/nvim-web-devicons" + "nvim-treesitter/nvim-treesitter", + "nvim-tree/nvim-web-devicons" } -} + } } diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 349eac5..63cf004 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -3,24 +3,30 @@ return { priority = 1000, lazy = false, opts = { - bigfile = { enabled = true }, - bufdelete = { enabled = true }, + animate = { }, + bigfile = { }, + bufdelete = { }, debug = { enabled = false }, - git = { enabled = true }, - gitbrowse = { enabled = true }, - lazygit = { enabled = true }, - notify = { enabled = true }, + dim = { }, + git = { }, + gitbrowse = { }, + indent = { }, + input = { }, + lazygit = { }, + notify = { }, notifier = { - enabled = true, timeout = 3000, }, - quickfile = { enabled = true }, + quickfile = { }, rename = { enabled = false }, - statuscolumn = { enabled = true }, - terminal = { enabled = true }, - toggle = { enabled = true }, - win = { enabled = true }, - words = { enabled = true }, + scope = { }, + scroll = { }, + statuscolumn = { }, + terminal = { }, + toggle = { }, + win = { }, + words = { }, + zen = { }, styles = { notification = { wo = { wrap = true } -- Wrap notifications @@ -128,6 +134,7 @@ return { { "[[", function() Snacks.words.jump(-vim.v.count1) end, desc = "Prev Reference" }, { ".", function() Snacks.scratch() end, desc = "Toggle Scratch Buffer" }, { "S", function() Snacks.scratch.select() end, desc = "Select Scratch Buffer" }, + { "", function() Snacks.zen() end, desc = "ZEN" }, }, init = function() vim.api.nvim_create_autocmd("User", {