diff --git a/init.lua b/init.lua index 956a382..5321db5 100644 --- a/init.lua +++ b/init.lua @@ -4,8 +4,7 @@ require('config.font') -- LAZY require('config.lazy') -- UTIL --- require('util.hjkl_notifier') -require('util.new_note') +require('util.hjkl_notifier') -- COMPLETION require('config.completion') -- KEYMAP diff --git a/lazy-lock.json b/lazy-lock.json index 6e6013b..686840f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,9 +2,9 @@ "CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, "arrow.nvim": { "branch": "master", "commit": "5438c977e729a29d96bd54c8da3103154e80dbd1" }, "blink-cmp-copilot": { "branch": "main", "commit": "5d4ed42c5d7d144012792bb6cc4ac7899a108169" }, - "blink-ripgrep.nvim": { "branch": "main", "commit": "d93f97412462ab34d16fc04fe43b0a6170cc3834" }, + "blink-ripgrep.nvim": { "branch": "main", "commit": "a17697bba1bd351f6686b9f9285cf2fd1b03cf4a" }, "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" }, - "colorful-menu.nvim": { "branch": "master", "commit": "785a0d808969c1adabd4d8b039c9c548cb6f72d5" }, + "colorful-menu.nvim": { "branch": "master", "commit": "4a17385c4e229027eb6de0f4d3e095448ab3dec1" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "csv.vim": { "branch": "master", "commit": "44aeb7e26e8b42f7c14c328f16ac4744ae53b22c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -14,7 +14,7 @@ "formatter.nvim": { "branch": "master", "commit": "eb89a1f3e079f1b9680bc7293b75fffccb5e1598" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fzf-lua": { "branch": "main", "commit": "e59fac8ac4188984a2b69d4a7d1375ccb866dbbb" }, - "gitsigns.nvim": { "branch": "main", "commit": "0797734e2bf229cc67b05e82a17e22a18f191913" }, + "gitsigns.nvim": { "branch": "main", "commit": "ac38d7860b258ec07085d8d1931e1a487bcee21d" }, "grug-far.nvim": { "branch": "main", "commit": "8e8f3429038d45a6d4144c0642d92f470e5480f3" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lspkind-nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, @@ -30,26 +30,25 @@ "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" }, "nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, - "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, + "nvim-lspconfig": { "branch": "master", "commit": "9ee2e7dac2e1c74538a0e0d79b9e2d59a8517bd6" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-neoclip.lua": { "branch": "main", "commit": "c4ce7f6c402872469795f8a47ffabe87e142f0fb" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" }, "nvim-rip-substitute": { "branch": "main", "commit": "7be26ea5ebb0fe38fbfc3c69c22d535d02c9ab1e" }, "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" }, - "nvim-treesitter": { "branch": "master", "commit": "fd59f984416f696d85119fd4d15ce0965b179944" }, + "nvim-treesitter": { "branch": "master", "commit": "0fb02ac5c39423b5c863eb7c8dd7b093879f1488" }, "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, "oil-vcs-status": { "branch": "main", "commit": "729f65d5ac6f115df0b54ffd24a4f3f0e8834a47" }, "oil.nvim": { "branch": "master", "commit": "09fa1d22f5edf0730824d2b222d726c8c81bbdc9" }, - "oklch-color-picker.nvim": { "branch": "master", "commit": "24f46c92c2d8228843a4628530ec873469650d16" }, + "oklch-color-picker.nvim": { "branch": "master", "commit": "b1d5003a263dc10cb251212c329e57045b72fdfe" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "snacks.nvim": { "branch": "main", "commit": "afef949d88b6fa3dde8515b27066b132cfdb0a70" }, + "snacks.nvim": { "branch": "main", "commit": "57e047f2bc4efb5d393d3e1edc4e185892bceb39" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, "tfm.nvim": { "branch": "main", "commit": "fb0de2c96bf303216ac5d91ce9bdb7f430030f8b" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" }, + "tokyonight.nvim": { "branch": "main", "commit": "c3ab53c3f544e4a04f2a05d43451fd9bedff51b4" }, "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" }, "vim-bufsurf": { "branch": "master", "commit": "e6dbc7ad66c7e436e5eb20d304464e378bd7f28c" }, @@ -68,6 +67,5 @@ "vim-sandwich": { "branch": "master", "commit": "74cf93d58ccc567d8e2310a69860f1b93af19403" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }, - "zinit-vim-syntax": { "branch": "main", "commit": "109eea5ff87dc046b2bc9f5e9a765941936f30e0" } + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" } } diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua index 82b7044..4c2059d 100644 --- a/lua/config/mappings.lua +++ b/lua/config/mappings.lua @@ -9,11 +9,6 @@ vim.keymap.set('n', 'dd', ':windo diffthis', {noremap = false, silen vim.keymap.set('n', 'e', vim.diagnostic.open_float, {noremap = true, silent = true}) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, {noremap = true, silent = true}) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, {noremap = true, silent = true}) --- Notes & Todo -vim.keymap.set('n', 'tv', ":lua require('util.scratches').open_scratch_file()", {noremap = true, silent = true}) -vim.keymap.set('n', 'nt', ":lua require('util.scratches').open_scratch_file_floating()", {noremap = true, silent = true}) -vim.keymap.set('n', 'n', ":lua require('plugins.telescope').my_note()", {noremap = true, silent = true}) -vim.keymap.set('n', 'nn', ":lua NewNote()", {noremap = true, silent = true}) -- ROR vim.keymap.set("n", "or", ":! overmind restart", { silent = true }) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 1be7bfb..4022e5d 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -47,16 +47,6 @@ return { "christoomey/vim-tmux-navigator", lazy = false, }, - { - "folke/todo-comments.nvim", - lazy = false, - opts = {}, - keys = { - { "tT", function () Snacks.picker.todo_comments({ keywords = { "TODO" } }) end, desc = "Todo" }, - { "tF", function () Snacks.picker.todo_comments({ keywords = { "FIX", "FIXME" } }) end, desc = "Fix/Fixme" }, - { "tN", function () Snacks.picker.todo_comments({ keywords = { "NOTE" } }) end, desc = "Note" }, - }, - }, { "jeffkreeftmeijer/vim-numbertoggle", lazy = false, @@ -69,10 +59,6 @@ return { "chrisbra/csv.vim", event = 'VeryLazy', }, - { - "zdharma-continuum/zinit-vim-syntax", - event = 'VeryLazy', - }, { "nvim-tree/nvim-web-devicons", event = 'VeryLazy', diff --git a/lua/plugins/neoclip.lua b/lua/plugins/neoclip.lua deleted file mode 100644 index 6a89095..0000000 --- a/lua/plugins/neoclip.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "AckslD/nvim-neoclip.lua", - requires = { - { 'ibhagwan/fzf-lua' } - }, - config = function() - require("neoclip").setup() - end -} diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..4b6aa98 --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,10 @@ +return { + "folke/todo-comments.nvim", + lazy = false, + opts = {}, + keys = { + { "tT", function () Snacks.picker.todo_comments({ keywords = { "TODO" } }) end, desc = "Todo" }, + { "tF", function () Snacks.picker.todo_comments({ keywords = { "FIX", "FIXME" } }) end, desc = "Fix/Fixme" }, + { "tN", function () Snacks.picker.todo_comments({ keywords = { "NOTE" } }) end, desc = "Note" }, + }, +} diff --git a/lua/util/new_note.lua b/lua/util/new_note.lua deleted file mode 100644 index 6bd65c2..0000000 --- a/lua/util/new_note.lua +++ /dev/null @@ -1,5 +0,0 @@ -function NewNote() - vim.ui.input({ prompt = "Name: ", relative = "editor" }, function(name) - vim.api.nvim_command(":e ~/Notes/"..name..".md") - end) -end diff --git a/lua/util/scratches.lua b/lua/util/scratches.lua deleted file mode 100644 index 4d043f6..0000000 --- a/lua/util/scratches.lua +++ /dev/null @@ -1,85 +0,0 @@ --- Credits to https://github.com/GustavoKatel/ --- some helpers to manage scratches - -local M = { - _state = { - last_floating_window = nil, - }, -} - -function M.get_scratch_filename() - return "~/Notes/todo.md" -end - -function M.open_scratch_file() - vim.api.nvim_command("!mkdir -p ~/Notes") - vim.api.nvim_command("vsplit " .. M.get_scratch_filename()) -end - -vim.api.nvim_create_user_command("ScratchOpenSplit", M.open_scratch_file, {}) - -function M.open_scratch_file_floating(opts) - if M._state.last_floating_window ~= nil then - vim.api.nvim_win_close(M._state.last_floating_window, false) - M._state.last_floating_window = nil - end - - opts = vim.tbl_deep_extend("force", { percentWidth = 0.8, percentHeight = 0.8 }, opts or {}) - - -- Get the current UI - local ui = vim.api.nvim_list_uis()[1] - - local width = math.floor(ui.width * opts.percentWidth) - local height = math.floor(ui.height * opts.percentHeight) - - -- Create the floating window - local win_opts = { - relative = "editor", - width = width, - height = height, - col = (ui.width / 2) - (width / 2), - row = (ui.height / 2) - (height / 2), - anchor = "NW", - style = "minimal", - border = { "┏", "━", "┓", "┃", "┛","━", "┗", "┃" }, - } - local winnr = vim.api.nvim_open_win(0, true, win_opts) - M._state.last_floating_window = winnr - - vim.api.nvim_command("edit " .. M.get_scratch_filename()) - - local bufnr = vim.api.nvim_get_current_buf() - - local operation_keys = { "q", "nc", "np" } - - for _, key in ipairs(operation_keys) do - if key == "q" or key == "" then - vim.keymap.set({ "n" }, key, function() - vim.api.nvim_command(":silent !mkdir -p ~/Notes") - vim.api.nvim_command(":w") - vim.api.nvim_command(":BDelete this") - vim.api.nvim_win_close(0, true) - M._state.last_floating_window = nil - end, { buffer = bufnr }) - elseif key == "nc" then - vim.keymap.set({ "n" }, key, function() - vim.api.nvim_command(":Git pull") - vim.api.nvim_command(":w") - vim.api.nvim_command(":Gwrite") - vim.api.nvim_command(":Git commit -m 'Some notes..'") - vim.api.nvim_command(":Git push") - vim.api.nvim_command(":BDelete this") - vim.api.nvim_win_close(0, true) - M._state.last_floating_window = nil - end, { buffer = bufnr }) - elseif key == "np" then - vim.keymap.set({ "n" }, key, function() - vim.api.nvim_command(":Git pull") - end, { buffer = bufnr }) - else - end - end -end -vim.api.nvim_create_user_command("ScratchOpenFloat", M.open_scratch_file_floating, {}) - -return M