diff options
Diffstat (limited to '.config/nvim/lua')
| -rw-r--r-- | .config/nvim/lua/config/plugins/flash.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/config/plugins/harpoon.lua | 49 | ||||
| -rw-r--r-- | .config/nvim/lua/config/plugins/obsidian.lua | 42 | ||||
| -rw-r--r-- | .config/nvim/lua/config/plugins/ufo.lua | 28 | ||||
| -rw-r--r-- | .config/nvim/lua/config/plugins/utils.lua | 13 | ||||
| -rw-r--r-- | .config/nvim/lua/config/plugins/which-key.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/mappings.lua | 93 |
7 files changed, 8 insertions, 220 deletions
diff --git a/.config/nvim/lua/config/plugins/flash.lua b/.config/nvim/lua/config/plugins/flash.lua index d4de4ee..feec135 100644 --- a/.config/nvim/lua/config/plugins/flash.lua +++ b/.config/nvim/lua/config/plugins/flash.lua @@ -12,6 +12,7 @@ return { -- stylua: ignore keys = { { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "R", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, }, } diff --git a/.config/nvim/lua/config/plugins/harpoon.lua b/.config/nvim/lua/config/plugins/harpoon.lua deleted file mode 100644 index 25168cc..0000000 --- a/.config/nvim/lua/config/plugins/harpoon.lua +++ /dev/null @@ -1,49 +0,0 @@ -return { - "https://github.com/theprimeagen/harpoon", - branch = "harpoon2", - event = "VeryLazy", - config = function() - local harpoon = require("harpoon") - harpoon.setup({ - settings = { - save_on_toggle = true, - sync_on_ui_close = true, - key = function() - return vim.fn.getcwd() - end, - }, - }) - harpoon:setup() - - local list = harpoon:list("default") - local wk = require("which-key") - - wk.add({ - mode = { "n" }, - { - "<leader>a", - function() - list:add() - end, - hidden = true, - }, - { - "<leader><leader>", - function() - harpoon.ui:toggle_quick_menu(list) - end, - hidden = true, - }, - }) - for i = 1, 6 do - wk.add({ - "<leader>" .. i, - function() - list:select(i) - end, - hidden = true, - mode = "n", - }) - end - end, -} diff --git a/.config/nvim/lua/config/plugins/obsidian.lua b/.config/nvim/lua/config/plugins/obsidian.lua deleted file mode 100644 index 64992fc..0000000 --- a/.config/nvim/lua/config/plugins/obsidian.lua +++ /dev/null @@ -1,42 +0,0 @@ -return { - "epwalsh/obsidian.nvim", - event = "VeryLazy", - version = "*", - dependencies = { - "nvim-lua/plenary.nvim", - "ibhagwan/fzf-lua", - }, - opts = { - ui = { enable = false }, - daily_notes = { - date_format = "%Y-%m-%d", - alias_format = "%B %-d, %Y", - default_tags = { "daily" }, - template = nil, - folder = "daily", - }, - dir = "$HOME/Library/Mobile Documents/iCloud~md~obsidian/Documents/Obsidian/", - mappings = {}, - follow_url_func = function(url) - -- Open the URL in the default web browser. - -- if URL contains @ it should be replaced with %40 - vim.fn.jobstart({ "open", url }) -- Mac OS - end, - note_id_func = function(title) - -- Create note IDs in a Zettelkasten format with a timestamp and a suffix. - -- In this case a note with the title 'My new note' will be given an ID that looks - -- like '1657296016-my-new-note', and therefore the file name '1657296016-my-new-note.md' - local suffix = "" - if title ~= nil then - -- If title is given, transform it into valid file name. - suffix = title:gsub(" ", "-"):gsub("[^A-Za-z0-9-]", ""):lower() - else - -- If title is nil, just add 4 random uppercase letters to the suffix. - for _ = 1, 4 do - suffix = suffix .. string.char(math.random(65, 90)) - end - end - return tostring(os.time()) .. "-" .. suffix - end, - }, -} diff --git a/.config/nvim/lua/config/plugins/ufo.lua b/.config/nvim/lua/config/plugins/ufo.lua deleted file mode 100644 index 21380b8..0000000 --- a/.config/nvim/lua/config/plugins/ufo.lua +++ /dev/null @@ -1,28 +0,0 @@ -return { - -- { - -- event = "VeryLazy", - -- "kevinhwang91/nvim-ufo", - -- dependencies = { - -- "kevinhwang91/promise-async", - -- }, - -- config = function() - -- require("ufo").setup({ - -- -- treesitter not required - -- -- ufo uses the same query files for folding (queries/<lang>/folds.scm) - -- -- performance and stability are better than `foldmethod=nvim_treesitter#foldexpr()`- - -- provider_selector = function(_, _, _) - -- return { "treesitter", "indent" } - -- end, - -- open_fold_hl_timeout = 0, -- Disable highlight timeout after opening - -- }) - -- - -- vim.o.foldenable = true - -- vim.o.foldcolumn = "0" -- '0' is not bad - -- vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value - -- vim.o.foldlevelstart = 99 - -- - -- vim.keymap.set("n", "zR", require("ufo").openAllFolds) - -- vim.keymap.set("n", "zM", require("ufo").closeAllFolds) - -- end, - -- }, -} diff --git a/.config/nvim/lua/config/plugins/utils.lua b/.config/nvim/lua/config/plugins/utils.lua index fd57680..273de1a 100644 --- a/.config/nvim/lua/config/plugins/utils.lua +++ b/.config/nvim/lua/config/plugins/utils.lua @@ -32,19 +32,6 @@ return { vim.g.undotree_WindowLayout = 3 end, }, - { -- for diagnostics - event = "VeryLazy", - "folke/trouble.nvim", - opts = {}, - cmd = "Trouble", - keys = { - { - "<leader>h", - "<cmd>Trouble diagnostics toggle filter.buf=0<cr>", - desc = "Buffer Diagnostics (Trouble)", - }, - }, - }, { -- for colored brackets and divs "HiPhish/rainbow-delimiters.nvim", event = "VeryLazy", diff --git a/.config/nvim/lua/config/plugins/which-key.lua b/.config/nvim/lua/config/plugins/which-key.lua index 47098fb..9e97f9f 100644 --- a/.config/nvim/lua/config/plugins/which-key.lua +++ b/.config/nvim/lua/config/plugins/which-key.lua @@ -17,13 +17,11 @@ return { { "<leader>d", group = "Document" }, { "<leader>g", group = "Git" }, { "<leader>m", group = "Marks" }, - { "<leader>o", group = "Obsidian" }, { "<leader>r", group = "Rename" }, { "<leader>s", group = "Search" }, { "<leader>t", group = "Toggle" }, { "<leader>w", group = "Workspace" }, { "<leader>l", group = "LSP" }, - { "<leader>x", group = "Trouble" }, }, }, } diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 31832c1..5c2a498 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -7,54 +7,18 @@ vim.keymap.set("n", "c", '"_c') vim.keymap.set("n", "C", '"_C') vim.keymap.set("n", "cc", '"_cc') vim.keymap.set("x", "c", '"_c') -vim.keymap.set("n", "<leader>q", vim.cmd.wq, { desc = "Save and quit" }) --- for searching all files, hidden aswell local fzf = require("fzf-lua") -vim.keymap.set("n", "<leader>sa", function() - fzf.files({ fd_opts = "--no-ignore --hidden --type f --type l" }) -end, { desc = "Search including ignored files" }) -wk.add({ - { - mode = { "v" }, - { "<", "<gv", hidden = true }, - { ">", ">gv", hidden = true }, - { "P", '"_dP', hidden = true }, - }, +k.add({ { mode = { "n" }, - { "<leader>-", "<CMD>Oil --float<CR>", desc = "Open directory in float" }, { "<C-d>", "<C-d>zz", desc = "Move down in buffer with cursor centered" }, { "<C-u>", "<C-u>zz", desc = "Move up in buffer with cursor centered" }, { "n", "nzzzv", desc = "Search next with cursor centered" }, { "N", "Nzzzv", desc = "Search previous with cursor centered" }, { "<leader>u", "<cmd>UndotreeToggle<CR>", desc = "Toggle undo tree" }, - { "<leader>oo", "<cmd>Outline<CR>", desc = "Toggle Outline" }, - { "<leader>on", "<cmd>ObsidianNew<CR>", desc = "New Obsidian File" }, - { "<leader>ol", "<cmd>ObsidianFollowLink<CR>", desc = "Follow Link" }, - { "<leader>ob", "<cmd>ObsidianBacklinks<CR>", desc = "Search backlinks" }, - { "<leader>ov", "<cmd>ObsidianLinks<CR>", desc = "Search backlinks" }, - { "<leader>ot", "<cmd>ObsidianTag<CR>", desc = "Search Obsidian Tags" }, - { "<leader>os", "<cmd>ObsidianSearch<CR>", desc = "Search Obsidian Files" }, - { "<leader>od", "<cmd>ObsidianToday<CR>", desc = "Open Daily Note" }, - { "<leader>oi", "<cmd>ObsidianPasteImg<CR>", desc = "Paste Image" }, - { - "<leader>of", - function() - local line = vim.api.nvim_get_current_line() - local pattern = "%(([^)]+)%)" - local _, _, path = string.find(line, pattern) - if path then - local absolute_path = "/Users/tomiko/Library/Mobile Documents/iCloud~md~obsidian/Documents/Obsidian/" .. path - local command = "!open '" .. absolute_path .. "'" - -- local command = "!open '" .. path .. "'" -- could also open relative - vim.cmd("silent " .. command) - end - end, - desc = "Open File", - }, - + { "<leader>o", "<cmd>Outline<CR>", desc = "Toggle Outline" }, { "<Esc>", "<cmd>nohlsearch<CR>", hidden = true }, -- Unhighlight { "<C-h>", "<C-w><C-h>", hidden = true }, -- Move to left window { "<C-l>", "<C-w><C-l>", hidden = true }, -- Move to right window @@ -62,82 +26,39 @@ wk.add({ { "<C-k>", "<C-w><C-k>", hidden = true }, -- Move to upper window { "<C-q>", "<C-w><C-q>", hidden = true }, -- Close window { - "<leader>sb", + "<leader><leader>", function() require("fzf-lua").buffers() end, desc = "Search Buffers", }, { - "<leader>sk", - function() - require("fzf-lua").keymaps() - end, - desc = "Search Keymaps", - }, - { - "<leader>ss", + "<leader>s", function() require("fzf-lua").files() end, desc = "Search Files", }, { - "<leader>sw", - function() - require("fzf-lua").grep_curbuf() - end, - desc = "Search current Word", - }, - { - "<leader>sg", + "<leader>/", function() - require("fzf-lua").live_grep_native() + require("fzf-lua").live_grep() end, desc = "Search by Grep", }, { - "<leader>sx", + "<leader>d", function() require("fzf-lua").lsp_document_diagnostics() end, desc = "Search Diagnostics", }, { - "<leader>sd", - function() - require("fzf-lua").lsp_workspace_diagnostics() - end, - desc = "Search Diagnostics", - }, - { - "<leader>sr", - function() - require("fzf-lua").oldfiles() - end, - desc = "Search Recent Files", - }, - { "<leader>n", function() Snacks.notifier.show_history() end, desc = "Notification History", }, - { - "<leader>gg", - function() - Snacks.lazygit() - end, - desc = "Lazygit", - }, - - { - "<leader>gl", - function() - Snacks.lazygit.log() - end, - desc = "Lazygit Log", - }, }, }) |