From 8a676a19c121f04f17b966dd56ef58b43bf2c7b8 Mon Sep 17 00:00:00 2001 From: fbachus Date: Fri, 23 Jan 2026 01:59:35 +0100 Subject: [PATCH] add paru config and ignore lock files only minor tinkering otherwise --- .config/niri/config.kdl | 4 +- .config/niri/monitors.kdl | 28 +- .config/nvim/lazy-lock.json | 49 -- .config/nvim/lua/aaron/init/init.lua | 17 - .config/nvim/lua/plug_init/which_key_init.lua | 470 +++++++++--------- .config/nvim/lua/plugins/debugging.lua | 18 +- .config/nvim/lua/plugins/lualine.lua | 3 +- .config/nvim/lua/plugins/nvim-possession.lua | 3 +- .config/nvim/lua/plugins/peanuts.lua | 10 +- .config/paru/paru.conf | 17 + .gitignore | 1 + 11 files changed, 280 insertions(+), 340 deletions(-) delete mode 100644 .config/nvim/lazy-lock.json delete mode 100644 .config/nvim/lua/aaron/init/init.lua create mode 100644 .config/paru/paru.conf diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl index d5582ef..0c85bd1 100644 --- a/.config/niri/config.kdl +++ b/.config/niri/config.kdl @@ -109,12 +109,10 @@ layout { // Proportion sets the width as a fraction of the output width, taking gaps into account. // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. // The default preset widths are 1/3, 1/2 and 2/3 of the output. - proportion 0.125 // proportion 0.25 proportion 0.33333 proportion 0.5 proportion 0.66667 - proportion 0.875 // Fixed sets the width in logical pixels exactly. // fixed 1920 @@ -129,7 +127,7 @@ layout { } // You can change the default width of the new windows. - default-column-width { proportion 0.5; } + default-column-width { proportion 0.667; } // If you leave the brackets empty, the windows themselves will decide their initial width. // default-column-width {} diff --git a/.config/niri/monitors.kdl b/.config/niri/monitors.kdl index e9250c0..b2975f8 100644 --- a/.config/niri/monitors.kdl +++ b/.config/niri/monitors.kdl @@ -38,20 +38,20 @@ output "Advanced Micro Peripherals Ltd ES07D03 EVE213400622" { variable-refresh-rate focus-at-startup layout { - preset-column-widths { - // Proportion sets the width as a fraction of the output width, taking gaps into account. - // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. - // The default preset widths are 1/3, 1/2 and 2/3 of the output. - proportion 0.125 - // proportion 0.25 - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - proportion 0.875 - - // Fixed sets the width in logical pixels exactly. - // fixed 1920 - } + // preset-column-widths { + // // Proportion sets the width as a fraction of the output width, taking gaps into account. + // // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // // The default preset widths are 1/3, 1/2 and 2/3 of the output. + // // proportion 0.125 + // // proportion 0.25 + // proportion 0.33333 + // proportion 0.5 + // proportion 0.66667 + // // proportion 0.875 + // + // // Fixed sets the width in logical pixels exactly. + // // fixed 1920 + // } } } output "Iiyama North America PLG2888UH 0x01010101" { diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json deleted file mode 100644 index 61b6377..0000000 --- a/.config/nvim/lazy-lock.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, - "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, - "coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" }, - "coq_nvim": { "branch": "coq", "commit": "d939a34ceb2b57d2937890337a4aa75eb55e18a8" }, - "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, - "everforest": { "branch": "main", "commit": "557bce922401e247a596583679bc181d4d688554" }, - "fzf-lua": { "branch": "main", "commit": "518ab7a64ca65899a218f364f0fb9e38ff7bdcc8" }, - "gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "markview.nvim": { "branch": "main", "commit": "900272b66043d5e3d3f5a74b34eb4e93d3a0ce88" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "80c0130c5f16b551865a69e832f1feadeedb5fbe" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.nvim": { "branch": "main", "commit": "4f53281c51ad9384ef790178b9643740fa763979" }, - "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "cdfd55a133f63228c55f91378f12908cb2a78ded" }, - "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, - "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" }, - "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lint": { "branch": "master", "commit": "ca6ea12daf0a4d92dc24c5c9ae22a1f0418ade37" }, - "nvim-lspconfig": { "branch": "master", "commit": "92ee7d42320edfbb81f3cad851314ab197fa324a" }, - "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-possession": { "branch": "main", "commit": "fa1a37ffcba9e8d708192ebb4b031b53679f0246" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, - "obsidian.nvim": { "branch": "main", "commit": "f6b241fa08d157701b9b0850b1251d98f86b122e" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "smart-open.nvim": { "branch": "0.3.x", "commit": "918c97cac0c33f7a116a822df144bc5bbefa4490" }, - "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, - "store.nvim": { "branch": "main", "commit": "d53e9835ac10d1c4c21f261029059bfb25931b45" }, - "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, - "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" }, - "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, - "typr": { "branch": "main", "commit": "584e4ef34dea25a4035627794322f315b22d1253" }, - "undotree": { "branch": "main", "commit": "3976ed63d7fb0cc47f6a778e230a390a399df69c" }, - "virtual-types.nvim": { "branch": "master", "commit": "d652ec0b1781bbb0e83dc588fb62d638006cf61e" }, - "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, - "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, - "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } -} diff --git a/.config/nvim/lua/aaron/init/init.lua b/.config/nvim/lua/aaron/init/init.lua deleted file mode 100644 index 91119d6..0000000 --- a/.config/nvim/lua/aaron/init/init.lua +++ /dev/null @@ -1,17 +0,0 @@ ---[[ Plugins: -- lazy vim -- package manager -- mini.bracketed -- move to textobjects with brackets -- mini.ai --selection with textobjects, such as "indside quotes, parens etc" -- mini.indentscope -- show indent scope -- mini.cursorword -- highlight identical words -- gitsigns -- inline git info, stage by line, show deleted and more -- whichkey -- ongoing keybind docu -- telescope -- fast open anything -- treesitter -- syntax tree -- undotree -- view the undotree - -- lsp? -- autocomplete > coq.nvim? - -- sugar > lualine? -]] diff --git a/.config/nvim/lua/plug_init/which_key_init.lua b/.config/nvim/lua/plug_init/which_key_init.lua index 3b9a0a2..be62820 100644 --- a/.config/nvim/lua/plug_init/which_key_init.lua +++ b/.config/nvim/lua/plug_init/which_key_init.lua @@ -1,238 +1,238 @@ ---local wk = require("which-key") - -wk.add({ - { "c", group = "crates" }, - { "cA", function() require("crates").upgrade_all_crates() end, desc = "Upgrade all crates" }, - { "cC", function() require("crates").open_creates_io() end, desc = "Open crates.io" }, - { "cD", function() require("crates").open_documentation() end, desc = "Open documentation" }, - { "cH", function() require("crates").open_homepage() end, desc = "Open homepage" }, - { "cR", function() require("crates").open_repository() end, desc = "Open repository" }, - { "cU", function() require("crates").upgrade_crate() end, desc = "Upgrade crate" }, - { "cX", function() require("crates").extract_crate_into_table() end, desc = "Extract crate into table" }, - { "ca", function() require("crates").update_all_crates() end, desc = "Update all crates" }, - { "cd", function() require("crates").show_dependencies_popup() end, desc = "Show dependencies popup" }, - { "cf", function() require("crates").show_features_popup() end, desc = "Show features popup" }, - { "cr", function() require("crates").reload() end, desc = "Reload" }, - { "ct", function() require("crates").toggle() end, desc = "Toggle" }, - { "cu", function() require("crates").update_crate() end, desc = "Update crate" }, - { "cv", function() require("crates").show_versions_popup() end, desc = "Show versions popup" }, - { - "cx", - function() require("crates").expand_plain_crate_to_inline_table() end, - desc = "Expand plain crate to inline table", - }, - - { "lp", "Lazy profile", desc = "show Lazy profiler" }, - - { "e", "lua MiniFiles.open()", desc = "Files w/ Mini" }, - { "E", "Lexplore", desc = "Files Sidebar" }, - { "f", group = "Telescope" }, - { "fb", "Telescope buffers", desc = "Find Buffer" }, - { "fd", "Telescope lsp_document_symbols", desc = "Find LSP Symbols" }, - { "ff", "Telescope find_files", desc = "Find File" }, - { "fh", "Telescope help_tags", desc = "Find Help" }, - { "fr", "Telescope oldfiles", desc = "Open Recent File", remap = true }, - { "fs", "Telescope live_grep", desc = "Live Grep" }, - { "fw", "Telescope grep_string", desc = "Find string under cursor" }, - { - "", - function() require("telescope").extensions.smart_open.smart_open() end, - mode = "n", - silent = true, - desc = "Smart open", - }, - - { "g", group = "Gitsigns" }, - { "gB", "Gitsigns blame", desc = "Toggle Blame Sidebar" }, - { "gb", "Gitsigns blame_line", desc = "Show Blame Inline" }, - { "gd", "Gitsigns toggle_deleted", desc = "Toggle deleted lines" }, - { "gh", group = "hunks" }, - { "ghl", "Gitsigns setloclist", desc = "List file Changes" }, - { "ghn", "Gitsigns nav_hunk", desc = "Nav Hunk" }, - { "gr", group = "reset" }, - { "grb", "Gitsigns reset_buffer", desc = "Reset Buffer" }, - { "grh", "Gitsigns reset_hunk", desc = "Reset Hunk" }, - { "gs", group = "stage" }, - { "gsb", "Gitsigns stage_buffer", desc = "Stage Buffer" }, - { "gsh", "Gitsigns stage_hunk", desc = "Stage Hunk" }, - { "gu", "Gitsigns undo_stage_hunk", desc = "Undo Stage Hunk" }, - - -- lsp and debugging - { - "i", - function() require("conform").format({ async = true }) end, - desc = "Auto format file with formatter", - }, - { - "F3", - function() require("conform").format({ async = true }) end, - mode = "ni", - desc = "Auto format file with formatter", - }, - { "le", vim.diagnostic.open_float, desc = "Open diagnostic float" }, - { "K", desc = "Show definition" }, - -- { "d", group = "Debugging" }, - -- { - -- { mode = "n" }, - -- { "dn", require("dap").new, desc = "Start Debugger" }, - -- { "db", require("dap").toggle_breakpoint, desc = "Toggle breakpoint" }, - -- { "dc", require("dap").continue, desc = "Continue" }, - -- }, - - -- trouble plugin - { "xx", "Trouble diagnostics toggle", desc = "Diagnostics (Trouble)" }, - { "xX", "Trouble diagnostics toggle filter.buf=0", desc = "Buffer Diagnostics (Trouble)" }, - { "xs", "Trouble symbols toggle focus=false", desc = "Symbols (Trouble)" }, - { - "xl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)", - }, - { "xL", "Trouble loclist toggle", desc = "Location List (Trouble)" }, - { "xQ", "Trouble qflist toggle", desc = "Quickfix List (Trouble)" }, - - -- QOL shortcuts - { "n", "nohl", desc = "Stop highlighting search results" }, - { "m", "NoiceDismiss", desc = "Dismiss notifications" }, - { "M", "Markview toggle", desc = "Markview toggle source view" }, - - { "r", group = "Rename" }, - { "rr", vim.lsp.buf.rename, opts, desc = "Rename Variable" }, - - { "s", group = "Sessions" }, - { "sl", function() require("nvim-possession").list() end, desc = "List sesssions" }, - { "sn", function() require("nvim-possession").new() end, desc = "Create new session" }, - { "su", function() require("nvim-possession").update() end, desc = "Update Session" }, - { "sd", function() require("nvim-possession").delete() end, desc = "Delete Session" }, - - { "t", group = "tabs" }, - { "ta", "tabnew", desc = "Add new Tab" }, - { "tc", "tabclose", desc = "Close Tab" }, - { "tf", "tabfirst", desc = "First Tab" }, - { "tl", "tablast", desc = "Last Tab" }, - { "tm", group = "Move Tab" }, - { "tmf", "tabmove 0", desc = "Move Tab to First" }, - { "tmi", ":tabmove ", desc = "Input position to move Tab to" }, - { "tml", "tabmove $", desc = "Move Tab to Last" }, - { "tn", "tabnext", desc = "Next Tab" }, - { "tp", "tabprevious", desc = "Previous Tab" }, - - { "u", desc = "Toggle undo-tree" }, - { "w", group = "Workspaces + Whichkey" }, - { "wa", desc = "Add workspace folder" }, - { "wr", desc = "Remove workspace folder" }, - { "ww", "WhichKey", desc = "Show keybindings" }, - { "y", desc = "Copy to system clipboard" }, - { "Y", desc = "Copy line to system clipboard" }, - - -- mini.nvim additions - { "va", group = "select around" }, --{{{1 mini.ai - { "va(", desc = "() parens" }, - { "va)", desc = "() parens" }, - { "va[", desc = "[] brackets" }, - { "va]", desc = "[] brackets" }, - { "va{", desc = "{} braces" }, - { "va}", desc = "{} braces" }, - { "va<", desc = "<> braces" }, - { "va>", desc = "<> braces" }, - { 'va"', desc = '""' }, - { "va'", desc = "''" }, - { "val", desc = "last selection" }, - - { "vi", group = "select inside" }, - { "vi(", desc = "() parens" }, - { "vi)", desc = "() parens" }, - { "vi[", desc = "[] brackets" }, - { "vi]", desc = "[] brackets" }, - { "vi{", desc = "{} braces" }, - { "vi}", desc = "{} braces" }, - { "vi<", desc = "<> braces" }, - { "vi>", desc = "<> braces" }, - { 'vi"', desc = '""' }, - { "vi'", desc = "''" }, - { "vil", desc = "last selection" }, - --}}} - - { "[", group = "move to prev" }, --{{{2 "brackets" - { "[B", desc = "First Buffer" }, - { "[b", desc = "Prev Buffer" }, - { "[X", desc = "First Conflict" }, - { "[x", desc = "Prev Conflict" }, - { "[I", desc = "First Indent" }, - { "[i", desc = "Prev Indent" }, - { "[I", desc = "First Indent" }, - { "[i", desc = "Prev Indent" }, - { "[W", desc = "First Window in Tab" }, - { "[w", desc = "Prev Window in Tab" }, - { "[F", desc = "First File" }, - { "[f", desc = "Prev File" }, - { "[O", desc = "First Oldfile" }, - { "[o", desc = "Prev Oldfile" }, - { "[Q", desc = "First Quickfix" }, - { "[q", desc = "Prev Quickfix" }, - { "[Y", desc = "First Yank selection replacing latest put region" }, - { "[y", desc = "Prev Yank selection replacing latest put region" }, - - { "]", group = "move next" }, - { "]B", desc = "Last Buffer" }, - { "]b", desc = "Next Buffer" }, - { "]X", desc = "Last Conflict" }, - { "]x", desc = "Next Conflict" }, - { "]I", desc = "Last Indent" }, - { "]i", desc = "Next Indent" }, - { "]I", desc = "Last Indent" }, - { "]i", desc = "Next Indent" }, - { "]W", desc = "Last Window in Tab" }, - { "]w", desc = "Next Window in Tab" }, - { "]F", desc = "Last File" }, - { "]f", desc = "Next File" }, - { "]O", desc = "Last Oldfile" }, - { "]o", desc = "Next Oldfile" }, - { "]Q", desc = "Last Quickfix" }, - { "]q", desc = "Next Quickfix" }, - { "]Y", desc = "Last Yank selection replacing latest put region" }, - { "]y", desc = "Next Yank selection replacing latest put region" }, - --}}} - - { "gcc", desc = "Comment Line" }, - { - mode = { "v" }, - { "gc", group = "Comment" }, - { "g=", desc = "evaluate expression" }, - { "gm", desc = "duplicate" }, - { "gr", desc = "replace with register" }, - { "gs", desc = "sort" }, - { "gx", desc = "exchange region" }, - }, -}) - -wk.add({ - -- These somehow have no effect whatsoever - -- { "c", group = "change" }, - -- { "c[", group = "back" }, - -- { "c]", group = "forward" }, - -- { "cg", group = "jump" }, - -- - -- { "d", group = "delete" }, - -- { "d[", group = "back" }, - -- { "d]", group = "forward" }, - -- { "dg", group = "jump" }, - - { "K", desc = "Show definition" }, - { "[", group = "jump backward" }, - { "[c", desc = "Previous diff change" }, - { "[d", desc = "Previous Diagnostic" }, - { "[h", "Gitsigns prev_hunk", desc = "Previous changed git block" }, - { "]", group = "jump forward" }, - { "]c", desc = "Next diff change" }, - { "]d", desc = "Next Diagnostic" }, - { "]h", "Gitsigns next_hunk", desc = "Next changed git block" }, - { "g", group = "lsp functions" }, - { "gD", desc = "go to declaration" }, - { "gd", desc = "go to definition" }, - { "gi", desc = "show implementations" }, - { "gr", desc = "list all references to symbol under cursor" }, -}) +-- --local wk = require("which-key") +-- +-- wk.add({ +-- { "c", group = "crates" }, +-- { "cA", function() require("crates").upgrade_all_crates() end, desc = "Upgrade all crates" }, +-- { "cC", function() require("crates").open_creates_io() end, desc = "Open crates.io" }, +-- { "cD", function() require("crates").open_documentation() end, desc = "Open documentation" }, +-- { "cH", function() require("crates").open_homepage() end, desc = "Open homepage" }, +-- { "cR", function() require("crates").open_repository() end, desc = "Open repository" }, +-- { "cU", function() require("crates").upgrade_crate() end, desc = "Upgrade crate" }, +-- { "cX", function() require("crates").extract_crate_into_table() end, desc = "Extract crate into table" }, +-- { "ca", function() require("crates").update_all_crates() end, desc = "Update all crates" }, +-- { "cd", function() require("crates").show_dependencies_popup() end, desc = "Show dependencies popup" }, +-- { "cf", function() require("crates").show_features_popup() end, desc = "Show features popup" }, +-- { "cr", function() require("crates").reload() end, desc = "Reload" }, +-- { "ct", function() require("crates").toggle() end, desc = "Toggle" }, +-- { "cu", function() require("crates").update_crate() end, desc = "Update crate" }, +-- { "cv", function() require("crates").show_versions_popup() end, desc = "Show versions popup" }, +-- { +-- "cx", +-- function() require("crates").expand_plain_crate_to_inline_table() end, +-- desc = "Expand plain crate to inline table", +-- }, +-- +-- { "lp", "Lazy profile", desc = "show Lazy profiler" }, +-- +-- { "e", "lua MiniFiles.open()", desc = "Files w/ Mini" }, +-- { "E", "Lexplore", desc = "Files Sidebar" }, +-- { "f", group = "Telescope" }, +-- { "fb", "Telescope buffers", desc = "Find Buffer" }, +-- { "fd", "Telescope lsp_document_symbols", desc = "Find LSP Symbols" }, +-- { "ff", "Telescope find_files", desc = "Find File" }, +-- { "fh", "Telescope help_tags", desc = "Find Help" }, +-- { "fr", "Telescope oldfiles", desc = "Open Recent File", remap = true }, +-- { "fs", "Telescope live_grep", desc = "Live Grep" }, +-- { "fw", "Telescope grep_string", desc = "Find string under cursor" }, +-- { +-- "", +-- function() require("telescope").extensions.smart_open.smart_open() end, +-- mode = "n", +-- silent = true, +-- desc = "Smart open", +-- }, +-- +-- { "g", group = "Gitsigns" }, +-- { "gB", "Gitsigns blame", desc = "Toggle Blame Sidebar" }, +-- { "gb", "Gitsigns blame_line", desc = "Show Blame Inline" }, +-- { "gd", "Gitsigns toggle_deleted", desc = "Toggle deleted lines" }, +-- { "gh", group = "hunks" }, +-- { "ghl", "Gitsigns setloclist", desc = "List file Changes" }, +-- { "ghn", "Gitsigns nav_hunk", desc = "Nav Hunk" }, +-- { "gr", group = "reset" }, +-- { "grb", "Gitsigns reset_buffer", desc = "Reset Buffer" }, +-- { "grh", "Gitsigns reset_hunk", desc = "Reset Hunk" }, +-- { "gs", group = "stage" }, +-- { "gsb", "Gitsigns stage_buffer", desc = "Stage Buffer" }, +-- { "gsh", "Gitsigns stage_hunk", desc = "Stage Hunk" }, +-- { "gu", "Gitsigns undo_stage_hunk", desc = "Undo Stage Hunk" }, +-- +-- -- lsp and debugging +-- { +-- "i", +-- function() require("conform").format({ async = true }) end, +-- desc = "Auto format file with formatter", +-- }, +-- { +-- "F3", +-- function() require("conform").format({ async = true }) end, +-- mode = "ni", +-- desc = "Auto format file with formatter", +-- }, +-- { "le", vim.diagnostic.open_float, desc = "Open diagnostic float" }, +-- { "K", desc = "Show definition" }, +-- -- { "d", group = "Debugging" }, +-- -- { +-- -- { mode = "n" }, +-- -- { "dn", require("dap").new, desc = "Start Debugger" }, +-- -- { "db", require("dap").toggle_breakpoint, desc = "Toggle breakpoint" }, +-- -- { "dc", require("dap").continue, desc = "Continue" }, +-- -- }, +-- +-- -- trouble plugin +-- { "xx", "Trouble diagnostics toggle", desc = "Diagnostics (Trouble)" }, +-- { "xX", "Trouble diagnostics toggle filter.buf=0", desc = "Buffer Diagnostics (Trouble)" }, +-- { "xs", "Trouble symbols toggle focus=false", desc = "Symbols (Trouble)" }, +-- { +-- "xl", +-- "Trouble lsp toggle focus=false win.position=right", +-- desc = "LSP Definitions / references / ... (Trouble)", +-- }, +-- { "xL", "Trouble loclist toggle", desc = "Location List (Trouble)" }, +-- { "xQ", "Trouble qflist toggle", desc = "Quickfix List (Trouble)" }, +-- +-- -- QOL shortcuts +-- { "n", "nohl", desc = "Stop highlighting search results" }, +-- { "m", "NoiceDismiss", desc = "Dismiss notifications" }, +-- { "M", "Markview toggle", desc = "Markview toggle source view" }, +-- +-- { "r", group = "Rename" }, +-- { "rr", vim.lsp.buf.rename, opts, desc = "Rename Variable" }, +-- +-- { "s", group = "Sessions" }, +-- { "sl", function() require("nvim-possession").list() end, desc = "List sesssions" }, +-- { "sn", function() require("nvim-possession").new() end, desc = "Create new session" }, +-- { "su", function() require("nvim-possession").update() end, desc = "Update Session" }, +-- { "sd", function() require("nvim-possession").delete() end, desc = "Delete Session" }, +-- +-- { "t", group = "tabs" }, +-- { "ta", "tabnew", desc = "Add new Tab" }, +-- { "tc", "tabclose", desc = "Close Tab" }, +-- { "tf", "tabfirst", desc = "First Tab" }, +-- { "tl", "tablast", desc = "Last Tab" }, +-- { "tm", group = "Move Tab" }, +-- { "tmf", "tabmove 0", desc = "Move Tab to First" }, +-- { "tmi", ":tabmove ", desc = "Input position to move Tab to" }, +-- { "tml", "tabmove $", desc = "Move Tab to Last" }, +-- { "tn", "tabnext", desc = "Next Tab" }, +-- { "tp", "tabprevious", desc = "Previous Tab" }, +-- +-- { "u", desc = "Toggle undo-tree" }, +-- { "w", group = "Workspaces + Whichkey" }, +-- { "wa", desc = "Add workspace folder" }, +-- { "wr", desc = "Remove workspace folder" }, +-- { "ww", "WhichKey", desc = "Show keybindings" }, +-- { "y", desc = "Copy to system clipboard" }, +-- { "Y", desc = "Copy line to system clipboard" }, +-- +-- -- mini.nvim additions +-- { "va", group = "select around" }, --{{{1 mini.ai +-- { "va(", desc = "() parens" }, +-- { "va)", desc = "() parens" }, +-- { "va[", desc = "[] brackets" }, +-- { "va]", desc = "[] brackets" }, +-- { "va{", desc = "{} braces" }, +-- { "va}", desc = "{} braces" }, +-- { "va<", desc = "<> braces" }, +-- { "va>", desc = "<> braces" }, +-- { 'va"', desc = '""' }, +-- { "va'", desc = "''" }, +-- { "val", desc = "last selection" }, +-- +-- { "vi", group = "select inside" }, +-- { "vi(", desc = "() parens" }, +-- { "vi)", desc = "() parens" }, +-- { "vi[", desc = "[] brackets" }, +-- { "vi]", desc = "[] brackets" }, +-- { "vi{", desc = "{} braces" }, +-- { "vi}", desc = "{} braces" }, +-- { "vi<", desc = "<> braces" }, +-- { "vi>", desc = "<> braces" }, +-- { 'vi"', desc = '""' }, +-- { "vi'", desc = "''" }, +-- { "vil", desc = "last selection" }, +-- --}}} +-- +-- { "[", group = "move to prev" }, --{{{2 "brackets" +-- { "[B", desc = "First Buffer" }, +-- { "[b", desc = "Prev Buffer" }, +-- { "[X", desc = "First Conflict" }, +-- { "[x", desc = "Prev Conflict" }, +-- { "[I", desc = "First Indent" }, +-- { "[i", desc = "Prev Indent" }, +-- { "[I", desc = "First Indent" }, +-- { "[i", desc = "Prev Indent" }, +-- { "[W", desc = "First Window in Tab" }, +-- { "[w", desc = "Prev Window in Tab" }, +-- { "[F", desc = "First File" }, +-- { "[f", desc = "Prev File" }, +-- { "[O", desc = "First Oldfile" }, +-- { "[o", desc = "Prev Oldfile" }, +-- { "[Q", desc = "First Quickfix" }, +-- { "[q", desc = "Prev Quickfix" }, +-- { "[Y", desc = "First Yank selection replacing latest put region" }, +-- { "[y", desc = "Prev Yank selection replacing latest put region" }, +-- +-- { "]", group = "move next" }, +-- { "]B", desc = "Last Buffer" }, +-- { "]b", desc = "Next Buffer" }, +-- { "]X", desc = "Last Conflict" }, +-- { "]x", desc = "Next Conflict" }, +-- { "]I", desc = "Last Indent" }, +-- { "]i", desc = "Next Indent" }, +-- { "]I", desc = "Last Indent" }, +-- { "]i", desc = "Next Indent" }, +-- { "]W", desc = "Last Window in Tab" }, +-- { "]w", desc = "Next Window in Tab" }, +-- { "]F", desc = "Last File" }, +-- { "]f", desc = "Next File" }, +-- { "]O", desc = "Last Oldfile" }, +-- { "]o", desc = "Next Oldfile" }, +-- { "]Q", desc = "Last Quickfix" }, +-- { "]q", desc = "Next Quickfix" }, +-- { "]Y", desc = "Last Yank selection replacing latest put region" }, +-- { "]y", desc = "Next Yank selection replacing latest put region" }, +-- --}}} +-- +-- { "gcc", desc = "Comment Line" }, +-- { +-- mode = { "v" }, +-- { "gc", group = "Comment" }, +-- { "g=", desc = "evaluate expression" }, +-- { "gm", desc = "duplicate" }, +-- { "gr", desc = "replace with register" }, +-- { "gs", desc = "sort" }, +-- { "gx", desc = "exchange region" }, +-- }, +-- }) +-- +-- wk.add({ +-- -- These somehow have no effect whatsoever +-- -- { "c", group = "change" }, +-- -- { "c[", group = "back" }, +-- -- { "c]", group = "forward" }, +-- -- { "cg", group = "jump" }, +-- -- +-- -- { "d", group = "delete" }, +-- -- { "d[", group = "back" }, +-- -- { "d]", group = "forward" }, +-- -- { "dg", group = "jump" }, +-- +-- { "K", desc = "Show definition" }, +-- { "[", group = "jump backward" }, +-- { "[c", desc = "Previous diff change" }, +-- { "[d", desc = "Previous Diagnostic" }, +-- { "[h", "Gitsigns prev_hunk", desc = "Previous changed git block" }, +-- { "]", group = "jump forward" }, +-- { "]c", desc = "Next diff change" }, +-- { "]d", desc = "Next Diagnostic" }, +-- { "]h", "Gitsigns next_hunk", desc = "Next changed git block" }, +-- { "g", group = "lsp functions" }, +-- { "gD", desc = "go to declaration" }, +-- { "gd", desc = "go to definition" }, +-- { "gi", desc = "show implementations" }, +-- { "gr", desc = "list all references to symbol under cursor" }, +-- }) function whichkeyUndotree() wk.add({ diff --git a/.config/nvim/lua/plugins/debugging.lua b/.config/nvim/lua/plugins/debugging.lua index 81a40f8..359d778 100644 --- a/.config/nvim/lua/plugins/debugging.lua +++ b/.config/nvim/lua/plugins/debugging.lua @@ -55,16 +55,14 @@ return { -- }, -- debugging languages { - { - -- Automatically sets up LSP, so lsp.lua doesn't include rust. - -- Makes debugging work seamlessly. - "mrcjkb/rustaceanvim", - version = "^5", -- Recommended by module. - lazy = true, - ft = "rust", - dependencies = { - "mfussenegger/nvim-dap", - }, + -- Automatically sets up LSP, so lsp.lua doesn't include rust. + -- Makes debugging work seamlessly. + "mrcjkb/rustaceanvim", + version = "^5", -- Recommended by module. + lazy = true, + ft = "rust", + dependencies = { + "mfussenegger/nvim-dap", }, }, { diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 1c09f2d..edaa3c4 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,8 @@ return { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, - lazy = false, + lazy = true, + event = { "VeryLazy" }, opts = { options = { icons_enabled = true, diff --git a/.config/nvim/lua/plugins/nvim-possession.lua b/.config/nvim/lua/plugins/nvim-possession.lua index 872dfb2..b3b7295 100644 --- a/.config/nvim/lua/plugins/nvim-possession.lua +++ b/.config/nvim/lua/plugins/nvim-possession.lua @@ -3,7 +3,7 @@ return { "gennaro-tedesco/nvim-possession", lazy = true, keys = { "s" }, - config = true, + -- config = true, opts = { autoload = false, -- default false autosave = true, @@ -15,5 +15,4 @@ return { }, }, }, - { "ibhagwan/fzf-lua", lazy = true }, } diff --git a/.config/nvim/lua/plugins/peanuts.lua b/.config/nvim/lua/plugins/peanuts.lua index ea04641..99cf4e1 100644 --- a/.config/nvim/lua/plugins/peanuts.lua +++ b/.config/nvim/lua/plugins/peanuts.lua @@ -17,15 +17,7 @@ return { { "alex-popov-tech/store.nvim", cmd = "Store", - opts = { - width = 1000, - height = 500, - }, - }, - { - "nvim-lualine/lualine.nvim", - dependencies = { "nvim-tree/nvim-web-devicons" }, - lazy = false, + opts = {}, }, { "folke/noice.nvim", diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf new file mode 100644 index 0000000..619f03c --- /dev/null +++ b/.config/paru/paru.conf @@ -0,0 +1,17 @@ +[options] +#AurOnly +#BottomUp +#CleanAfter +#CombinedUpgrade +#RemoveMake +#SudoLoop +BottomUp +Devel +DevelSuffixes = -git -cvs -svn -bzr -darcs -always -hg -fossil +Limit = 50 +NewsOnUpgrade +PgpFetch +Provides +SaveChanges +UpgradeMenu +UseAsk diff --git a/.gitignore b/.gitignore index e99e894..ba69242 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ history.txt *lock* .env* *typrstats +*-lock*