diff --git a/lazy-lock.json b/lazy-lock.json index 6870559..afd989b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,7 +16,6 @@ "colorful-menu.nvim": { "branch": "master", "commit": "d5b97d247528be308b6b69d96b5950a30e470f3d" }, "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" }, - "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" }, "css-vars.nvim": { "branch": "main", "commit": "0615782c320f729b04d9c51a8a61fb498ee4234a" }, "csvview.nvim": { "branch": "main", "commit": "bbab4c2f808fd8e11ec8dfdd128251aadba566a1" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, @@ -85,6 +84,7 @@ "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" }, "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, + "octo.nvim": { "branch": "master", "commit": "fded71669b61c6ccae9d8ade30f667c3c4962b48" }, "oil-git.nvim": { "branch": "main", "commit": "d1f27a5982df35b70fb842aa6bbfac10735c7265" }, "oil-lsp-diagnostics.nvim": { "branch": "master", "commit": "e04e3c387262b958fee75382f8ff66eae9d037f4" }, "oil.nvim": { "branch": "master", "commit": "975a77cce3c8cb742bc1b3629f4328f5ca977dad" }, diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 46af567..ca40ad4 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -48,13 +48,6 @@ vim.api.nvim_create_autocmd({ "InsertEnter" }, { end, }) -vim.api.nvim_create_autocmd({ "BufWinEnter" }, { - pattern = "**/Codnity/**", - callback = function() - vim.opt.colorcolumn = "92" - end, -}) - vim.api.nvim_create_autocmd({ "BufWinEnter" }, { pattern = "requirements*.txt", callback = function() @@ -62,13 +55,6 @@ vim.api.nvim_create_autocmd({ "BufWinEnter" }, { end, }) ---[[ vim.api.nvim_create_autocmd({ "BufWinEnter" }, { - pattern = "**/Codnity/**/*.html", - callback = function() - vim.cmd("setf htmldjango") - end, -}) ]] - -- Autocommand that sources neovim files on save --[[ vim.api.nvim_create_autocmd({ "BufWritePost" }, { group = vim.api.nvim_create_augroup("AutoReloadConfig", { clear = true }), diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 4c6cd7a..ef54a3e 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -29,10 +29,6 @@ return { "epwalsh/obsidian.nvim", event = "BufReadPre " .. vim.fn.expand("~") .. "/Obsidian/**/*.md", }, - { - "kiyoon/jupynium.nvim", - event = "BufReadPre *.ju.py", - }, }, version = "*", opts = { @@ -75,7 +71,6 @@ return { "buffer", "snippets", "ripgrep", - "jupynium", "css_vars", }, per_filetype = { @@ -140,11 +135,6 @@ return { score_offset = 15, opts = { insert = true }, }, - jupynium = { - name = "jupynium", - module = "jupynium.blink_cmp", - score_offset = 100, - }, git = { score_offset = 100, module = "blink-cmp-git", diff --git a/lua/plugins/cloak.lua b/lua/plugins/cloak.lua index b137572..4494ce0 100644 --- a/lua/plugins/cloak.lua +++ b/lua/plugins/cloak.lua @@ -1,30 +1,4 @@ return { "laytan/cloak.nvim", - opts = { - enabled = true, - cloak_character = "*", - -- The applied highlight group (colors) on the cloaking, see `:h highlight`. - highlight_group = "Comment", - -- Applies the length of the replacement characters for all matched - -- patterns, defaults to the length of the matched pattern. - cloak_length = nil, -- Provide a number if you want to hide the true length of the value. - -- Wether it should try every pattern to find the best fit or stop after the first. - try_all_patterns = true, - patterns = { - { - -- Match any file starting with '.env'. - -- This can be a table to match multiple file patterns. - file_pattern = { ".env*" }, - -- Match an equals sign and any character after it. - -- This can also be a table of patterns to cloak, - -- example: cloak_pattern = { ':.+', '-.+' } for yaml files. - cloak_pattern = "=.+", - -- A function, table or string to generate the replacement. - -- The actual replacement will contain the 'cloak_character' - -- where it doesn't cover the original text. - -- If left empty the legacy behavior of keeping the first character is retained. - replace = nil, - }, - }, - }, + opts = {}, } diff --git a/lua/plugins/cmake-tools.lua b/lua/plugins/cmake-tools.lua index 36f87c2..97d65f8 100644 --- a/lua/plugins/cmake-tools.lua +++ b/lua/plugins/cmake-tools.lua @@ -3,67 +3,14 @@ return { ft = { "cpp", "c", "cmake" }, dependencies = { "nvim-lua/plenary.nvim" }, opts = { - cmake_command = "cmake", -- this is used to specify cmake command path - cmake_regenerate_on_save = true, -- auto generate when save CMakeLists.txt - cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" }, -- this will be passed when invoke `CMakeGenerate` - cmake_build_options = {}, -- this will be passed when invoke `CMakeBuild` - cmake_build_directory = "target/build/", -- this is used to specify generate directory for cmake - cmake_build_directory_prefix = "cmake_build_", -- when cmake_build_directory is set to "", this option will be activated - cmake_soft_link_compile_commands = true, -- this will automatically make a soft link from compile commands file to project root dir - cmake_compile_commands_from_lsp = false, -- this will automatically set compile commands file location using lsp, to use it, please set `cmake_soft_link_compile_commands` to false - cmake_kits_path = nil, -- this is used to specify global cmake kits path, see CMakeKits for detailed usage - cmake_variants_message = { - short = { show = true }, -- whether to show short message - long = { show = true, max_length = 40 }, -- whether to show long message - }, - cmake_dap_configuration = { -- debug settings for cmake - name = "cpp", - type = "codelldb", - request = "launch", - stopOnEntry = false, - runInTerminal = true, - console = "integratedTerminal", - }, - cmake_executor = { -- executor to use - name = "quickfix", -- name of the executor - opts = {}, -- the options the executor will get, possible values depend on the executor type. See `default_opts` for possible values. - default_opts = { -- a list of default and possible values for executors + cmake_build_directory = "target/build/", + cmake_executor = { + default_opts = { quickfix = { - show = "only_on_error", -- "always", "only_on_error" - position = "belowright", -- "bottom", "top" + show = "only_on_error", size = 15, }, - overseer = { - new_task_opts = {}, -- options to pass into the `overseer.new_task` command - on_new_task = function(task) end, -- a function that gets overseer.Task when it is created, before calling `task:start` - }, - terminal = {}, -- terminal executor uses the values in cmake_terminal }, }, - cmake_terminal = { - name = "terminal", - opts = { - name = "Main Terminal", - prefix_name = "[CMakeTools]: ", -- This must be included and must be unique, otherwise the terminals will not work. Do not use a simple spacebar " ", or any generic name - split_direction = "vertical", -- "horizontal", "vertical" - split_size = 50, - - -- Window handling - single_terminal_per_instance = true, -- Single viewport, multiple windows - single_terminal_per_tab = true, -- Single viewport per tab - keep_terminal_static_location = true, -- Static location of the viewport if avialable - - -- Running Tasks - start_insert_in_launch_task = false, -- If you want to enter terminal with :startinsert upon using :CMakeRun - start_insert_in_other_tasks = false, -- If you want to enter terminal with :startinsert upon launching all other cmake tasks in the terminal. Generally set as false - focus_on_main_terminal = false, -- Focus on cmake terminal when cmake task is launched. Only used if executor is terminal. - focus_on_launch_terminal = false, -- Focus on cmake launch terminal when executable target in launched. - }, - }, - cmake_notifications = { - enabled = true, -- show cmake execution progress in nvim-notify - spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }, -- icons used for progress display - refresh_rate_ms = 100, -- how often to iterate icons - }, }, } diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua index 1d8e802..599d4a5 100644 --- a/lua/plugins/colorizer.lua +++ b/lua/plugins/colorizer.lua @@ -1,49 +1,16 @@ return { - "NvChad/nvim-colorizer.lua", + "catgoose/nvim-colorizer.lua", + event = "BufReadPre", opts = { - filetypes = { - "html", - "javascriptreact", - "css", - "javascript", - "lua", - "yaml", - "conf", - "toml", - "scss", - "python", - "typst", - "htmldjango", - "conf", - "rust", - "kdl", - "ini", - }, user_default_options = { - RGB = true, -- #RGB hex codes - RRGGBB = true, -- #RRGGBB hex codes - names = false, -- "Name" codes like Blue or blue - RRGGBBAA = true, -- #RRGGBBAA hex codes - AARRGGBB = true, -- 0xAARRGGBB hex codes - rgb_fn = true, -- CSS rgb() and rgba() functions - hsl_fn = true, -- CSS hsl() and hsla() functions - css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB - css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn - -- Available modes for `mode`: foreground, background, virtualtext - mode = "background", -- Set the display mode. - -- Available methods are false / true / "normal" / "lsp" / "both" - -- True is same as normal - tailwind = true, -- Enable tailwind colors - -- parsers can contain values used in |user_default_options| - sass = { - enable = true, - parsers = { "css" }, - }, -- Enable sass colors - virtualtext = "■", + names = false, + css = true, + css_fn = true, + tailwind = true, + tailwind_opts = { + update_names = true, + }, + sass = { enable = true, parsers = { "css" } }, }, - -- all the sub-options of filetypes apply to buftypes - buftypes = {}, - html = { names = true }, - css = { names = true }, }, } diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua index 8742521..3496d1d 100644 --- a/lua/plugins/comment.lua +++ b/lua/plugins/comment.lua @@ -1,61 +1,5 @@ return { "numToStr/Comment.nvim", event = { "BufReadPre", "BufNewFile" }, - opts = { - ---Add a space b/w comment and the line - padding = true, - ---Whether the cursor should stay at its position - sticky = true, - ---Lines to be ignored while (un)comment - ignore = nil, - ---LHS of toggle mappings in NORMAL mode - toggler = { - ---Line-comment toggle keymap - line = "gcc", - ---Block-comment toggle keymap - block = "gbb", - }, - -- -LHS of operator-pending mappings in NORMAL and VISUAL mode - opleader = { - ---Line-comment keymap - line = "gc", - ---Block-comment keymap - block = "gb", - }, - ---LHS of extra mappings - extra = { - ---Add comment on the line above - above = "gcO", - ---Add comment on the line below - below = "gco", - ---Add comment at the end of line - eol = "gcA", - }, - --- Enable keybindings - --- NOTE: If given `false` then the plugin won't create any mappings - mappings = { - ---Operator-pending mapping; `gcc` `gbc` `gc[count]{motion}` `gb[count]{motion}` - basic = true, - ---Extra mapping; `gco`, `gcO`, `gcA` - extra = true, - ---Extended mapping; `g>` `g<` `g>[count]{motion}` `g<[count]{motion}` - extended = true, - }, - ---Function to call before (un)comment - -- pre_hook = function(ctx) - -- local U = require("Comment.utils") - -- - -- local location = nil - -- if ctx.ctype == U.ctype.block then - -- location = require("ts_context_commentstring.utils").get_cursor_location() - -- elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then - -- location = require("ts_context_commentstring.utils").get_visual_start_location() - -- end - -- - -- return require("ts_context_commentstring.internal").calculate_commentstring({ - -- key = ctx.ctype == U.ctype.line and "__default" or "__multiline", - -- location = location, - -- }) - -- end, - }, + opts = {}, } diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index fff7840..7620865 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -12,7 +12,7 @@ return { function() require("conform").format({ async = true, lsp_fallback = "fallback" }) end, - mode = "", + mode = { "n", "v", "x" }, desc = "Format buffer", }, }, diff --git a/lua/plugins/crates.lua b/lua/plugins/crates.lua index 41debd3..fdf716d 100644 --- a/lua/plugins/crates.lua +++ b/lua/plugins/crates.lua @@ -1,159 +1,22 @@ return { - { - "Saecki/crates.nvim", - tag = "stable", - event = { "BufRead Cargo.toml" }, - keys = { - { - "ru", - require("crates").upgrade_all_crates, - desc = "Upgrade all crates", - ft = { "rust", "toml" }, - }, - }, - opts = { - completion = { - cmp = { - enabled = true, - }, - }, - smart_insert = true, - insert_closing_quote = true, - autoload = true, - autoupdate = true, - loading_indicator = true, - date_format = "%d-%m-%Y", - thousands_separator = ".", - notification_title = "Crates", - -- disable_invalid_feature_diagnostic = false, - text = { - loading = "  Loading", - version = "  %s", - prerelease = "  %s", - yanked = "  %s", - nomatch = "  No match", - upgrade = "  %s", - error = "  Error fetching crate", - }, - highlight = { - loading = "CratesNvimLoading", - version = "CratesNvimVersion", - prerelease = "CratesNvimPreRelease", - yanked = "CratesNvimYanked", - nomatch = "CratesNvimNoMatch", - upgrade = "CratesNvimUpgrade", - error = "CratesNvimError", - }, - popup = { - autofocus = false, - copy_register = '"', - style = "minimal", - border = "none", - show_version_date = false, - show_dependency_version = true, - max_height = 30, - min_width = 20, - padding = 1, - text = { - title = " %s", - pill_left = "", - pill_right = "", - description = "%s", - created_label = " created ", - created = "%s", - updated_label = " updated ", - updated = "%s", - downloads_label = " downloads ", - downloads = "%s", - homepage_label = " homepage ", - homepage = "%s", - repository_label = " repository ", - repository = "%s", - documentation_label = " documentation ", - documentation = "%s", - crates_io_label = " crates.io ", - crates_io = "%s", - categories_label = " categories ", - keywords_label = " keywords ", - version = " %s", - prerelease = " %s", - yanked = " %s", - version_date = " %s", - feature = " %s", - enabled = " %s", - transitive = " %s", - normal_dependencies_title = " Dependencies", - build_dependencies_title = " Build dependencies", - dev_dependencies_title = " Dev dependencies", - dependency = " %s", - optional = " %s", - dependency_version = " %s", - loading = "  ", - }, - highlight = { - title = "CratesNvimPopupTitle", - pill_text = "CratesNvimPopupPillText", - pill_border = "CratesNvimPopupPillBorder", - description = "CratesNvimPopupDescription", - created_label = "CratesNvimPopupLabel", - created = "CratesNvimPopupValue", - updated_label = "CratesNvimPopupLabel", - updated = "CratesNvimPopupValue", - downloads_label = "CratesNvimPopupLabel", - downloads = "CratesNvimPopupValue", - homepage_label = "CratesNvimPopupLabel", - homepage = "CratesNvimPopupUrl", - repository_label = "CratesNvimPopupLabel", - repository = "CratesNvimPopupUrl", - documentation_label = "CratesNvimPopupLabel", - documentation = "CratesNvimPopupUrl", - crates_io_label = "CratesNvimPopupLabel", - crates_io = "CratesNvimPopupUrl", - categories_label = "CratesNvimPopupLabel", - keywords_label = "CratesNvimPopupLabel", - version = "CratesNvimPopupVersion", - prerelease = "CratesNvimPopupPreRelease", - yanked = "CratesNvimPopupYanked", - version_date = "CratesNvimPopupVersionDate", - feature = "CratesNvimPopupFeature", - enabled = "CratesNvimPopupEnabled", - transitive = "CratesNvimPopupTransitive", - normal_dependencies_title = "CratesNvimPopupNormalDependenciesTitle", - build_dependencies_title = "CratesNvimPopupBuildDependenciesTitle", - dev_dependencies_title = "CratesNvimPopupDevDependenciesTitle", - dependency = "CratesNvimPopupDependency", - optional = "CratesNvimPopupOptional", - dependency_version = "CratesNvimPopupDependencyVersion", - loading = "CratesNvimPopupLoading", - }, - keys = { - hide = { "q", "" }, - open_url = { "" }, - select = { "" }, - select_alt = { "s" }, - toggle_feature = { "" }, - copy_value = { "yy" }, - goto_item = { "gd", "K", "" }, - jump_forward = { "" }, - jump_back = { "", "" }, - }, - }, - --[[ src = { - insert_closing_quote = true, - text = { - prerelease = "  pre-release ", - yanked = "  yanked ", - }, - }, ]] + "Saecki/crates.nvim", + tag = "stable", + event = { "BufRead Cargo.toml" }, + keys = { + { + "ru", + require("crates").upgrade_all_crates, + desc = "Upgrade all crates", + ft = { "rust", "toml" }, }, }, - { - "Aityz/cratesearch.nvim", - event = { "BufRead Cargo.toml" }, - ft = { "rust" }, - cmd = { "CrateSearch" }, - config = function() - require("cratesearch").setup() - end, + opts = { + completion = { + cmp = { + enabled = true, + }, + }, + date_format = "%d-%m-%Y", + thousands_separator = " ", }, } diff --git a/lua/plugins/gitignore.lua b/lua/plugins/gitignore.lua index 7ea4da6..b20e7e6 100644 --- a/lua/plugins/gitignore.lua +++ b/lua/plugins/gitignore.lua @@ -1,6 +1,5 @@ return { "wintermute-cell/gitignore.nvim", - dependencies = {}, cmd = { "Gitignore" }, keys = { { @@ -11,7 +10,4 @@ return { desc = "Git Ignore", }, }, - config = function() - require("gitignore") - end, } diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua deleted file mode 100644 index 51c88ec..0000000 --- a/lua/plugins/gitsigns.lua +++ /dev/null @@ -1,61 +0,0 @@ -return { - "lewis6991/gitsigns.nvim", - enabled = false, - event = "BufReadPre", - cmd = "Gitsigns", - keys = { - { - "gb", - function() - vim.cmd.Gitsigns("blame_line") - end, - desc = "Git Blame", - }, - }, - opts = { - signs = { - add = { text = "┃" }, - change = { text = "┃" }, - delete = { text = "_" }, - topdelete = { text = "‾" }, - changedelete = { text = "~" }, - untracked = { text = "┆" }, - }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` - word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` - watch_gitdir = { - follow_files = true, - }, - auto_attach = true, - attach_to_untracked = true, - current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` - current_line_blame_opts = { - virt_text = true, - virt_text_pos = "eol", -- 'eol' | 'overlay' | 'right_align' - delay = 100, - ignore_whitespace = false, - virt_text_priority = 100, - }, - current_line_blame_formatter = ", - ", - sign_priority = 6, - update_debounce = 100, - status_formatter = nil, -- Use default - max_file_length = 10000, -- Disable if file is longer than this (in lines) - preview_config = { - -- Options passed to nvim_open_win - border = "single", - style = "minimal", - relative = "cursor", - row = 0, - col = 1, - }, - on_attach = function(bufnr) - if vim.api.nvim_buf_get_name(bufnr):match("%.ipynb$") then - -- Do not attach for .ipynb file, since these are converted with jupytext.nvim - return false - end - end, - }, -} diff --git a/lua/plugins/illuminate.lua b/lua/plugins/illuminate.lua index 1f17214..3529d9e 100644 --- a/lua/plugins/illuminate.lua +++ b/lua/plugins/illuminate.lua @@ -9,7 +9,6 @@ return { end, }, { - "", function() require("illuminate").goto_prev_reference() diff --git a/lua/plugins/inlay-hints.lua b/lua/plugins/inlay-hints.lua index c38c99a..508589c 100644 --- a/lua/plugins/inlay-hints.lua +++ b/lua/plugins/inlay-hints.lua @@ -3,9 +3,6 @@ return { "MysticalDevil/inlay-hints.nvim", event = "LspAttach", dependencies = { "neovim/nvim-lspconfig" }, - keys = { - { "oi", vim.cmd.InlayHintsToggle, desc = "Toggle InlayHints" }, - }, opts = { commands = { enable = true }, -- Enable InlayHints commands, include `InlayHintsToggle`, `InlayHintsEnable` and `InlayHintsDisable` autocmd = { enable = true }, -- Enable the inlay hints on `LspAttach` event diff --git a/lua/plugins/lazydev.lua b/lua/plugins/lazydev.lua index 321593b..2995a70 100644 --- a/lua/plugins/lazydev.lua +++ b/lua/plugins/lazydev.lua @@ -3,8 +3,6 @@ return { ft = "lua", opts = { library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found { path = "${3rd}/luv/library", words = { "vim%.uv" } }, }, }, diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua index 45fec2a..8234201 100644 --- a/lua/plugins/markdown.lua +++ b/lua/plugins/markdown.lua @@ -1,77 +1,17 @@ return { { "tadmccorkle/markdown.nvim", - ft = { "markdown", "Avante" }, - opts = { - -- Disable all keymaps by setting mappings field to 'false'. - -- Selectively disable keymaps by setting corresponding field to 'false'. - mappings = { - inline_surround_toggle = "gs", -- (string|boolean) toggle inline style - inline_surround_toggle_line = "gss", -- (string|boolean) line-wise toggle inline style - inline_surround_delete = "ds", -- (string|boolean) delete emphasis surrounding cursor - inline_surround_change = "cs", -- (string|boolean) change emphasis surrounding cursor - link_add = "gl", -- (string|boolean) add link - link_follow = "gx", -- (string|boolean) follow link - go_curr_heading = "]c", -- (string|boolean) set cursor to current section heading - go_parent_heading = "]p", -- (string|boolean) set cursor to parent section heading - go_next_heading = "]]", -- (string|boolean) set cursor to next section heading - go_prev_heading = "[[", -- (string|boolean) set cursor to previous section heading - }, - inline_surround = { - -- For the emphasis, strong, strikethrough, and code fields: - -- * 'key': used to specify an inline style in toggle, delete, and change operations - -- * 'txt': text inserted when toggling or changing to the corresponding inline style - emphasis = { - key = "i", - txt = "*", - }, - strong = { - key = "b", - txt = "**", - }, - strikethrough = { - key = "s", - txt = "~~", - }, - code = { - key = "c", - txt = "`", - }, - }, - link = { - paste = { - enable = true, -- whether to convert URLs to links on paste - }, - }, - toc = { - -- Comment text to flag headings/sections for omission in table of contents. - omit_heading = "toc omit heading", - omit_section = "toc omit section", - -- Cycling list markers to use in table of contents. - -- Use '.' and ')' for ordered lists. - markers = { "-" }, - }, - -- Hook functions allow for overriding or extending default behavior. - -- Called with a table of options and a fallback function with default behavior. - -- Signature: fun(opts: table, fallback: fun()) - hooks = { - -- Called when following links. Provided the following options: - -- * 'dest' (string): the link destination - -- * 'use_default_app' (boolean|nil): whether to open the destination with default application - -- (refer to documentation on mappings for explanation of when this option is used) - follow_link = nil, - }, - on_attach = nil, -- (fun(bufnr: integer)) callback when plugin attaches to a buffer - }, + ft = { "markdown" }, + opts = {}, }, { "OXY2DEV/markview.nvim", dependencies = { "saghen/blink.cmp", + { "echasnovski/mini.icons", version = "*" }, }, - ft = { "markdown", "Avante" }, + ft = { "markdown" }, lazy = false, - priority = 49, opts = { preview = { icon_provider = "mini", diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index 865db7b..2465595 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -4,10 +4,10 @@ return { opts = { enabled = { "ai", + "diff", -- "pairs", "splitjoin", "surround", - "diff", }, }, config = function(_, opts) diff --git a/lua/plugins/neoconf.lua b/lua/plugins/neoconf.lua deleted file mode 100644 index e9e9434..0000000 --- a/lua/plugins/neoconf.lua +++ /dev/null @@ -1,43 +0,0 @@ -return { - "folke/neoconf.nvim", - cmd = { "Neoconf" }, - opts = { - -- name of the local settings files - local_settings = ".neoconf.json", - -- name of the global settings file in your Neovim config directory - global_settings = "neoconf.json", - -- import existing settings from other plugins - import = { - vscode = true, -- local .vscode/settings.json - coc = true, -- global/local coc-settings.json - nlsp = true, -- global/local nlsp-settings.nvim json settings - }, - -- send new configuration to lsp clients when changing json settings - live_reload = true, - -- set the filetype to jsonc for settings files, so you can use comments - -- make sure you have the jsonc treesitter parser installed! - filetype_jsonc = true, - plugins = { - -- configures lsp clients with settings in the following order: - -- - lua settings passed in lspconfig setup - -- - global json settings - -- - local json settings - lspconfig = { - enabled = true, - }, - -- configures jsonls to get completion in .nvim.settings.json files - jsonls = { - enabled = true, - -- only show completion in json settings for configured lsp servers - configured_servers_only = true, - }, - -- configures lua_ls to get completion of lspconfig server settings - lua_ls = { - -- by default, lua_ls annotations are only enabled in your neovim config directory - enabled_for_neovim_config = true, - -- explicitly enable adding annotations. Mostly relevant to put in your local .nvim.settings.json file - enabled = false, - }, - }, - }, -} diff --git a/lua/plugins/octo.lua b/lua/plugins/octo.lua new file mode 100644 index 0000000..549107d --- /dev/null +++ b/lua/plugins/octo.lua @@ -0,0 +1,11 @@ +return { + "pwntester/octo.nvim", + requires = { + "nvim-lua/plenary.nvim", + "folke/snacks.nvim", + "nvim-tree/nvim-web-devicons", + }, + opts = { + picker = "snacks", + }, +} diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index 26c447b..991565f 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -16,20 +16,9 @@ return { opts = { columns = { "icon", - -- "permissions", "size", - -- "mtime", }, - -- Restore window options to previous values when leaving an oil buffer - restore_win_options = true, - -- Skip the confirmation popup for simple operations delete_to_trash = true, - -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap - -- options with a `callback` (e.g. { callback = function() ... end, desc = "", nowait = true }) - -- Additionally, if it is a string that matches "actions.", - -- it will use the mapping at require("oil.actions"). - -- Set to `false` to remove a keymap - -- See :help oil-actions for a list of all available actions keymaps = { [""] = { "actions.select", opts = { vertical = true } }, [""] = { "actions.select", opts = { horizontal = true } }, @@ -44,10 +33,8 @@ return { -- Set to false to disable all of the above keymaps use_default_keymaps = true, view_options = { - -- Show files and directories that start with "." show_hidden = true, }, - -- Configuration for the floating window in oil.open_float float = { win_options = { winblend = 10, diff --git a/lua/plugins/otter.lua b/lua/plugins/otter.lua deleted file mode 100644 index 656cffd..0000000 --- a/lua/plugins/otter.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "jmbuhr/otter.nvim", - dependencies = { - "nvim-treesitter/nvim-treesitter", - }, - enabled = false, - opts = {}, -} diff --git a/lua/plugins/persistence.lua b/lua/plugins/persistence.lua index 8d27aab..dacc798 100644 --- a/lua/plugins/persistence.lua +++ b/lua/plugins/persistence.lua @@ -3,12 +3,19 @@ return { event = "BufReadPre", keys = { { - "qs", + "qq", function() require("persistence").load() end, desc = "Restore the session for the current directory", }, + { + "qs", + function() + require("persistence").select() + end, + desc = "Select a session to load", + }, { "ql", function() diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 0af2474..657f95e 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -4,14 +4,15 @@ return { { "echasnovski/mini.icons", version = "*" }, "stevearc/oil.nvim", "folke/trouble.nvim", + "folke/todo-comments.nvim", }, priority = 1000, lazy = false, opts = function() -- Toggle the profiler - Snacks.toggle.profiler():map("sp") + Snacks.toggle.profiler():map("Sp") -- Toggle the profiler highlights - Snacks.toggle.profiler_highlights():map("sh") + Snacks.toggle.profiler_highlights():map("Sh") return { animate = { enabled = false }, bigfile = { enabled = true }, @@ -94,7 +95,7 @@ return { desc = "History", }, { - "ss", + "Ss", function() Snacks.profiler.scratch() end, diff --git a/lua/plugins/spellwarn.lua b/lua/plugins/spellwarn.lua deleted file mode 100644 index d2188aa..0000000 --- a/lua/plugins/spellwarn.lua +++ /dev/null @@ -1,42 +0,0 @@ -return { - "ravibrock/spellwarn.nvim", - event = "VeryLazy", - cmd = { "Spellwarn" }, - keys = { - { - - "os", - function() - vim.cmd.Spellwarn("toggle") - end, - desc = "Spellwarn toggle", - }, - }, - - opts = { - event = { -- event(s) to refresh diagnostics on - "CursorHold", - "InsertLeave", - "TextChanged", - "TextChangedI", - "TextChangedP", - "TextChangedT", - }, - ft_config = { -- spellcheck method: "cursor", "iter", or boolean - alpha = false, - help = false, - lazy = false, - lspinfo = false, - mason = false, - }, - ft_default = true, -- default option for unspecified filetypes - max_file_size = nil, -- maximum file size to check in lines (nil for no limit) - severity = { -- severity for each spelling error type (false to disable diagnostics for that type) - spellbad = "WARN", - spellcap = "HINT", - spelllocal = "HINT", - spellrare = "INFO", - }, - prefix = "possible misspelling(s): ", -- prefix for each diagnostic message - }, -} diff --git a/lua/plugins/tailwind.lua b/lua/plugins/tailwind.lua index 1927802..72f6362 100644 --- a/lua/plugins/tailwind.lua +++ b/lua/plugins/tailwind.lua @@ -1,43 +1,7 @@ return { - { - "razak17/tailwind-fold.nvim", - opts = {}, - dependencies = { "nvim-treesitter/nvim-treesitter" }, - cmd = { "TailwindFoldEnable", "TailwindFoldDisable", "TailwindFoldToggle" }, - ft = { "html", "htmldjango", "svelte", "astro", "vue", "javascriptreact", "typescriptreact", "php", "blade" }, - }, - { - "luckasRanarison/tailwind-tools.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - enabled = false, - ft = { "html", "htmldjango", "svelte", "astro", "vue", "javascriptreact", "typescriptreact", "php", "blade" }, - cmd = { - "TailwindConcealEnable", - "TailwindConcealDisable", - "TailwindConcealToggle", - "TailwindColorEnable", - "TailwindColorDisable", - "TailwindColorToggle", - "TailwindSort", - "TailwindSortSelection", - "TailwindNextClass", - "TailwindPrevClass", - }, - opts = { - document_color = { - enabled = true, -- can be toggled by commands - kind = "background", -- "inline" | "foreground" | "background" - inline_symbol = "󰝤 ", -- only used in inline mode - debounce = 200, -- in milliseconds, only applied in insert mode - }, - conceal = { - enabled = false, -- can be toggled by commands - symbol = "󱏿", -- only a single character is allowed - highlight = { -- extmark highlight options, see :h 'highlight' - fg = "#38BDF8", - }, - }, - custom_filetypes = {}, -- see the extension section to learn how it works - }, - }, + "razak17/tailwind-fold.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + cmd = { "TailwindFoldEnable", "TailwindFoldDisable", "TailwindFoldToggle" }, + ft = { "html", "htmldjango", "svelte", "astro", "vue", "javascriptreact", "typescriptreact", "php", "blade" }, + opts = {}, } diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua index 0009823..3f46151 100644 --- a/lua/plugins/todo-comments.lua +++ b/lua/plugins/todo-comments.lua @@ -1,5 +1,8 @@ return { "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, + dependencies = { + "nvim-lua/plenary.nvim", + "folke/trouble.nvim", + }, opts = {}, } diff --git a/lua/plugins/ts-autotag.lua b/lua/plugins/ts-autotag.lua index bcc4c3d..2f41e03 100644 --- a/lua/plugins/ts-autotag.lua +++ b/lua/plugins/ts-autotag.lua @@ -1,16 +1,5 @@ return { "windwp/nvim-ts-autotag", events = { "BufReadPre", "BufNewFile" }, - opts = { - opts = { - -- Defaults - enable_close = true, -- Auto close tags - enable_rename = true, -- Auto rename pairs of tags - enable_close_on_slash = true, -- Auto close on trailing c", vim.cmd.bdelete, desc = "Close Buffer" }, { "X", function() @@ -44,7 +43,7 @@ return { { "q", group = "Persistence" }, { "l", group = "LSP" }, { "w", group = "Workspace" }, - { "f", group = "Picker", { "pd", group = "Development" } }, + { "p", group = "Picker" }, { "z", group = "Zen" }, { "o", group = "Action" }, { "r", group = "Rust" }, @@ -67,84 +66,14 @@ return { { "L", group = "Languate settings", - { "Lc", "setlocal formatoptions-=cro", desc = "Disable autocomment" }, - { "LC", "setlocal formatoptions=cro", desc = "Enable autocomment" }, - { "Ls", "setlocal spell!", desc = "Toggle spellchecker" }, + { "Lc", "setlocal formatoptions-=cro", desc = "Disable autocomment" }, + { "LC", "setlocal formatoptions=cro", desc = "Enable autocomment" }, + { "Ls", "setlocal spell!", desc = "Toggle spellchecker" }, { "Le", "setlocal spell spelllang=en_us", desc = "Enable English spellchecker" }, { "Ll", "setlocal spell spelllang=lv_LV", desc = "Enable Latvian spellchecker" }, - { "LI", "setlocal autoindent", desc = "Enable autoindent" }, - { "Li", "setlocal noautoindent", desc = "Disable autoindent" }, + { "LI", "setlocal autoindent", desc = "Enable autoindent" }, + { "Li", "setlocal noautoindent", desc = "Disable autoindent" }, }, - --[[ { - "P", - group = "Templates", - { - { - "Pl", - group = "Latex", - cond = function() - return vim.bo.filetype == "lua" - end, - - { - "Plp", - function() - vim.cmd.read("~/Templates/LaTeX/PhilPaper.tex") - end, - desc = "PhilPaper.tex", - }, - { - "Pll", - function() - vim.cmd.read("~/Templates/LaTeX/Letter.tex") - end, - desc = "Letter.tex", - }, - { - "Plg", - function() - vim.cmd.read("~/Templates/LaTeX/Glossary.tex") - end, - desc = "Glossary.tex", - }, - { - "Plh", - function() - vim.cmd.read("~/Templates/LaTeX/HandOut.tex") - end, - desc = "HandOut.tex", - }, - { - "Plb", - function() - vim.cmd.read("~/Templates/LaTeX/PhilBeamer.tex") - end, - desc = "PhilBeamer.tex", - }, - { - "Pls", - function() - vim.cmd.read("~/Templates/LaTeX/SubFile.tex") - end, - desc = "SubFile.tex", - }, - { - "Plr", - function() - vim.cmd.read("~/Templates/LaTeX/Root.tex") - end, - desc = "Root.tex", - }, - { - "Plm", - function() - vim.cmd.read("~/Templates/LaTeX/MultipleAnswer.tex") - end, - desc = "MultipleAnswer.tex", - }, - }, - }, - }, ]] }, }, }, diff --git a/snippets/lua.lua b/snippets/lua.lua index b5f51c7..d48c3c3 100644 --- a/snippets/lua.lua +++ b/snippets/lua.lua @@ -21,12 +21,11 @@ return { [[ local function {}({}) {} - end{} + end ]], { i(1), i(2), - i(3), i(0), } ) diff --git a/snippets/markdown.lua b/snippets/markdown.lua index 659ffed..3c784f7 100644 --- a/snippets/markdown.lua +++ b/snippets/markdown.lua @@ -13,6 +13,9 @@ return { } ) ), +}, { -- autosnippets + s({ trig = "mt", name = "Math Block" }, fmta("$<>$", { i(1) })), + s({ trig = "mmt", name = "Multiline Math Block" }, fmta("$ <> $", { i(1) })), s( "ket0", fmt( diff --git a/snippets/python.lua b/snippets/python.lua index a318d3b..3574e19 100644 --- a/snippets/python.lua +++ b/snippets/python.lua @@ -88,17 +88,4 @@ return { } ) ), -}, { - s( - "__", - fmta( - [[ - ____<> - ]], - { - init = i(1), - i(0), - } - ) - ), -} +}, {} diff --git a/snippets/rust.lua b/snippets/rust.lua index 19862ac..9b0970f 100644 --- a/snippets/rust.lua +++ b/snippets/rust.lua @@ -218,7 +218,7 @@ local bevy_snippets = { } ]], { - name = i(1, "sytem"), + name = i(1, "system"), args = i(2, "args"), body = i(0), }