From 7e573af7212fb7a90121d31212af7c2e50959266 Mon Sep 17 00:00:00 2001 From: fwastring Date: Tue, 22 Oct 2024 14:27:19 +0200 Subject: [PATCH] Cleanup of repo --- after/ftplugin/haskell.lua | 18 ---- init.lua | 8 +- lazy-lock.json | 50 +++++----- lua/keybindings/keymap.lua | 13 +-- lua/plugin/dracula.lua | 40 -------- lua/plugin/gitsigns.lua | 45 --------- lua/plugin/lsp_config.lua | 2 + lua/plugin/obsidian.lua | 8 -- lua/plugin/octo.lua | 193 ------------------------------------- lua/plugin/snap.lua | 7 -- lua/plugin/telescope.lua | 1 - lua/plugin/yanky.lua | 13 --- lua/plugins.lua | 49 ---------- 13 files changed, 30 insertions(+), 417 deletions(-) delete mode 100644 after/ftplugin/haskell.lua delete mode 100644 lua/plugin/dracula.lua delete mode 100644 lua/plugin/gitsigns.lua delete mode 100644 lua/plugin/obsidian.lua delete mode 100644 lua/plugin/octo.lua delete mode 100644 lua/plugin/snap.lua delete mode 100644 lua/plugin/yanky.lua diff --git a/after/ftplugin/haskell.lua b/after/ftplugin/haskell.lua deleted file mode 100644 index 9893168..0000000 --- a/after/ftplugin/haskell.lua +++ /dev/null @@ -1,18 +0,0 @@ --- ~/.config/nvim/after/ftplugin/haskell.lua -local ht = require('haskell-tools') -local bufnr = vim.api.nvim_get_current_buf() -local opts = { noremap = true, silent = true, buffer = bufnr, } --- haskell-language-server relies heavily on codeLenses, --- so auto-refresh (see advanced configuration) is enabled by default -vim.keymap.set('n', 'cl', vim.lsp.codelens.run, opts) --- Hoogle search for the type signature of the definition under the cursor -vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) --- Evaluate all code snippets -vim.keymap.set('n', 'ra', ht.lsp.buf_eval_all, opts) --- Toggle a GHCi repl for the current package -vim.keymap.set('n', 'rr', ht.repl.toggle, opts) --- Toggle a GHCi repl for the current buffer -vim.keymap.set('n', 'rf', function() - ht.repl.toggle(vim.api.nvim_buf_get_name(0)) -end, opts) -vim.keymap.set('n', 'rq', ht.repl.quit, opts) diff --git a/init.lua b/init.lua index b753958..1537712 100644 --- a/init.lua +++ b/init.lua @@ -23,17 +23,13 @@ require 'keybindings.keymap' -- Configuration of plugins require 'plugin.telescope' -require 'plugin.yanky' require 'plugin.fzf_lsp' require 'plugin.lsp_config' require 'plugin.treesitter' -require 'plugin.dracula' require 'plugin.cmp' require 'plugin.auto_session' -require 'plugin.gitsigns' require 'plugin.lualine' -require 'plugin.obsidian' vim.o.termguicolors = true --- vim.cmd('colorscheme catppuccin-mocha') -vim.cmd('colorscheme base16-catppuccin-mocha') +vim.cmd('colorscheme catppuccin-mocha') + diff --git a/lazy-lock.json b/lazy-lock.json index 9915172..8da805d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,41 +1,41 @@ { - "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, + "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, "LuaSnip-snippets.nvim": { "branch": "main", "commit": "d7e40e4cce622eab2316607dbcd8d6039bcb9fe0" }, - "auto-session": { "branch": "main", "commit": "d5553e7e0fc83a7296847ef8009b9b93a4191cdb" }, + "auto-session": { "branch": "main", "commit": "af2219b9fa99c1d7ac409bd9eac094c459d3f52d" }, "base16-nvim": { "branch": "master", "commit": "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a" }, - "catppuccin": { "branch": "main", "commit": "10eda02ea4faa7d1f94e77a3410a4ae91c25c5f5" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "catppuccin": { "branch": "main", "commit": "aebe43db9cb26e1c70fc5b2fd4158169c405e720" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "9b27d68a3749ea383f4b053a92a14d6712a40ef7" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "fzf": { "branch": "master", "commit": "c30e486b648c1540a660802a5015aeca208274fa" }, "fzf-lsp.nvim": { "branch": "main", "commit": "16905056051759b15a388709a3fa65ff098eb243" }, "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" }, - "leap.nvim": { "branch": "main", "commit": "3b1d76ee9cd5a12a8f7a42f0e91124332860205c" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "56db3d5ce5476b183783160e6045f7337ba12b83" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "neodev.nvim": { "branch": "main", "commit": "6a533ed9d3435dcaa456380d833ea04da37ea2ed" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, - "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "leap.nvim": { "branch": "main", "commit": "68ca052dfdcda5e4e958d1ba0fef35e94a3e02e8" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "8d96bcd4450a83a528a013ec5bf7dafa5f3d36c4" }, + "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "b9fd19fa160490609389cd45d552896ec4264a6d" }, + "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "2b4881286ad73c9ece7e5e4da130b2e4726c09fc" }, - "nvim-web-devicons": { "branch": "master", "commit": "a2af6aa13a2ad3ad361d562a319a91bcd68c43a4" }, + "nvim-treesitter": { "branch": "master", "commit": "ff797254282b56d98849f6fa1082f3b2f99ebe43" }, + "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, "obsidian.nvim": { "branch": "main", "commit": "14e0427bef6c55da0d63f9a313fd9941be3a2479" }, "octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "ripgrep": { "branch": "master", "commit": "71d71d2d98964653cdfcfa315802f518664759d7" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, + "ripgrep": { "branch": "master", "commit": "3ad0e83471588d8802d5747d0cc9accec76f7ccf" }, "rnvimr": { "branch": "main", "commit": "3c41af742a61caf74a9f83fb82b9ed03ef13b880" }, "snap": { "branch": "main", "commit": "c0bcae835facb945c25073d233c15dbfeb7adc5e" }, - "substitute.nvim": { "branch": "main", "commit": "97f49d16f8eea7967d41db4f657dd63af53eeba1" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "vimtex": { "branch": "master", "commit": "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" } -} + "yanky.nvim": { "branch": "main", "commit": "79338563e85a868e59cda02c51b54d90a5514a12" } +} \ No newline at end of file diff --git a/lua/keybindings/keymap.lua b/lua/keybindings/keymap.lua index 9919574..8a5c80c 100644 --- a/lua/keybindings/keymap.lua +++ b/lua/keybindings/keymap.lua @@ -12,7 +12,6 @@ end vim.api.nvim_set_keymap('n', 'b', ":lua ToggleLualine()", { noremap = true, silent = true }) - -- Leap vim.keymap.set('n', 'z', '(leap)') vim.keymap.set('n', 'Z', '(leap-from-window)') @@ -60,10 +59,7 @@ vim.api.nvim_create_autocmd('TextYankPost', { local builtin = require('telescope.builtin') vim.keymap.set('n', 'f', builtin.find_files, {}) vim.keymap.set('n', 'o', builtin.live_grep, {}) --- vim.keymap.set('n', 'b', builtin.buffers, {}) --- vim.keymap.set('n', 'p', builtin.commands, {}) -vim.keymap.set('n', 'y', ':Telescope yank_history', {}) vim.keymap.set('n', 'gc', builtin.git_commits, {}) vim.keymap.set('n', 'gs', builtin.git_status, {}) vim.keymap.set('n', 'gf', builtin.git_files, {}) @@ -74,13 +70,7 @@ vim.keymap.set('n', '7', builtin.current_buffer_fuzzy_find, {}) vim.api.nvim_set_keymap('n', 'w', ':w', { noremap = true, silent = true }) vim.api.nvim_set_keymap('n', 'q', ':q', {}) - - --- Bindings for save and quit -vim.api.nvim_set_keymap('n', 'w', ':w', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'q', ':q', {}) - --- Neotree bindings +-- Ranger bindings vim.api.nvim_set_keymap('n', 'e', ':RnvimrToggle', { noremap = true, silent = true }) vim.api.nvim_set_var('rnvimr_enable_ex', 1) vim.api.nvim_set_var('rnvimr_hidden_filter', "") @@ -92,4 +82,3 @@ vim.api.nvim_set_var('rnvimr_border_attr', {fg = 14, bg = -1}) vim.api.nvim_set_var('rnvimr_enable_bw', 1) vim.api.nvim_set_var('rnvimr_shadow_winblend', 70) vim.api.nvim_set_var('rnvimr_ranger_cmd', {'ranger', '--cmd=set draw_borders both'}) - diff --git a/lua/plugin/dracula.lua b/lua/plugin/dracula.lua deleted file mode 100644 index edb1d95..0000000 --- a/lua/plugin/dracula.lua +++ /dev/null @@ -1,40 +0,0 @@ -local dracula = require("dracula") -dracula.setup({ - -- customize dracula color palette - colors = { - bg = "#282A36", - fg = "#F8F8F2", - selection = "#44475A", - comment = "#6272A4", - red = "#FF5555", - orange = "#FFB86C", - yellow = "#F1FA8C", - green = "#50fa7b", - purple = "#BD93F9", - cyan = "#8BE9FD", - pink = "#FF79C6", - bright_red = "#FF6E6E", - bright_green = "#69FF94", - bright_yellow = "#FFFFA5", - bright_blue = "#D6ACFF", - bright_magenta = "#FF92DF", - bright_cyan = "#A4FFFF", - bright_white = "#FFFFFF", - menu = "#21222C", - visual = "#3E4452", - gutter_fg = "#4B5263", - nontext = "#3B4048", - white = "#ABB2BF", - black = "#191A21", - }, - -- show the '~' characters after the end of buffers - show_end_of_buffer = false, -- default false - -- use transparent background - transparent_bg = false, -- default false - -- set custom lualine background color - lualine_bg_color = "#FFFFFF", -- default nil - -- set italic comment - italic_comment = true, -- default false - -- overrides the default highlights with table see `:h synIDattr` - overrides = {}, -}) diff --git a/lua/plugin/gitsigns.lua b/lua/plugin/gitsigns.lua deleted file mode 100644 index c4ee9b8..0000000 --- a/lua/plugin/gitsigns.lua +++ /dev/null @@ -1,45 +0,0 @@ -require('gitsigns').setup{ - on_attach = function(bufnr) - local gitsigns = require('gitsigns') - - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end - - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal({']c', bang = true}) - else - gitsigns.nav_hunk('next') - end - end) - - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal({'[c', bang = true}) - else - gitsigns.nav_hunk('prev') - end - end) - - -- Actions - map('n', 'hs', gitsigns.stage_hunk) - map('n', 'hr', gitsigns.reset_hunk) - map('v', 'hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('v', 'hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('n', 'hS', gitsigns.stage_buffer) - map('n', 'hu', gitsigns.undo_stage_hunk) - map('n', 'hR', gitsigns.reset_buffer) - map('n', 'hp', gitsigns.preview_hunk) - map('n', 'hb', function() gitsigns.blame_line{full=true} end) - map('n', 'tb', gitsigns.toggle_current_line_blame) - map('n', 'hd', gitsigns.diffthis) - map('n', 'hD', function() gitsigns.diffthis('~') end) - map('n', 'td', gitsigns.toggle_deleted) - - map({'o', 'x'}, 'ih', ':Gitsigns select_hunk') - end -} diff --git a/lua/plugin/lsp_config.lua b/lua/plugin/lsp_config.lua index 8dcd125..b1763c9 100644 --- a/lua/plugin/lsp_config.lua +++ b/lua/plugin/lsp_config.lua @@ -34,3 +34,5 @@ require'lspconfig'.vuels.setup{} require'lspconfig'.jsonls.setup{} require'lspconfig'.gopls.setup{} require'lspconfig'.jdtls.setup{} +require'lspconfig'.texlab.setup{} + diff --git a/lua/plugin/obsidian.lua b/lua/plugin/obsidian.lua deleted file mode 100644 index b34db1f..0000000 --- a/lua/plugin/obsidian.lua +++ /dev/null @@ -1,8 +0,0 @@ -require("obsidian").setup({ - workspaces = { - { - name = "personal", - path = "~/vaults/anteckningar", - }, - }, -}) diff --git a/lua/plugin/octo.lua b/lua/plugin/octo.lua deleted file mode 100644 index b3120d4..0000000 --- a/lua/plugin/octo.lua +++ /dev/null @@ -1,193 +0,0 @@ -require"octo".setup({ - use_local_fs = false, -- use local files on right side of reviews - enable_builtin = false, -- shows a list of builtin actions when no action is provided - default_remote = {"upstream", "origin"}; -- order to try remotes - default_merge_method = "commit", -- default merge method which should be used when calling `Octo pr merge`, could be `commit`, `rebase` or `squash` - ssh_aliases = {}, -- SSH aliases. e.g. `ssh_aliases = {["github.com-work"] = "github.com"}` - picker = "telescope", -- or "fzf-lua" - picker_config = { - use_emojis = false, -- only used by "fzf-lua" picker for now - mappings = { -- mappings for the pickers - open_in_browser = { lhs = "", desc = "open issue in browser" }, - copy_url = { lhs = "", desc = "copy url to system clipboard" }, - checkout_pr = { lhs = "", desc = "checkout pull request" }, - merge_pr = { lhs = "", desc = "merge pull request" }, - }, - }, - comment_icon = "▎", -- comment marker - outdated_icon = "󰅒 ", -- outdated indicator - resolved_icon = " ", -- resolved indicator - reaction_viewer_hint_icon = " "; -- marker for user reactions - user_icon = " "; -- user icon - timeline_marker = " "; -- timeline marker - timeline_indent = "2"; -- timeline indentation - right_bubble_delimiter = ""; -- bubble delimiter - left_bubble_delimiter = ""; -- bubble delimiter - github_hostname = ""; -- GitHub Enterprise host - snippet_context_lines = 4; -- number or lines around commented lines - gh_cmd = "gh", -- Command to use when calling Github CLI - gh_env = {}, -- extra environment variables to pass on to GitHub CLI, can be a table or function returning a table - timeout = 5000, -- timeout for requests between the remote server - default_to_projects_v2 = false, -- use projects v2 for the `Octo card ...` command by default. Both legacy and v2 commands are available under `Octo cardlegacy ...` and `Octo cardv2 ...` respectively. - ui = { - use_signcolumn = true, -- show "modified" marks on the sign column - }, - issues = { - order_by = { -- criteria to sort results of `Octo issue list` - field = "CREATED_AT", -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield) - direction = "DESC" -- either DESC or ASC (https://docs.github.com/en/graphql/reference/enums#orderdirection) - } - }, - pull_requests = { - order_by = { -- criteria to sort the results of `Octo pr list` - field = "CREATED_AT", -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield) - direction = "DESC" -- either DESC or ASC (https://docs.github.com/en/graphql/reference/enums#orderdirection) - }, - always_select_remote_on_create = false -- always give prompt to select base remote repo when creating PRs - }, - file_panel = { - size = 10, -- changed files panel rows - use_icons = true -- use web-devicons in file panel (if false, nvim-web-devicons does not need to be installed) - }, - colors = { -- used for highlight groups (see Colors section below) - white = "#ffffff", - grey = "#2A354C", - black = "#000000", - red = "#fdb8c0", - dark_red = "#da3633", - green = "#acf2bd", - dark_green = "#238636", - yellow = "#d3c846", - dark_yellow = "#735c0f", - blue = "#58A6FF", - dark_blue = "#0366d6", - purple = "#6f42c1", - }, - mappings_disable_default = false, -- disable default mappings if true, but will still adapt user mappings - mappings = { - issue = { - close_issue = { lhs = "ic", desc = "close issue" }, - reopen_issue = { lhs = "io", desc = "reopen issue" }, - list_issues = { lhs = "il", desc = "list open issues on same repo" }, - reload = { lhs = "", desc = "reload issue" }, - open_in_browser = { lhs = "", desc = "open issue in browser" }, - copy_url = { lhs = "", desc = "copy url to system clipboard" }, - add_assignee = { lhs = "aa", desc = "add assignee" }, - remove_assignee = { lhs = "ad", desc = "remove assignee" }, - create_label = { lhs = "lc", desc = "create label" }, - add_label = { lhs = "la", desc = "add label" }, - remove_label = { lhs = "ld", desc = "remove label" }, - goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, - add_comment = { lhs = "ca", desc = "add comment" }, - delete_comment = { lhs = "cd", desc = "delete comment" }, - next_comment = { lhs = "]c", desc = "go to next comment" }, - prev_comment = { lhs = "[c", desc = "go to previous comment" }, - react_hooray = { lhs = "rp", desc = "add/remove 🎉 reaction" }, - react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, - react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, - react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, - react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, - react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, - react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, - react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, - }, - pull_request = { - checkout_pr = { lhs = "po", desc = "checkout PR" }, - merge_pr = { lhs = "pm", desc = "merge commit PR" }, - squash_and_merge_pr = { lhs = "psm", desc = "squash and merge PR" }, - rebase_and_merge_pr = { lhs = "prm", desc = "rebase and merge PR" }, - list_commits = { lhs = "pc", desc = "list PR commits" }, - list_changed_files = { lhs = "pf", desc = "list PR changed files" }, - show_pr_diff = { lhs = "pd", desc = "show PR diff" }, - add_reviewer = { lhs = "va", desc = "add reviewer" }, - remove_reviewer = { lhs = "vd", desc = "remove reviewer request" }, - close_issue = { lhs = "ic", desc = "close PR" }, - reopen_issue = { lhs = "io", desc = "reopen PR" }, - list_issues = { lhs = "il", desc = "list open issues on same repo" }, - reload = { lhs = "", desc = "reload PR" }, - open_in_browser = { lhs = "", desc = "open PR in browser" }, - copy_url = { lhs = "", desc = "copy url to system clipboard" }, - goto_file = { lhs = "gf", desc = "go to file" }, - add_assignee = { lhs = "aa", desc = "add assignee" }, - remove_assignee = { lhs = "ad", desc = "remove assignee" }, - create_label = { lhs = "lc", desc = "create label" }, - add_label = { lhs = "la", desc = "add label" }, - remove_label = { lhs = "ld", desc = "remove label" }, - goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, - add_comment = { lhs = "ca", desc = "add comment" }, - delete_comment = { lhs = "cd", desc = "delete comment" }, - next_comment = { lhs = "]c", desc = "go to next comment" }, - prev_comment = { lhs = "[c", desc = "go to previous comment" }, - react_hooray = { lhs = "rp", desc = "add/remove 🎉 reaction" }, - react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, - react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, - react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, - react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, - react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, - react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, - react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, - review_start = { lhs = "vs", desc = "start a review for the current PR" }, - review_resume = { lhs = "vr", desc = "resume a pending review for the current PR" }, - }, - review_thread = { - goto_issue = { lhs = "gi", desc = "navigate to a local repo issue" }, - add_comment = { lhs = "ca", desc = "add comment" }, - add_suggestion = { lhs = "sa", desc = "add suggestion" }, - delete_comment = { lhs = "cd", desc = "delete comment" }, - next_comment = { lhs = "]c", desc = "go to next comment" }, - prev_comment = { lhs = "[c", desc = "go to previous comment" }, - select_next_entry = { lhs = "]q", desc = "move to previous changed file" }, - select_prev_entry = { lhs = "[q", desc = "move to next changed file" }, - select_first_entry = { lhs = "[Q", desc = "move to first changed file" }, - select_last_entry = { lhs = "]Q", desc = "move to last changed file" }, - close_review_tab = { lhs = "", desc = "close review tab" }, - react_hooray = { lhs = "rp", desc = "add/remove 🎉 reaction" }, - react_heart = { lhs = "rh", desc = "add/remove ❤️ reaction" }, - react_eyes = { lhs = "re", desc = "add/remove 👀 reaction" }, - react_thumbs_up = { lhs = "r+", desc = "add/remove 👍 reaction" }, - react_thumbs_down = { lhs = "r-", desc = "add/remove 👎 reaction" }, - react_rocket = { lhs = "rr", desc = "add/remove 🚀 reaction" }, - react_laugh = { lhs = "rl", desc = "add/remove 😄 reaction" }, - react_confused = { lhs = "rc", desc = "add/remove 😕 reaction" }, - }, - submit_win = { - approve_review = { lhs = "", desc = "approve review" }, - comment_review = { lhs = "", desc = "comment review" }, - request_changes = { lhs = "", desc = "request changes review" }, - close_review_tab = { lhs = "", desc = "close review tab" }, - }, - review_diff = { - submit_review = { lhs = "vs", desc = "submit review" }, - discard_review = { lhs = "vd", desc = "discard review" }, - add_review_comment = { lhs = "ca", desc = "add a new review comment" }, - add_review_suggestion = { lhs = "sa", desc = "add a new review suggestion" }, - focus_files = { lhs = "e", desc = "move focus to changed file panel" }, - toggle_files = { lhs = "b", desc = "hide/show changed files panel" }, - next_thread = { lhs = "]t", desc = "move to next thread" }, - prev_thread = { lhs = "[t", desc = "move to previous thread" }, - select_next_entry = { lhs = "]q", desc = "move to previous changed file" }, - select_prev_entry = { lhs = "[q", desc = "move to next changed file" }, - select_first_entry = { lhs = "[Q", desc = "move to first changed file" }, - select_last_entry = { lhs = "]Q", desc = "move to last changed file" }, - close_review_tab = { lhs = "", desc = "close review tab" }, - toggle_viewed = { lhs = "", desc = "toggle viewer viewed state" }, - goto_file = { lhs = "gf", desc = "go to file" }, - }, - file_panel = { - submit_review = { lhs = "vs", desc = "submit review" }, - discard_review = { lhs = "vd", desc = "discard review" }, - next_entry = { lhs = "j", desc = "move to next changed file" }, - prev_entry = { lhs = "k", desc = "move to previous changed file" }, - select_entry = { lhs = "", desc = "show selected changed file diffs" }, - refresh_files = { lhs = "R", desc = "refresh changed files panel" }, - focus_files = { lhs = "e", desc = "move focus to changed file panel" }, - toggle_files = { lhs = "b", desc = "hide/show changed files panel" }, - select_next_entry = { lhs = "]q", desc = "move to previous changed file" }, - select_prev_entry = { lhs = "[q", desc = "move to next changed file" }, - select_first_entry = { lhs = "[Q", desc = "move to first changed file" }, - select_last_entry = { lhs = "]Q", desc = "move to last changed file" }, - close_review_tab = { lhs = "", desc = "close review tab" }, - toggle_viewed = { lhs = "", desc = "toggle viewer viewed state" }, - }, - }, -}) diff --git a/lua/plugin/snap.lua b/lua/plugin/snap.lua deleted file mode 100644 index af35c87..0000000 --- a/lua/plugin/snap.lua +++ /dev/null @@ -1,7 +0,0 @@ -local snap = require'snap' -snap.maps { - {"f", snap.config.file {producer = "ripgrep.file"}}, - {"b", snap.config.file {producer = "vim.buffer"}}, - -- {"fo", snap.config.file {producer = "vim.oldfile"}}, - {"g", snap.config.vimgrep {}}, -} diff --git a/lua/plugin/telescope.lua b/lua/plugin/telescope.lua index b77fd35..11d368f 100644 --- a/lua/plugin/telescope.lua +++ b/lua/plugin/telescope.lua @@ -1,5 +1,4 @@ local telescope = require('telescope') -telescope.load_extension("yank_history") telescope.setup { diff --git a/lua/plugin/yanky.lua b/lua/plugin/yanky.lua deleted file mode 100644 index 9af4d48..0000000 --- a/lua/plugin/yanky.lua +++ /dev/null @@ -1,13 +0,0 @@ -require("yanky").setup({ - ring = { - history_length = 100, - storage = "shada", - sync_with_numbered_registers = true, - cancel_event = "update", - ignore_registers = { "_" }, - update_register_on_cycle = false, - }, - system_clipboard = { - sync_with_ring = true, - }, -}) diff --git a/lua/plugins.lua b/lua/plugins.lua index 93f2aae..08eabba 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -18,52 +18,15 @@ return { vim.g.vimtex_view_method = "zathura" end }, - { - "epwalsh/obsidian.nvim", - version = "*", -- recommended, use latest release instead of latest commit - lazy = true, - ft = "markdown", - -- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault: - -- event = { - -- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'. - -- -- E.g. "BufReadPre " .. vim.fn.expand "~" .. "/my-vault/*.md" - -- -- refer to `:h file-pattern` for more examples - -- "BufReadPre path/to/my-vault/*.md", - -- "BufNewFile path/to/my-vault/*.md", - -- }, - dependencies = { - -- Required. - "nvim-lua/plenary.nvim", - - -- see below for full list of optional dependencies 👇 - }, - }, - { - "RRethy/base16-nvim", - }, { "catppuccin/nvim", name = "catppuccin", priority = 1000 }, - { - "gbprod/yanky.nvim", - }, { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' } }, - { - "pwntester/octo.nvim", - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-telescope/telescope.nvim', - 'nvim-tree/nvim-web-devicons', - }, - }, - { - 'lewis6991/gitsigns.nvim' - }, { 'windwp/nvim-autopairs', event = "InsertEnter", @@ -77,9 +40,6 @@ return { { "camspiers/snap", }, - { - "Mofiqul/dracula.nvim" - }, { "BurntSushi/ripgrep", }, @@ -92,15 +52,6 @@ return { { 'gfanto/fzf-lsp.nvim', }, - { - "folke/which-key.nvim", - }, - { - "folke/neodev.nvim", - }, - { - "mfussenegger/nvim-dap", - }, { 'neovim/nvim-lspconfig' },