From 2bbbecc7cc51548bd62c6edbdc433a633f30782d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Fri, 1 Sep 2023 19:36:48 +0200 Subject: [PATCH] Nvim plugin changes and some keybinds docs --- ...nelTabs_new_302085663057248267.config.json | 4 +- .config/fish/variables.fish | 1 + .config/keyb/bindings/fish.yml | 5 +- .config/keyb/bindings/nvim.yml | 21 ++++- .config/keyb/bindings/obsidian.yml | 91 +++++++++++++++++++ .config/nvim/lazy-lock.json | 21 +++-- .config/nvim/lua/config/lazy.lua | 1 + .config/nvim/lua/plugins/symbols-outline.lua | 5 +- .../nvim/lua/plugins/telescope-all-recent.lua | 4 + .config/nvim/lua/plugins/workspaces.lua | 18 ---- 10 files changed, 136 insertions(+), 35 deletions(-) delete mode 100644 .config/nvim/lua/plugins/workspaces.lua diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index fc35e1fa..fd66d99e 100644 --- a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json +++ b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json @@ -4,7 +4,7 @@ { "name": "#general", "url": "/channels/674984102860161025/674985827121758208", - "selected": true, + "selected": false, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", "channelId": "674985827121758208" @@ -28,7 +28,7 @@ { "name": "Friends", "url": "/channels/@me", - "selected": false, + "selected": true, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/embed/avatars/0.png" } diff --git a/.config/fish/variables.fish b/.config/fish/variables.fish index 83290575..6c60a97b 100644 --- a/.config/fish/variables.fish +++ b/.config/fish/variables.fish @@ -13,6 +13,7 @@ set -xg CARGO_HOME $XDG_DATA_HOME/cargo set -xg LEIN_HOME $XDG_DATA_HOME/lein set -xg NUGET_PACKAGES $XDG_CACHE_HOME/NuGetPackages set -xg NPM_CONFIG_USERCONFIG $XDG_CONFIG_HOME/npm/npmrc +set -xg ANDROID_HOME $XDG_DATA_HOME/android set -x fish_user_paths fish_add_path $XDG_BIN_HOME diff --git a/.config/keyb/bindings/fish.yml b/.config/keyb/bindings/fish.yml index 402cd302..ae7be78c 100644 --- a/.config/keyb/bindings/fish.yml +++ b/.config/keyb/bindings/fish.yml @@ -38,4 +38,7 @@ - name: Search Navi Pages key: Ctrl + Alt + I - name: Search Zoxide History - key: Alt + Z \ No newline at end of file + key: Alt + Z + - name: Tab Completion + key: Tab + diff --git a/.config/keyb/bindings/nvim.yml b/.config/keyb/bindings/nvim.yml index 9db91a27..89af04c6 100644 --- a/.config/keyb/bindings/nvim.yml +++ b/.config/keyb/bindings/nvim.yml @@ -48,6 +48,12 @@ key: Space + b + p - name: (Nor) Delete Non-Pinned Buffers key: Space + b + D + - name: (Nor) Maximise Window Vertically + key: Space + w + v + - name: (Nor) Maximise Window Horizontally + key: Space + w + h + - name: (Nor) Equilaze Window + key: Space + w + e - name: Debug keybinds: @@ -198,7 +204,6 @@ - name: (Nor) Xplr key: Space + f + x (root) - - name: Terminal keybinds: - name: (Nor) New Terminal (root) @@ -285,6 +290,8 @@ key: Space + c + r - name: (Nor) Mason key: Space + c + m + - name: (Nor, Visual) Refactor + key: Space + c + R - name: Navigation / Moving Around (Vim Motions) keybinds: @@ -411,3 +418,15 @@ - name: (Nor) Restore Last Session key: Space + q + l +- name: Package Management + keybinds: + - name: (Nor) Install New Package + key: Space + c + p + n + - name: (Nor) Update Package + key: Space + c + p + u + - name: (Nor) Remove Package + key: Space + c + p + r + - name: (Nor) Change Package Version + key: Space + c + p + v + - name: (Nor) Show Packages Versions + key: Space + c + p + s \ No newline at end of file diff --git a/.config/keyb/bindings/obsidian.yml b/.config/keyb/bindings/obsidian.yml index e69de29b..eb09ab2d 100644 --- a/.config/keyb/bindings/obsidian.yml +++ b/.config/keyb/bindings/obsidian.yml @@ -0,0 +1,91 @@ +- name: General + keybinds: + - name: New Note + key: Ctrl + N + - name: New Note in a Different Pane + key: Ctrl + Shift + N + - name: Toggle Edit/Preview Mode + key: Ctrl + Space + - name: Open Command Palette + key: Ctrl + Shift + 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: Tabs and Views + keybinds: + - name: New Tab + key: Ctrl + T + - name: Close Tab + key: Ctrl + W + - name: Go to Tab (1...9) + key: Ctrl + 1-9 + - name: Go to Next Tab + key: Ctrl + Tab / Ctrl + Page Down + - name: Go to Previous Tab + key: Ctrl + Shift + Tab / Ctrl + Page Up + - name: Home Tab + key: Ctrl + Home + - name: Open Link Under Cursor in New Tab + key: Ctrl + Click + - name: Undo Close Tab + key: Ctrl + Shift + T + - name: Split Horizontally + key: Ctrl + - + - name: Split Vertically + key: Ctrl + \ + - name: Toggle Left Sidebar + key: Ctrl + Shift + ´ + - name: Toggle Right Sidebar + key: Ctrl + Shift + ç + +- name: Searching + keybinds: + - name: Search Text in Current Note + key: Ctrl + F + - name: Search Text in All Notes + key: Ctrl + Shift + F + - name: Search Notes + key: Ctrl + P + +- name: Formatting + keybinds: + - name: Toggle Bold + key: Control + B + - name: Toggle Italic + key: Control + I + - name: Toggle Underline + key: Control + U + - name: Undo + key: Control + Z + - name: Redo + key: Control + R + - name: Cut + key: Control + X + - name: Copy + key: Control + C + - name: Paste + key: Control + V \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index faadb278..98fa9871 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { "LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" }, - "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, - "SchemaStore.nvim": { "branch": "main", "commit": "c7c6353db3208608786503cbade1e9f8d3531f15" }, - "alpha-nvim": { "branch": "main", "commit": "63a860e7ed3ae41ee92481ea65a48fb35431ae21" }, + "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, + "SchemaStore.nvim": { "branch": "main", "commit": "a6759df4dcfc052246ee7a6cccfdb37d2180d617" }, + "alpha-nvim": { "branch": "main", "commit": "26d95031e2c624c5317dbdce386eb89f9356d4c0" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" }, "catppuccin": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" }, @@ -11,10 +11,11 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, - "compiler.nvim": { "branch": "main", "commit": "b970e27cfb1cda094182219126ede213ad1b1401" }, + "compiler.nvim": { "branch": "main", "commit": "d41ca6e7a2a22e8b88fadd21937781d67ef8114c" }, "copilot-cmp": { "branch": "master", "commit": "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd" }, "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, + "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, "dressing.nvim": { "branch": "master", "commit": "c7b035de7f91bb6b62b4308f105c56d1a968b8c5" }, "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, @@ -29,6 +30,7 @@ "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, + "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" }, "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, @@ -36,7 +38,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": "1075bd7f23d244f14d691c261b14c38209abf02d" }, + "neoconf.nvim": { "branch": "main", "commit": "92c981fea858ce1f7440b45af9e649be8fe75c5f" }, "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, @@ -60,8 +62,8 @@ "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, "nvim-scrollview": { "branch": "main", "commit": "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "f0f115e926df05d2f1363eb9aa93714056f29827" }, - "nvim-treesitter-context": { "branch": "master", "commit": "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1" }, + "nvim-treesitter": { "branch": "master", "commit": "691d73287a94e8ed82a383df82aabfe77ab4bcaa" }, + "nvim-treesitter-context": { "branch": "master", "commit": "31692b26d76ff1f7c6e0ab51814dd55e7417e96c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, @@ -71,7 +73,8 @@ "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "refactoring.nvim": { "branch": "master", "commit": "2cfd6ddb0acece95d9658560ae9740b98ef70dbb" }, + "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, + "refactoring.nvim": { "branch": "master", "commit": "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, @@ -91,6 +94,6 @@ "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, - "workspaces.nvim": { "branch": "master", "commit": "a6fb4995333f927cc6f707890800fa7f7c476043" }, + "windows.nvim": { "branch": "main", "commit": "c7492552b23d0ab30325e90b56066ec51242adc8" }, "yanky.nvim": { "branch": "main", "commit": "ef70e4e44095a17ab8611cb6630b727ccee0a271" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index dc7ba926..dac11cfb 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -26,6 +26,7 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.coding.copilot" }, { import = "lazyvim.plugins.extras.lang.yaml" }, { import = "lazyvim.plugins.extras.coding.yanky" }, + { import = "lazyvim.plugins.extras.util.project" }, { import = "plugins" }, }, defaults = { diff --git a/.config/nvim/lua/plugins/symbols-outline.lua b/.config/nvim/lua/plugins/symbols-outline.lua index 1dfda59f..1261ee5b 100644 --- a/.config/nvim/lua/plugins/symbols-outline.lua +++ b/.config/nvim/lua/plugins/symbols-outline.lua @@ -5,10 +5,7 @@ return { cmd = "SymbolsOutline", keys = { { "sl", "SymbolsOutline", desc = "Lsp Symbols Outline" } }, config = function() - require("symbols-outline").setup({ - width = 40, - relative_width = false, - }) + require("symbols-outline").setup() end, }, } diff --git a/.config/nvim/lua/plugins/telescope-all-recent.lua b/.config/nvim/lua/plugins/telescope-all-recent.lua index 138b4ad1..cdb38c65 100644 --- a/.config/nvim/lua/plugins/telescope-all-recent.lua +++ b/.config/nvim/lua/plugins/telescope-all-recent.lua @@ -9,6 +9,10 @@ return { disable = false, sorting = "frecency", }, + ["project.nvim#projects"] = { + disable = false, + sorting = "frecency", + }, }, }) end, diff --git a/.config/nvim/lua/plugins/workspaces.lua b/.config/nvim/lua/plugins/workspaces.lua deleted file mode 100644 index 7efc870a..00000000 --- a/.config/nvim/lua/plugins/workspaces.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - { - "natecraddock/workspaces.nvim", - opts = {}, - event = "VeryLazy", - config = function(_, opts) - require("workspaces").setup({ - hooks = { - open = { "Telescope find_files" }, - }, - }) - require("telescope").load_extension("workspaces") - end, - keys = { - { "fw", "Telescope workspaces", desc = "Workspaces" }, - }, - }, -}