From 8c37834a4f4de2ce5d41c35da3aaafc30322ffb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 29 Aug 2023 18:13:48 +0200 Subject: [PATCH] New fish function for zi command, keybinds for lazyvim and nvim as well as changes for nvim plugins and installation of a new import cost plugin --- ...nelTabs_new_302085663057248267.config.json | 12 +- .config/fish/config.fish | 3 +- .config/fish/functions/zi.fish | 9 + .config/keyb/bindings/lazygit.yml | 446 ++++++++++++++++++ .config/keyb/bindings/nvim.yml | 189 +++++++- .config/nvim/lazy-lock.json | 23 +- .config/nvim/lua/config/keymaps.lua | 7 - .config/nvim/lua/plugins/import-cost.lua | 8 + .config/nvim/lua/plugins/lspconfig.lua | 8 +- .config/nvim/lua/plugins/mason.lua | 32 +- .config/nvim/lua/plugins/telescope.lua | 11 +- 11 files changed, 691 insertions(+), 57 deletions(-) create mode 100644 .config/fish/functions/zi.fish create mode 100644 .config/nvim/lua/plugins/import-cost.lua diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index f1908c01..38b3480f 100644 --- a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json +++ b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json @@ -2,12 +2,12 @@ "settings": { "tabs": [ { - "name": "#noticias_gd", - "url": "/channels/674984102860161025/888017395195736116", + "name": "#memes", + "url": "/channels/674984102860161025/675369610253434900", "selected": true, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", - "channelId": "888017395195736116" + "channelId": "675369610253434900" }, { "name": "#feedback-and-suggestions", @@ -18,12 +18,12 @@ "channelId": "1027703875291062373" }, { - "name": "#archived-suggestions", - "url": "/channels/907385605422448742/923262113500246027/933063572425170976", + "name": "#rices", + "url": "/channels/907385605422448742/1101893177557925888", "selected": false, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/907385605422448742/15eb0b4e27967b11f7e72c9ccb133ad1.webp?size=40", - "channelId": "923262113500246027" + "channelId": "1101893177557925888" }, { "name": "Friends", diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 9cc4570b..5ba3d400 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -18,9 +18,10 @@ if status is-interactive source ~/.config/fish/functions/fzf_git.fish source ~/.config/fish/functions/fzf_git_all.fish source ~/.config/fish/functions/fzf_forgit.fish + source ~/.config/fish/functions/zi.fish bind \cg fgit - bind \e\z zi + bind \e\z cdzi colorscript random end diff --git a/.config/fish/functions/zi.fish b/.config/fish/functions/zi.fish new file mode 100644 index 00000000..767be906 --- /dev/null +++ b/.config/fish/functions/zi.fish @@ -0,0 +1,9 @@ +function cdzi + # Ejecuta zi y utilize su interfaz de fzf para seleccionar el directorio + set selected_directory (zi) + + # Si se seleccionó un directorio, navega a él + if test -n "$selected_directory" + cd $selected_directory + end +end diff --git a/.config/keyb/bindings/lazygit.yml b/.config/keyb/bindings/lazygit.yml index e69de29b..df106403 100644 --- a/.config/keyb/bindings/lazygit.yml +++ b/.config/keyb/bindings/lazygit.yml @@ -0,0 +1,446 @@ +- name: Global + keybinds: + - name: Switch to a Recent Repo + key: Ctrl + r + - name: Previous Tab + key: '[' + - name: Next Tab + key: ']' + - name: Open Command Log Menu + key: '@' + - name: View Custom Patch Options + key: Ctrl + p + - name: View Merge/Rebase Options + key: m + - name: Refresh + key: r + - name: Next Screen Mode + key: + + - name: Previous Screen Mode + key: _ + - name: Open Menu + key: '?' + - name: View Filter-By-Path Options + key: Ctrl + s + - name: Open Diff Menu + key: Ctrl + e / W + - name: Toggle Whitespaces in Diff View + key: Ctrl + w + - name: Undo + key: u + - name: Redo + key: Ctrl + z + - name: Push + key: P + - name: Pull + key: p + - name: Search the Current View by Text + key: / + +- name: Commit Files + keybinds: + - name: Copy the Committed File Name to the Clipboard + key: Ctrl + o + - name: Checkout File + key: c + - name: Discard this Commits Changes to this File + key: d + - name: Open File + key: o + - name: Edit File + key: e + - name: Toggle File Included in Patch + key: Space + - name: Toggle all Files Included in Patch + key: a + - name: Enter File to add Selected Lines to the Patch + key: Enter + - name: Toggle File Tree View + key: '`' + +- name: Commits + keybinds: + - name: Copy Commit SHA to the Clipboard + key: Ctrl + o + - name: Rest Copied Commits Selection + key: Ctrl + r + - name: View Bisect Options + key: b + - name: Squash Down + key: s + - name: Fixup Commit + key: f + - name: Reword Commit + key: r + - name: Reword Commit with Editor + key: R + - name: Delete Commit + key: d + - name: Edit Commit + key: e + - name: Pick Commit + key: p + - name: Creat Fixup Comit for this Commit + key: F + - name: Squash all 'fixup!' Commits above Selected Commit (Autosquash) + key: S + - name: Move Commit Down One + key: Ctrl + j + - name: Move Commit Up One + key: Ctrl + k + - name: Paste Commits + key: v + - name: Mark Commit as Base Commit for Rebase + key: B + - name: Ammend Commit with Staged Changes + key: A + - name: Set/Reset Commit Author + key: a + - name: Reverse Commit + key: t + - name: Tag Commit + key: T + - name: Open Log Menu + key: Ctrl + l + - name: View Worktree Options + key: w + - name: Checkout Commit + key: Space + - name: Copy Commit Attribute + key: y + - name: Open Commit in Browser + key: o + - name: Create Branch from Commit + key: n + - name: View Reset Options + key: g + - name: Copy Commit + key: c + - name: Copy Commit Range + key: C + - name: View Selected Items Files + key: Enter + +- name: Files + keybinds: + - name: Copy the File Name to the Clipboard + key: Ctrl + o + - name: View Discard Changes Options + key: d + - name: Toggle Staged + key: Space + - name: Filter Files by Status + key: Ctrl + b + - name: Commit Changes + key: c + - name: Commit Changes without Pre-Commit Hook + key: w + - name: Ammend last Commit + key: A + - name: Commit Changes using Git Editor + key: C + - name: Edit File + key: e + - name: Open File + key: o + - name: Ignore or Exclude File + key: i + - name: Refresh Files + key: r + - name: Stash all Changes + key: s + - name: View Stash Options + key: S + - name: Stage/Unstage all Files + key: a + - name: Stage Individual Hunks/Lines for File, or Collapse/Expand for Directory + key: Enter + - name: View Upstream Reset Options + key: g + - name: View Reset Options + key: D + - name: Toggle File Tree View + key: '`' + - name: Open External Merge Tool + key: M + - name: Fetch + key: f + +- name: Local Branches + keybinds: + - name: Copy Branch Name to the Clipboard + key: Ctrl + o + - name: Show Git-Flow Options + key: i + - name: Checkout + key: Space + - name: New Branch + key: n + - name: Create Pull Request + key: o + - name: Create Pull Request Options + key: O + - name: Copy Pull Request URL to the Clipboard + key: Ctrl + y + - name: Checkout by Name + key: c + - name: Force Checkout + key: F + - name: View Delete Options + key: d + - name: Rebase Checkec-Out Branch onto this Branch + key: r + - name: Merge into Currently Checked Out Branch + key: M + - name: Fast-Forward this Branch from its Upstream + key: f + - name: Create Tag + key: t + - name: View Reset Options + key: g + - name: Rename Branch + key: R + - name: Set/Unset Upstream + key: u + - name: View Worktree Options + key: w + - name: View Commits + key: Enter + +- name: Main Panel (Merging) + keybinds: + - name: Open File + key: o + - name: Edit File + key: e + - name: Select Previous Conflict + key: Left Arrow Key + - name: Select Next Hunk + key: Right Arrow Key + - name: Select Previous Hunk + key: Up Arrow Key + - name: Select Next Hunk + key: Down Arrow Key + - name: Undo + key: z + - name: Open External Merge Tool + key: M + - name: Pick Hunk + key: Space + - name: Pick All Hunks + key: b + - name: Return to the Files Panel + key: Esc + +- name: Main Panel (Patch Building) + keybinds: + - name: Select Previous Hunk + key: Left Arrow Key + - name: Select Next Hunk + key: Right Arrow Key + - name: Toggle Drag Select + key: v + - name: Toggle Select Hunk + key: a + - name: Copy the Selected Text to the Clipboard + key: Ctrl + o + - name: Open File + key: o + - name: Edit File + key: e + - name: Add/Remove Line to/from Patch + key: Space + - name: Exit Custom Patch Builder + key: Esc + +- name: Main Panel (Staging) + keybinds: + - name: Select Previous Hunk + key: Left Arrow Key + - name: Select Next Hunk + key: Right Arrow Key + - name: Toggle Drag Select + key: v + - name: Toggle Select Hunk + key: a + - name: Copy the Selected Text to the Clipboard + key: Ctrl + o + - name: Open File + key: o + - name: Edit File + key: e + - name: Return to the Files Panel + key: Esc + - name: Switch to Other Panel + key: Tab + - name: Toggle Line Staged / Unstaged + key: Space + - name: Discard Change + key: d + - name: Edit Hunk + key: E + - name: Commit Changes + key: c + - name: Commit Changes without Pre-Commit Hook + key: w + - name: Commit Changes using Git Editor + key: C + +- name: Reflog + keybinds: + - name: Copy Commit SHA to the Clipboard + key: Ctrl + o + - name: View Worktree Options + key: w + - name: Checkout Commit + key: Space + - name: Copy Commit Attribute + key: y + - name: Open Commit in Browser + key: o + - name: Create New Branch off of Commit + key: n + - name: View Reset Options + key: g + - name: Copy Commit + key: c + - name: Copy Commit Range + key: C + - name: Reset Copied Commits Selection + key: Ctrl + r + - name: View Commits + key: Enter + +- name: Remote Branches + keybinds: + - name: Copy Branch Name to the Clipboard + key: Ctrl + o + - name: Checkout + key: Space + - name: New Branch + key: n + - name: Merge into Currently Checked Out Branch + key: M + - name: Rebase Checked-Out Branch onto this Branch + key: r + - name: Delete Remote Tag + key: d + - name: Set as Upstream of Checked-Out Branch + key: u + - name: View Reset Options + key: g + - name: View Worktree Options + key: w + - name: View Commits + key: Enter + +- name: Remotes + keybinds: + - name: Fetch Remote + key: f + - name: Add New Remote + key: n + - name: Delete Remove + key: d + - name: Edit Remote + key: e + +- name: Stash + keybinds: + - name: Apply + key: Space + - name: Pop + key: g + - name: Drop + key: d + - name: New Branch + key: n + - name: Rename Stash + key: r + - name: View Worktree Options + key: w + - name: View Selected Items Files + key: Enter + +- name: Status + keybinds: + - name: Open Config File + key: o + - name: Edit Config File + key: e + - name: Switch to a Recent Repo + key: Enter + - name: Show all Branch Logs + key: a + +- name: Sub-commits + keybinds: + - name: Copy Commit SHA to the Clipboard + key: Ctrl + o + - name: View Worktree Options + key: w + - name: Checkout Commit + key: Space + - name: Copy Commit Attribute + key: y + - name: Open Commit in Browser + key: o + - name: Create New Branch off of Commit + key: n + - name: View Reset Options + key: g + - name: Copy Commit + key: c + - name: Copy Commit Range + key: C + - name: Reset Copied Commits Selection + key: Ctrl + r + - name: View Selected Items Files + key: Enter + +- name: Submodules + keybinds: + - name: Copy Submodule to the Clipboard + key: Ctrl + o + - name: Enter Submodule + key: Space / Enter + - name: Remove Submodule + key: d + - name: Update Submodule + key: u + - name: Add New Submodule + key: n + - name: Update Submodule URL + key: e + - name: Initialize Submodule + key: i + - name: View Bulk Submodule Options + key: b + +- name: Tags + keybinds: + - name: Checkout + key: Space + - name: View Delete Options + key: d + - name: Push Tag + key: P + - name: Create Tag + key: n + - name: View Reset Options + key: g + - name: View Worktree Options + key: w + - name: View Commits + key: Enter + +- name: Worktrees + keybinds: + - name: Create Worktree + key: n + - name: Switch to Worktree + key: Space / Enter + - name: Open in Editor + key: e + - name: Remove Worktree + key: d \ No newline at end of file diff --git a/.config/keyb/bindings/nvim.yml b/.config/keyb/bindings/nvim.yml index 134fedc8..9db91a27 100644 --- a/.config/keyb/bindings/nvim.yml +++ b/.config/keyb/bindings/nvim.yml @@ -44,6 +44,10 @@ key: Space + Tab + l - name: (Nor) Close Tab key: Space + Tab + d + - name: (Nor) Pin Buffer + key: Space + b + p + - name: (Nor) Delete Non-Pinned Buffers + key: Space + b + D - name: Debug keybinds: @@ -201,8 +205,6 @@ key: Space + f + t - name: (Nor) New Terminal (cwd) key: Space + f + T - - name: (Nor) Terminals (Telescope) - key: Space + T - name: (Nor) Toggle Terminal key: Ctrl + / | Ctrl + Enter @@ -236,13 +238,176 @@ key: '[q' - name: (Nor) Next Diagnostic key: ']q' - - name: (Nor) Recent Files (cwd) (Telescope) - key: Space + f + R - - name: (Nor) Recent Files (Telescope) - key: Space + f + r - - name: (Nor) Workspaces (Telescope) - key: Space + f + w - - name: (Nor) Xplr (cwd) - key: Space + f + X - - name: (Nor) Xplr - key: Space + f + x (root) + +- name: LSP + keybinds: + - name: (Nor) Toggle Line Diagnostics + key: Space + c + d + - name: (Nor) Toggle Lsp Info + key: Space + c + l + - name: (Nor) Goto Definition (Glance) + key: g + d + - name: (Nor) References (Glance) + key: g + r + - name: (Nor) Goto Declaration + key: g + D + - name: (Nor) Goto Implementation + key: g + I + - name: (Nor) Goto Type Definition + key: g + y + - name: (Nor) Hover + key: K + - name: (Nor) Signature Help + key: g + K + - name: (Ins) Signature Help + key: Ctrl + k + - name: (Nor) Next Diagnostic + key: ']d' + - name: (Nor) Previous Diagnostic + key: '[d' + - name: (Nor) Next Error + key: ']e' + - name: (Nor) Previous Error + key: '[e' + - name: (Nor) Next Warning + key: ']w' + - name: (Nor) Previous Warning + key: '[w' + - name: (Nor) Format Document + key: Space + c + f + - name: (Visual) Format Range + key: Space + c + f + - name: (Nor, Visual) Code Action + key: Space + c + a + - name: (Nor) Source Action + key: Space + c + A + - name: (Nor) Rename + key: Space + c + r + - name: (Nor) Mason + key: Space + c + m + +- name: Navigation / Moving Around (Vim Motions) + keybinds: + - name: (Nor) Move to the Beginning of the Next Word + key: w + - name: (Nor) Move to the Beginning of the Previous Word + key: b + - name: (Nor) Move to the End of the Next Word + key: e + - name: (Nor) Move to the End of the Previous Word + key: ge + - name: (Nor) Move to the Beginning of the Next WORD + key: W + - name: (Nor) Move to the Beginning of the Previous WORD + key: B + - name: (Nor) Move to the End of the Next WORD + key: E + - name: (Nor) Move to the End of the Previous WORD + key: gE + - name: (Nor) Move to a Specific Character (Flash) + key: f + - name: (Nor) Move to a Specific Character (Flash) (Backwards) + key: F + - name: (Nor, Org) Flash + key: s + - name: (Nor, Org) Flash Treesitter + key: S + - name: (Org) Remote Flash + key: r + - name: (Nor) Treesitter Backwards + key: R + - name: (Nor) Search a Pattern Forwards + key: / + - name: (Nor) Search a Pattern Backwards + key: '?' + - name: (Nor) Move to the First Character of the Line + key: 0 + - name: (Nor) Move to the Last Character of the Line + key: $ + - name: (Nor) Move to the First Non-Blank Character of the Line + key: ^ + - name: (Nor) Move to the Last Non-Blank Character of the Line + key: g_ + - name: (Nor) Jump to the Beginning of the Document + key: gg + - name: (Nor) Jump Entire Paragraphs Downwards + key: '{' + - name: (Nor) Jump Entire Paragraphs Upwards + key: '}' + - name: (Nor) Jump to the End of the Document + key: G + - name: (Nor) Move Down Half a Page + key: Ctrl + d + - name: (Nor) Move Up Half a Page + key: Ctrl + u + +- name: Searching + keybinds: + - name: (Nor) Autocomands + key: Space + s + a + - name: (Nor) Treesitter Symbols + key: Space + s + A + - name: (Nor) Buffers + key: Space + s + b + - name: (Nor) Commands + key: Space + s + c + - name: (Nor) Command History + key: Space + s + C + - name: (Nor) Document Diagnostics + key: Space + s + d + - name: (Nor) Workspace Diagnostics + key: Space + s + D + - name: (Nor) Grep (cwd) + key: Space + s + g + - name: (Nor) Grep (root) + key: Space + s + G | Space + / + - name: (Nor) Help Pages + key: Space + s + h + - name: (Nor) Highlight Groups + key: Space + s + H + - name: (Nor) Keymaps + key: Space + s + k + - name: (Nor) Lsp Symbols Outline + key: Space + s + l + - name: (Nor) Jump to Mark + key: Space + s + m + - name: (Nor) Man Pages + key: Space + s + M + - name: (Nor) Options + key: Space + s + o + - name: (Nor) Replace in Files (Spectre) + key: Space + s + r + - name: (Nor) Resume + key: Space + s + R + - name: (Nor) Goto Symbol + key: Space + s + s + - name: (Nor) Goto Symbol (Workspace) + key: Space + s + S + - name: (Nor) Todo + key: Space + s + t + - name: (Nor) Todo/Fix/Fixme + key: Space + s + T + - name: (Nor) Variables + key: Space + s + v + - name: (Nor) Variables (Workspace) + key: Space + s + V + - name: (Nor) Word (cwd) + key: Space + s + W + - name: (Nor) Word (root) + key: Space + s + w + - name: (Nor) Terminals + key: Space + T + - name: (Nor) Yank History + key: Space + p + +- name: Quit & Sessions + keybinds: + - name: (Nor) Quit All + key: Space + q + Q + - name: (Nor) Dont Save Current Session + key: Space + q + d + - name: (Nor) Restore Session + key: Space + q + s + - name: (Nor) Restore Last Session + key: Space + q + l + diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index ac22afd7..2e29741c 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -4,28 +4,29 @@ "SchemaStore.nvim": { "branch": "main", "commit": "c7c6353db3208608786503cbade1e9f8d3531f15" }, "alpha-nvim": { "branch": "main", "commit": "63a860e7ed3ae41ee92481ea65a48fb35431ae21" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, - "bufferline.nvim": { "branch": "main", "commit": "417b303328118b6d836ae330142e88771c48a8a3" }, + "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" }, "catppuccin": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, - "compiler.nvim": { "branch": "main", "commit": "a9d16b1aa866dca315eb7c2da2f29b5e634cb0ba" }, + "compiler.nvim": { "branch": "main", "commit": "41cfc40f09ab63c4ba2533c22aa002bcae576b2d" }, "copilot-cmp": { "branch": "master", "commit": "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1" }, "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" }, "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" }, - "friendly-snippets": { "branch": "main", "commit": "7ff46f90aad07a9be1eb9e2f24e5d7256ecc766b" }, + "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, "gitsigns.nvim": { "branch": "main", "commit": "d8590288417fef2430f85bc8b312fae8b1cf2c40" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" }, + "import-cost.nvim": { "branch": "main", "commit": "d2c93deee35fa4042fde28719ddcbad664544fcf" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, "mason.nvim": { "branch": "main", "commit": "c811fbf09c7642eebb37d6694f1a016a043f6ed3" }, "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" }, @@ -35,7 +36,7 @@ "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5b4c874b13e372500f07c37187ba06c0c1ac0a" }, - "neoconf.nvim": { "branch": "main", "commit": "e7f98b9a12e2a741b84e6761e925fc2196ef460f" }, + "neoconf.nvim": { "branch": "main", "commit": "1075bd7f23d244f14d691c261b14c38209abf02d" }, "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, @@ -57,10 +58,10 @@ "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-numbertoggle": { "branch": "main", "commit": "1dcc1507578f6f216917065da9dac169670dbcd3" }, "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, - "nvim-scrollview": { "branch": "main", "commit": "c943cc60d416fb6bee18f34bd0a2fffa58bb0379" }, + "nvim-scrollview": { "branch": "main", "commit": "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "d0b17cc0b9c8c3055530770a9dd4de659232c692" }, - "nvim-treesitter-context": { "branch": "master", "commit": "64828e2665081de062f426641c7049eb7f446599" }, + "nvim-treesitter": { "branch": "master", "commit": "6def3eea22c213a475fc42644cd48c924b67a03f" }, + "nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, @@ -76,14 +77,14 @@ "telescope-all-recent.nvim": { "branch": "main", "commit": "dee20f810aec14c31287988b3baa8c371900cf06" }, "telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" }, "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, - "telescope.nvim": { "branch": "master", "commit": "207285ccec21b69996a4d3bcfa59df35d48610e8" }, + "telescope.nvim": { "branch": "master", "commit": "83133f66c8c265cfe41ee21828c88222c776cf18" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "1ee11019f8a81dac989ae1db1a013e3d582e2033" }, "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" }, "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "venv-selector.nvim": { "branch": "main", "commit": "cf5d6b391ecd47cfdc77555d13a0ae69ae4fc6e9" }, - "vim-floaterm": { "branch": "master", "commit": "bcaeabf89a92a924031d471395054d84bd88ce2f" }, + "venv-selector.nvim": { "branch": "main", "commit": "81c4557afa2bb8e4bb91a33464a65b26ee1b8a52" }, + "vim-floaterm": { "branch": "master", "commit": "3bf0beb10a5a6f7a878195c93711515f2b7bdc99" }, "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" }, diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 25258b55..d6d5caeb 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -89,13 +89,6 @@ vim.keymap.set("n", "gU", vim.cmd.UndotreeToggle, { noremap = true, sile vim.keymap.set("n", "", "PickColor", { noremap = true, silent = true, desc = "Pick Color" }) vim.keymap.set("i", "", "PickColorInsert", { noremap = true, silent = true, desc = "Pick Color" }) -map("n", "gd", "Glance definitions", { noremap = true, silent = true, desc = "Glance definitions" }) - -map("n", "gr", "Glance references", { noremap = true, silent = true, desc = "Glance references" }) - -map("n", "gy", "Glance type_definitions", { noremap = true, silent = true, desc = "Glance type_definitions" }) -map("n", "gI", "Glance implementations", { noremap = true, silent = true, desc = "Glance implementations" }) - -- Open compiler vim.keymap.set("n", "ccc", "CompilerOpen", { noremap = true, silent = true, desc = "Open Compiler" }) diff --git a/.config/nvim/lua/plugins/import-cost.lua b/.config/nvim/lua/plugins/import-cost.lua new file mode 100644 index 00000000..1787fa5d --- /dev/null +++ b/.config/nvim/lua/plugins/import-cost.lua @@ -0,0 +1,8 @@ +return { + { + "barrett-ruth/import-cost.nvim", + build = "sh install.sh yarn", + event = "BufReadPost", + config = true, + }, +} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 602c90cd..41b86f30 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -3,10 +3,10 @@ return { "neovim/nvim-lspconfig", init = function() local keys = require("lazyvim.plugins.lsp.keymaps").get() - keys[#keys + 1] = { "gd", "Definitions" } - keys[#keys + 1] = { "gr", "References" } - keys[#keys + 1] = { "gy", "T[y]pe_definitions" } - keys[#keys + 1] = { "gI", "Implementations" } + keys[#keys + 1] = { "gd", "Glance definitions", desc = "Goto definition" } + keys[#keys + 1] = { "gr", "Glance references", desc = "References" } + keys[#keys + 1] = { "gy", "Glance type_definitions", desc = "Goto t[y]pe definitions" } + keys[#keys + 1] = { "gI", "Glance implementations", desc = "Goto implementations" } end, }, } diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 72939033..014c106c 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -1,18 +1,20 @@ return { - { - "williamboman/mason.nvim", - opts = { - ensure_installed = { - "black", - "beautysh", - "codespell", - "csharpier", - "ktlint", - "rustywind", - "sqlfmt", - "markdownlint", - "marksman" - }, + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "black", + "beautysh", + "codespell", + "csharpier", + "ktlint", + "rustywind", + "sqlfmt", + "markdownlint", + "marksman", + "stylua", + "shfmt", + }, + }, }, - }, } diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index d35dcc63..4b580ed0 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -174,7 +174,16 @@ return { }, opts = { defaults = { - file_ignore_patterns = { "node_modules", "build", "dist", "yarn.lock", "*.git/*", "*/tmp/*", "Juegos/" }, + file_ignore_patterns = { + ".gitignore", + "node_modules", + "build", + "dist", + "yarn.lock", + "*.git/*", + "*/tmp/*", + "Juegos/", + }, }, pickers = { find_files = {