From 9b4d32130a704e1253fab21971c626ecc4bb8082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Wed, 23 Aug 2023 18:07:54 +0200 Subject: [PATCH] Reconfiguration of nvim and fish changes --- .config/BetterDiscord/data/stable/themes.json | 3 +- .../plugins/BetterAnimations.config.json | 2 +- ...nelTabs_new_302085663057248267.config.json | 26 ++++-- .../plugins/CollapsibleUI.config.json | 4 +- .../plugins/GameActivityToggle.config.json | 8 +- .config/fish/aliases.fish | 10 ++- .config/fish/config.fish | 10 +-- .config/fish/fish_variables | 11 +++ .config/fish/variables.fish | 11 +++ .config/hypr/keybinds/binds.conf | 13 ++- .config/keyb/bindings/discord.yml | 62 +++++++++++++++ .config/keyb/bindings/hyprland.yml | 78 +++++++++--------- .config/keyb/bindings/spotify.yml | 48 +++++++++++ .config/keyb/bindings/zathura.yml | 39 +++++++++ .config/nvim/lazy-lock.json | 38 ++++----- .config/nvim/lua/config/keymaps.lua | 27 +++++++ .config/nvim/lua/config/lazy.lua | 5 +- .config/nvim/lua/plugins/autotag.lua | 1 + .config/nvim/lua/plugins/catppuccin.lua | 44 +++++++++++ .config/nvim/lua/plugins/color-picker.lua | 1 + .config/nvim/lua/plugins/colorizer.lua | 2 +- .config/nvim/lua/plugins/context.lua | 1 + .config/nvim/lua/plugins/copilot-lua.lua | 38 ++++----- .config/nvim/lua/plugins/dropbar.lua.bak | 8 ++ .../lua/plugins/{edgy.lua => edgy.lua.bak} | 0 .../nvim/lua/plugins/floaterm-telescope.lua | 8 -- .config/nvim/lua/plugins/floaterm.lua | 1 + .config/nvim/lua/plugins/glance.lua | 9 ++- .config/nvim/lua/plugins/glow.lua | 3 - .config/nvim/lua/plugins/live-server.lua | 3 - .config/nvim/lua/plugins/markdown-preview.lua | 11 +++ .config/nvim/lua/plugins/mdpreview.lua | 8 -- .config/nvim/lua/plugins/neo-tree.lua | 75 ++++++++++++++++++ .config/nvim/lua/plugins/neogen.lua | 79 +++++++++++++++++++ .config/nvim/lua/plugins/neoscroll.lua | 8 -- .config/nvim/lua/plugins/regex.lua | 13 +++ .config/nvim/lua/plugins/relativenumbers.lua | 1 + .config/nvim/lua/plugins/scrollbar.lua | 3 +- .config/nvim/lua/plugins/symbols-outline.lua | 14 ++++ .config/nvim/lua/plugins/telescope.lua | 7 +- .config/nvim/lua/plugins/tint.lua.bak | 8 -- .config/nvim/lua/plugins/undotree.lua | 1 + .config/nvim/lua/plugins/which-key.lua | 34 ++++++++ .config/nvim/lua/plugins/workspaces.lua | 4 +- .config/user-dirs.dirs | 2 +- 45 files changed, 629 insertions(+), 153 deletions(-) create mode 100644 .config/fish/variables.fish create mode 100644 .config/nvim/lua/plugins/catppuccin.lua create mode 100644 .config/nvim/lua/plugins/dropbar.lua.bak rename .config/nvim/lua/plugins/{edgy.lua => edgy.lua.bak} (100%) delete mode 100644 .config/nvim/lua/plugins/floaterm-telescope.lua delete mode 100644 .config/nvim/lua/plugins/glow.lua delete mode 100644 .config/nvim/lua/plugins/live-server.lua create mode 100644 .config/nvim/lua/plugins/markdown-preview.lua delete mode 100644 .config/nvim/lua/plugins/mdpreview.lua create mode 100644 .config/nvim/lua/plugins/neo-tree.lua create mode 100644 .config/nvim/lua/plugins/neogen.lua delete mode 100644 .config/nvim/lua/plugins/neoscroll.lua create mode 100644 .config/nvim/lua/plugins/regex.lua create mode 100644 .config/nvim/lua/plugins/symbols-outline.lua delete mode 100644 .config/nvim/lua/plugins/tint.lua.bak create mode 100644 .config/nvim/lua/plugins/which-key.lua diff --git a/.config/BetterDiscord/data/stable/themes.json b/.config/BetterDiscord/data/stable/themes.json index c3307363..be9065e1 100644 --- a/.config/BetterDiscord/data/stable/themes.json +++ b/.config/BetterDiscord/data/stable/themes.json @@ -1,4 +1,5 @@ { "Catppuccin Frappe": false, - "Catppuccin Macchiato": true + "Catppuccin Macchiato": true, + "Comfy": false } \ No newline at end of file diff --git a/.config/BetterDiscord/plugins/BetterAnimations.config.json b/.config/BetterDiscord/plugins/BetterAnimations.config.json index f2254b12..c6bd1931 100644 --- a/.config/BetterDiscord/plugins/BetterAnimations.config.json +++ b/.config/BetterDiscord/plugins/BetterAnimations.config.json @@ -11,7 +11,7 @@ "duration": 400 }, "channel": { - "enabled": true, + "enabled": false, "type": "slipUp", "easing": "easeInOutCubic", "duration": 500 diff --git a/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json b/.config/BetterDiscord/plugins/ChannelTabs_new_302085663057248267.config.json index c034c06f..da6b9457 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", - "selected": true, + "name": "#general", + "url": "/channels/674984102860161025/674985827121758208", + "selected": false, "currentStatus": "none", "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", - "channelId": "888017395195736116" + "channelId": "674985827121758208" }, { "name": "#feedback-and-suggestions", @@ -28,13 +28,27 @@ { "name": "@spider300", "url": "/channels/@me/347377928914337792", - "selected": false, + "selected": true, "currentStatus": "online", "iconUrl": "https://cdn.discordapp.com/avatars/346980245028601857/fa3802f0571349385c58a99e46c4ff07.webp?size=40", "channelId": "347377928914337792" } ], - "favs": [], + "favs": [ + { + "name": "Friends", + "iconUrl": "https://cdn.discordapp.com/embed/avatars/0.png", + "url": "/channels/@me", + "groupId": -1 + }, + { + "name": "#general", + "iconUrl": "https://cdn.discordapp.com/icons/674984102860161025/a4c5c84a118b923dfe68dccd886d1d87.webp?size=40", + "url": "/channels/674984102860161025/674985827121758208", + "channelId": "674985827121758208", + "groupId": -1 + } + ], "favGroups": [], "showTabBar": true, "showFavBar": false, diff --git a/.config/BetterDiscord/plugins/CollapsibleUI.config.json b/.config/BetterDiscord/plugins/CollapsibleUI.config.json index 4e0df2bd..0d991010 100644 --- a/.config/BetterDiscord/plugins/CollapsibleUI.config.json +++ b/.config/BetterDiscord/plugins/CollapsibleUI.config.json @@ -23,7 +23,7 @@ "dynamicUncollapseEnabled": "true,true,true,true,true,true,true,true", "disabledButtonsStayCollapsed": "false", "keyBindsEnabled": "true", - "keyStringList": "Ctrl+L,Ctrl+B,Alt+T,Alt+W,Ctrl+M,Alt+U,Alt+P,Alt+I", + "keyStringList": "Alt+S,Alt+C,Alt+T,Alt+W,Alt+M,Alt+U,Alt+P,Alt+I", "settingsButtonsMaxWidth": "100", "toolbarIconMaxWidth": "300", "membersListMaxWidth": "240", @@ -33,7 +33,7 @@ "msgBarMaxHeight": "400", "windowBarHeight": "18", "collapsedDistance": "0", - "serverListButtonActive": "false", + "serverListButtonActive": "true", "channelListButtonActive": "true", "msgBarButtonActive": "true", "membersListButtonActive": "true", diff --git a/.config/BetterDiscord/plugins/GameActivityToggle.config.json b/.config/BetterDiscord/plugins/GameActivityToggle.config.json index 52771af7..61b9646b 100644 --- a/.config/BetterDiscord/plugins/GameActivityToggle.config.json +++ b/.config/BetterDiscord/plugins/GameActivityToggle.config.json @@ -1,8 +1,8 @@ { "all": { "cachedState": { - "date": "2023-08-20T12:06:15.619Z", - "value": false + "date": "2023-08-21T07:20:07.022Z", + "value": true }, "general": { "showButton": true, @@ -10,6 +10,10 @@ "playEnable": true, "playDisable": true }, + "keybind": [ + 18, + 71 + ], "selections": { "enableSound": "stream_started", "disableSound": "stream_ended" diff --git a/.config/fish/aliases.fish b/.config/fish/aliases.fish index 1a6ade2b..3539db81 100644 --- a/.config/fish/aliases.fish +++ b/.config/fish/aliases.fish @@ -27,6 +27,12 @@ alias vim='nvim' alias vi='nvim' alias fsend='floaterm' alias dsize='dua i' -alias f='neofetch' -alias fzfp='fzf --preview "bat --color=always --style=header,grid --line-range :500 {}"' +alias fetch='neofetch' +alias f='fzf' +alias fp='fzf --preview "bat --color=always --style=header,grid --line-range :500 {}"' alias gpt='tgpt -i' +alias ea='nvim ~/.config/fish/aliases.fish' +alias ef='nvim ~/.config/fish/config.fish' +alias ev='nvim ~/.config/fish/variables.fish' +alias eg='nvim ~/.gitconfig' +alias codeinfo='scc ./' diff --git a/.config/fish/config.fish b/.config/fish/config.fish index bbbb3af4..d79a2867 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,12 +1,4 @@ -set -xg EDITOR nvim -set -xg VISUAL nvim -set -xg XDG_CONFIG_HOME ~/.config -set -xg XDG_CACHE_HOME ~/.cache -set -xg XDG_DATA_HOME ~/.local/share -set -xg XDG_BIN_HOME ~/.local/bin -set -xg XDG_SCRIPT_HOME ~/.local/script -set -xg LANG es_ES.UTF-8 -set -xg LC_ALL es_ES.UTF-8 +#source ~/.config/fish/variables.fish if status is-interactive # Commands to run in interactive sessions can go here diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index f65cc22f..d00c3eca 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,7 +1,18 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export EDITOR:nvim +SETUVAR --export FZF_DEFAULT_COMMAND:fd\x20\x2d\x2dtype\x20f\x20\x2d\x2dfollow\x20\x2d\x2dhidden\x20\x2d\x2dexclude\x20\x2egit SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23363a4f\x2cbg\x3a\x2324273a\x2cspinner\x3a\x23f4dbd6\x2chl\x3a\x23ed8796\x20\x2d\x2dcolor\x3dfg\x3a\x23cad3f5\x2cheader\x3a\x23ed8796\x2cinfo\x3a\x23c6a0f6\x2cpointer\x3a\x23f4dbd6\x20\x2d\x2dcolor\x3dmarker\x3a\x23f4dbd6\x2cfg\x2b\x3a\x23cad3f5\x2cprompt\x3a\x23c6a0f6\x2chl\x2b\x3a\x23ed8796 +SETUVAR --export --path GOPATH:/home/matt/\x2elocal/share/go +SETUVAR --export LANG:es_ES\x2eUTF\x2d8 +SETUVAR --export LC_ALL:es_ES\x2eUTF\x2d8 SETUVAR TO_DIR:/home/matt/\x2etofish +SETUVAR --export VISUAL:nvim +SETUVAR --export XDG_BIN_HOME:/home/matt/\x2elocal/bin +SETUVAR --export XDG_CACHE_HOME:/home/matt/\x2ecache +SETUVAR --export XDG_CONFIG_HOME:/home/matt/\x2econfig +SETUVAR --export XDG_DATA_HOME:/home/matt/\x2elocal/share +SETUVAR --export XDG_SCRIPT_HOME:/home/matt/\x2elocal/script SETUVAR __fish_initialized:3400 SETUVAR _fisher_acomagu_2F_fish_2D_async_2D_prompt_files:\x7e/\x2econfig/fish/conf\x2ed/__async_prompt\x2efish SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish diff --git a/.config/fish/variables.fish b/.config/fish/variables.fish new file mode 100644 index 00000000..8ddbe7ea --- /dev/null +++ b/.config/fish/variables.fish @@ -0,0 +1,11 @@ +set -xg GOPATH ~/.local/share/go +set -xg EDITOR nvim +set -xg VISUAL nvim +set -xg XDG_CONFIG_HOME ~/.config +set -xg XDG_CACHE_HOME ~/.cache +set -xg XDG_DATA_HOME ~/.local/share +set -xg XDG_BIN_HOME ~/.local/bin +set -xg XDG_SCRIPT_HOME ~/.local/script +set -xg LANG es_ES.UTF-8 +set -xg LC_ALL es_ES.UTF-8 +set -xg FZF_DEFAULT_COMMAND 'fd --type f --follow --hidden --exclude .git' diff --git a/.config/hypr/keybinds/binds.conf b/.config/hypr/keybinds/binds.conf index 3ca3cca4..8a13bc4f 100644 --- a/.config/hypr/keybinds/binds.conf +++ b/.config/hypr/keybinds/binds.conf @@ -4,7 +4,7 @@ bindm=SUPER,mouse:273,resizewindow # Basic keybinds bind=SUPER,Q,killactive, -bind=SUPERCTRL, R, exec, pkill waybar || waybar +bind=SUPERCTRL,R,exec, pkill waybar || waybar bind=SUPERCTRL,M,exit, bind=SUPER,A,togglefloating, bind=SUPER,P,pseudo, @@ -39,22 +39,21 @@ bind=SUPERSHIFT,80,exec,kitty ~/Juegos # Numpad 8 bind=SUPERSHIFT,81,exec,kitty ~/.config # Numpad 9 # Launchers -bind=SUPER,space,exec, wofi bind=SUPER, 23, exec, rofi -show drun -theme ~/.config/rofi/style.rasi # Space key # Screenshotting -bind=,Print,exec, hyprshot -m output -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png -bind=SHIFT,Print,exec, hyprshot -m window -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png -bind=CTRL,Print,exec, hyprshot -m region -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png +bind=,Print,exec, hyprshot -m output -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png +bind=SHIFT,Print,exec, hyprshot -m window -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png +bind=CTRL,Print,exec, hyprshot -m region -o ~/Imagenes/Capturas/PC -f captura-$(date +'%Y-%m-%d-%s').png bind=ALT,Print,exec, ~/.config/hypr/scripts/screenshots # Logout menu -bind=SUPER, 148, exec, wleave # Custom keyboard key +bind=SUPER, space, exec, wleave # Color picker bind=SUPER,Print,exec,hyprpicker -a && notify-send -t 4000 "$(wl-paste)" -# Keybindings cheastheet +# Keybindings Cheatsheet bind=SUPER,i,exec, ~/.config/hypr/scripts/keybindings ## Windows diff --git a/.config/keyb/bindings/discord.yml b/.config/keyb/bindings/discord.yml index e69de29b..cbe2fa29 100644 --- a/.config/keyb/bindings/discord.yml +++ b/.config/keyb/bindings/discord.yml @@ -0,0 +1,62 @@ +- name: Server & Channel Navigation + keybinds: + - name: Move Between Servers + key: Ctrl + Alt + Up / Down + - name: Move Between Channels + key: Alt + Up + +- name: Menu Management + keybinds: + - name: Toggle Emoji Picker + key: Ctrl + E + - name: Toggle GIF Picker + key: Ctrl + G + - name: Toggle Pins Popout + key: Ctrl + P + - name: Toggle Members List + key: Alt + M + - name: Toggle Server List + key: Alt + S + - name: Toggle Channel List + key: Alt + C + - name: Toggle User Area + key: Alt + U + - name: Toggle Message Bar + key: Alt + T + - name: Toggle Call Container + key: Alt + P + - name: Toggle Window Bar + key: Alt + W + - name: Toggle User Profile + key: Alt + I + +- name: Text Formatting + keybinds: + - name: Bold Text + key: Ctrl + B + - name: Italic Text + key: Ctrl + I + - name: Underline Text + key: Ctrl + U + +- name: Voice and Messages Management + keybinds: + - name: Toggle Mute + key: Ctrl + Shift + M + - name: Toggle Deafen + key: Ctrl + Shift + D + - name: Answer Incoming Call + key: Ctrl + Enter + - name: Decline Incoming Call + key: Esc + - name: Mark Channel as Read + key: Esc + - name: Mark Server as Read + key: Shift + Esc + - name: Search for a Message in a Server + key: Ctrl + F + - name: Search for Servers, Channels or DMs + key: Ctrl + K + - name: Upload a File + key: Ctrl + Shift + U + diff --git a/.config/keyb/bindings/hyprland.yml b/.config/keyb/bindings/hyprland.yml index 15923f55..dfe741bc 100644 --- a/.config/keyb/bindings/hyprland.yml +++ b/.config/keyb/bindings/hyprland.yml @@ -1,75 +1,77 @@ -- name: Hyprland Media +- name: Media keybinds: - name: Restart Waybar - key: CTRL + WIN + R + key: Ctrl + Win + R - name: Logout Hyprland - key: CTRL + WIN + M + key: Ctrl + Win + M - name: Play-Pause Music - key: CTRL + WIN + Middle Mouse Button + key: Ctrl + Win + Middle Mouse Button - name: Play Previous Song - key: CTRL + WIN + Mouse Wheel Down + key: Ctrl + Win + Mouse Wheel Down - name: Play Next Song - key: CTRL + WIN + Mouse Wheel Up - - name: Screenshoot Tool + key: Ctrl + Win + Mouse Wheel Up + - name: Screenshoot Tool (Output) key: ImprPant + - name: Screenshoot Tool (Selection) + key: Ctrl + ImprPant + - name: Screenshoot Tool (Window) + key: Shift + ImprPant + - name: Screenshoot Picker + key: Alt + ImprPant - name: Color Picker - key: WIN + ImprPant + key: Win + ImprPant - name: Logout Menu - key: WIN + Calc + key: Win + Space - name: Keybindings Cheatsheet - key: WIN + / + key: Win + I -- name: Hyprland Window Management +- name: Window Management keybinds: - name: Move Window - key: WIN + Mouse Left Button + key: Win + Mouse Left Button - name: Resize Window - key: WIN + Mouse Right Button + key: Win + Mouse Right Button - name: Kill Active Window - key: WIN + Q + key: Win + Q - name: Focusing on Windows - key: WIN + Arrow Keys / Vim Navigation Keys + key: Win + Arrow Keys / Vim Navigation Keys - name: Moving Windows - key: SHIFT + WIN + Arrow Keys / Vim Navigation Keys + key: Shift + Win + Arrow Keys / Vim Navigation Keys - name: Toggle Floating Window - key: WIN + A + key: Win + A - name: Toggle Pseudo Mode - key: WIN + P + key: Win + P - name: Toggle Fullscreen Window - key: WIN + F + key: Win + F - name: Toggle Group - key: WIN + S + key: Win + S - name: Change Active Group - key: ALT + TAB + key: Alt + TAB - name: Toggle Group Split - key: WIN + W + key: Win + W -- name: Hyprland Workspace Management +- name: Workspace Management keybinds: - name: Moving to a specific Workspace - key: WIN + 1-2-3... + key: Win + 1-2-3... - name: Moving Windows to other specific Worskpace - key: SHIFT + WIN + 1-2-3... + key: Shift + Win + 1-2-3... - name: Moving Windows to other specific Workspace (Silent) - key: WIN + ALT + 1-2-3... + key: Win + Alt + 1-2-3... - name: Moving to the next Workspace (Mouse) - key: WIN + Mouse Wheel Down / Up + key: Win + Mouse Wheel Down / Up - name: Moving to the next Worskpace (Keyboard) - key: CTRL + WIN + Left Key / Rigth Key + key: Ctrl + Win + Left Key / Right Key -- name: Hyprland Apps +- name: Apps keybinds: - name: Launch Browser - key: WIN + . + key: Win + . - name: Launch Editor / IDE - key: WIN + Return - - name: Launch Alternative Editor / IDE - key: SHIFT + WIN + Return + key: Win + Return - name: Launch File Manager - key: WIN + NP0 + key: Win + NP0 - name: Launch Terminal - key: WIN + Enter + key: Win + Enter - name: Open Launcher - key: WIN + TAB - - name: Open Alternative Launcher - key: WIN + SPACE + key: Win + TAB diff --git a/.config/keyb/bindings/spotify.yml b/.config/keyb/bindings/spotify.yml index e69de29b..c8b2554c 100644 --- a/.config/keyb/bindings/spotify.yml +++ b/.config/keyb/bindings/spotify.yml @@ -0,0 +1,48 @@ +- name: Basic + keybinds: + - name: New Playlist + key: Ctrl + N + - name: New Folder + key: Ctrl + Shift + N + - name: Select All + key: Ctrl + A + - name: Filter + key: Ctrl + F + - name: Search on Library + key: Ctrl + Alt + F + +- name: Reproduction + keybinds: + - name: Play-Pause + key: Space + - name: Like Song + key: Alt + Shift + B + - name: Random Song + key: Ctrl + S + - name: Repeat Song + key: Ctrl + R + - name: Previous Song + key: Ctrl + Left Arrow + - name: Next Song + key: Ctrl + Right Arrow + +- name: Navigation + keybinds: + - name: Home + key: Alt + Shift + H + - name: Search + key: Ctrl + L + - name: Fast Search + key: Ctrl + K + - name: Liked Songs + key: Alt + Shift + S + - name: Queue + key: Alt + Shift + Q + - name: My Lists + key: Alt + Shift + 1 + - name: My Podcasts + key: Alt + Shift + 2 + - name: My Artists + key: Alt + Shift + 3 + - name: My Albums + key: Alt + Shift + 4 \ No newline at end of file diff --git a/.config/keyb/bindings/zathura.yml b/.config/keyb/bindings/zathura.yml index e69de29b..878afdb7 100644 --- a/.config/keyb/bindings/zathura.yml +++ b/.config/keyb/bindings/zathura.yml @@ -0,0 +1,39 @@ +- name: Movement/View + keybinds: + - name: Next Page + key: Shift + J / Down Arrow + - name: Previous Page + key: Shift + K / Up Arrow + - name: Snap Current Page + key: P + - name: Top Current Page + key: H + - name: Bottom Current Page + key: L + - name: Rotate Page by 90º + key: r + - name: Toggle Status Bar + key: a + - name: Toggle Fullscreen + key: f + - name: Toggle Presentation Mode + key: F5 + - name: Toggle Dual Pane + key: d + - name: Show Index + key: Tab + - name: Zoom Out + key: '-' + - name: Zoom In + key: '+' + +- name: Points + keybinds: + - name: Search for Text + key: '?' + - name: Search for the Next Result + key: n + - name: Search for the Previous Result + key: N + - name: Open Document + key: o \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index ea31abab..9201fca0 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,64 +1,65 @@ { "LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" }, "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, - "SchemaStore.nvim": { "branch": "main", "commit": "e71b32faec68f04a0f0a27fe8c15c96503039b1f" }, + "SchemaStore.nvim": { "branch": "main", "commit": "b56b6ac795d988fa3522b279674990120e76b231" }, "alpha-nvim": { "branch": "main", "commit": "7a6b9487dba044a43fde534bf5036f0fda5b6b23" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bufferline.nvim": { "branch": "main", "commit": "417b303328118b6d836ae330142e88771c48a8a3" }, - "catppuccin": { "branch": "main", "commit": "3fdd3942567503d23b65ccc21e7d7757334defd5" }, + "catppuccin": { "branch": "main", "commit": "b573866ef64122119668f375ebb794bcb3b518e2" }, "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" }, "copilot-cmp": { "branch": "master", "commit": "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1" }, - "copilot.lua": { "branch": "master", "commit": "b5e7675ed7138414f98768c1e6758b3c1929188b" }, + "copilot.lua": { "branch": "master", "commit": "4f6329cd3c94ad367088cdab3310739eded5acea" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "dressing.nvim": { "branch": "master", "commit": "ee571505f3566f84fd252e76c4ce6df6eaf2fb94" }, - "edgy.nvim": { "branch": "main", "commit": "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4" }, "flash.nvim": { "branch": "main", "commit": "967117690bd677cb7b6a87f0bc0077d2c0be3a27" }, "friendly-snippets": { "branch": "main", "commit": "377d45475b49e37460a902d6d569d2093d4037d0" }, "gitsigns.nvim": { "branch": "main", "commit": "749267aaa863c30d721c9913699c5d94e0c07dd3" }, "glance.nvim": { "branch": "master", "commit": "ec19dbdabd47fc2f094f7457a84ae78e7c9b5610" }, - "glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, - "live-server.nvim": { "branch": "main", "commit": "8cae0641cabe8c555311f09dbb0ae36a513a9d5c" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "2997f467881ac4faa6f8c5e7065e3a672297c8ad" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, "mason.nvim": { "branch": "main", "commit": "a51c2d063c5377ee9e58c5f9cda7c7436787be72" }, - "mdpreview.nvim": { "branch": "master", "commit": "22ca06ae45cb06518600b36418674be456cfb2df" }, "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" }, "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" }, "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "cac2e1bfa1ecd5bd0ce7ae29e12efb3ba5a7347d" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e62babc62c7f8de579ad69d0a5d2613bff864126" }, "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" }, - "neodev.nvim": { "branch": "main", "commit": "eb8d781cb261285eb556a15342158c2e5a4c801c" }, - "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, + "neodev.nvim": { "branch": "main", "commit": "f8a4200951189f7c831cfb698a2e05791e9fd83c" }, + "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, + "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, + "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" }, + "neotest-python": { "branch": "master", "commit": "054f22129405e747adfc2cbeddfcc59537df50ba" }, + "neotest-rust": { "branch": "main", "commit": "95161da0fbe0570395a938927b654931a82caecb" }, "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, - "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, - "nvim-dap-go": { "branch": "main", "commit": "9c0eb2b3c8ca63b54009a42a915be657fe7a8734" }, + "nvim-dap": { "branch": "master", "commit": "897c433ff2fbcf6f71a57bf18460d810e173d1e0" }, + "nvim-dap-go": { "branch": "main", "commit": "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-jdtls": { "branch": "master", "commit": "095dc490f362adc85be66dc14bd9665ddd94413b" }, - "nvim-lspconfig": { "branch": "master", "commit": "67f151e84daddc86cc65f5d935e592f76b9f4496" }, + "nvim-lspconfig": { "branch": "master", "commit": "1cfb96490c3889a2c57d1ef5e1acc59e9b47c455" }, "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-numbertoggle": { "branch": "main", "commit": "1dcc1507578f6f216917065da9dac169670dbcd3" }, + "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, "nvim-scrollview": { "branch": "main", "commit": "f826e74d6c20f535a7fa6a94308eacb99c07aba8" }, "nvim-spectre": { "branch": "master", "commit": "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7" }, - "nvim-terminal.lua": { "branch": "master", "commit": "095f98aaa7265628a72cd2706350c091544b5602" }, - "nvim-treesitter": { "branch": "master", "commit": "43b2153d26da8308e3d58ac0db911111c7c35395" }, - "nvim-treesitter-context": { "branch": "master", "commit": "14856c9ee6eb0ede0ae9b43782c9be5e7bd946e6" }, + "nvim-treesitter": { "branch": "master", "commit": "05fe2c38a3bd4f889ac13f1735685ab348d95346" }, + "nvim-treesitter-context": { "branch": "master", "commit": "ce583c89c8db8d34cd5dff0dc91e13b446fdbe50" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "56272167a6dead91c47c02dbdbfe1ae5643c59f5" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, @@ -68,6 +69,7 @@ "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "65565c62963579897d28390dbd1ba8fb15ba545f" }, "telescope-all-recent.nvim": { "branch": "main", "commit": "dee20f810aec14c31287988b3baa8c371900cf06" }, "telescope-floaterm.nvim": { "branch": "main", "commit": "ccd3f40ae30dce5de0e5d0f5069e08e7d9ad6d23" }, @@ -84,5 +86,5 @@ "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-wakatime": { "branch": "master", "commit": "0d2efa2daff34b27b0d227d4c3b136811c93db93" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, - "workspaces.nvim": { "branch": "master", "commit": "c8bd98990d322b107e58ff5373038b753a8ef66d" } + "workspaces.nvim": { "branch": "master", "commit": "84ef675e998cf99c8ebe2b9e0a65fbaeea230e98" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index e5a99e27..67b490ef 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -100,3 +100,30 @@ vim.api.nvim_set_keymap( vim.keymap.set("n", "", "PickColor", { noremap = true, silent = true, desc = "Pick Color" }) vim.keymap.set("i", "", "PickColorInsert", { noremap = true, silent = true, desc = "Pick Color" }) + +vim.keymap.set( + "n", + "spd", + "Glance definitions", + { noremap = true, silent = true, desc = "Glance definitions" } +) + +vim.keymap.set( + "n", + "spr", + "Glance references", + { noremap = true, silent = true, desc = "Glance references" } +) + +vim.keymap.set( + "n", + "spt", + "Glance type_definitions", + { noremap = true, silent = true, desc = "Glance type_definitions" } +) +vim.keymap.set( + "n", + "spi", + "Glance implementations", + { noremap = true, silent = true, desc = "Glance implementations" } +) diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index bf755257..921e7850 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -15,8 +15,7 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.lang.typescript" }, { import = "lazyvim.plugins.extras.lang.json" }, { import = "lazyvim.plugins.extras.dap.core" }, - { import = "lazyvim.plugins.extras.formatting.prettier" }, - --{ import = "lazyvim.plugins.extras.util.project" }, + { import = "lazyvim.plugins.extras.test.core" }, { import = "lazyvim.plugins.extras.lang.python" }, { import = "lazyvim.plugins.extras.lang.docker" }, { import = "lazyvim.plugins.extras.lang.go" }, @@ -24,8 +23,8 @@ require("lazy").setup({ { import = "lazyvim.plugins.extras.lang.rust" }, { import = "lazyvim.plugins.extras.lang.tailwind" }, { import = "lazyvim.plugins.extras.linting.eslint" }, + { import = "lazyvim.plugins.extras.formatting.prettier" }, { import = "lazyvim.plugins.extras.coding.copilot" }, - { import = "lazyvim.plugins.extras.ui.edgy" }, { import = "plugins" }, }, defaults = { diff --git a/.config/nvim/lua/plugins/autotag.lua b/.config/nvim/lua/plugins/autotag.lua index dc207268..0d9efa2a 100644 --- a/.config/nvim/lua/plugins/autotag.lua +++ b/.config/nvim/lua/plugins/autotag.lua @@ -1,6 +1,7 @@ return { { "windwp/nvim-ts-autotag", + event = "InsertEnter", config = function() require("nvim-ts-autotag").setup() end, diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua new file mode 100644 index 00000000..a20f3d6c --- /dev/null +++ b/.config/nvim/lua/plugins/catppuccin.lua @@ -0,0 +1,44 @@ +return { + { + "catppuccin/nvim", + lazy = true, + name = "catppuccin", + opts = { + integrations = { + alpha = true, + cmp = true, + dap = { + enabled = true, + enable_ui = true, -- enable nvim-dap-ui + }, + flash = true, + gitsigns = true, + illuminate = true, + indent_blankline = { enabled = true }, + lsp_trouble = true, + mason = true, + markdown = true, + mini = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + navic = { enabled = true, custom_bg = "lualine" }, + neotest = true, + neotree = true, + noice = true, + notify = true, + semantic_tokens = true, + telescope = true, + treesitter = true, + treesitter_context = false, + which_key = true, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/color-picker.lua b/.config/nvim/lua/plugins/color-picker.lua index 0bd25392..d64bc9ed 100644 --- a/.config/nvim/lua/plugins/color-picker.lua +++ b/.config/nvim/lua/plugins/color-picker.lua @@ -1,6 +1,7 @@ return { { "ziontee113/color-picker.nvim", + cmd = { "PickColor", "PickColorInsert" }, config = function() require("color-picker").setup({ ["icons"] = { "ﱢ", "" }, diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua index 9d9cd884..d2011102 100644 --- a/.config/nvim/lua/plugins/colorizer.lua +++ b/.config/nvim/lua/plugins/colorizer.lua @@ -1,7 +1,7 @@ return { { "NvChad/nvim-colorizer.lua", - lazy = false, + event = "BufReadPost", config = function() require("colorizer").setup() end, diff --git a/.config/nvim/lua/plugins/context.lua b/.config/nvim/lua/plugins/context.lua index 3f714122..9713524d 100644 --- a/.config/nvim/lua/plugins/context.lua +++ b/.config/nvim/lua/plugins/context.lua @@ -1,6 +1,7 @@ return { { "nvim-treesitter/nvim-treesitter-context", + event = "BufReadPost", config = function() require("treesitter-context").setup() end, diff --git a/.config/nvim/lua/plugins/copilot-lua.lua b/.config/nvim/lua/plugins/copilot-lua.lua index 2d749eea..3eda90aa 100644 --- a/.config/nvim/lua/plugins/copilot-lua.lua +++ b/.config/nvim/lua/plugins/copilot-lua.lua @@ -1,22 +1,22 @@ return { - "zbirenbaum/copilot.lua", - opts = { - suggestion = { - enabled = true, - auto_trigger = true, - keymap = { - accept = "", - accept_line = "", - accept_word = "", - next = "", - prev = "", - dismiss = "", - }, + "zbirenbaum/copilot.lua", + opts = { + suggestion = { + enabled = true, + auto_trigger = true, + keymap = { + accept = "", + accept_line = "", + accept_word = "", + next = "", + prev = "", + dismiss = "", + }, + }, + panel = { enabled = false }, + filetypes = { + markdown = true, + help = true, + }, }, - panel = { enabled = false }, - filetypes = { - markdown = true, - help = true, - }, - }, } diff --git a/.config/nvim/lua/plugins/dropbar.lua.bak b/.config/nvim/lua/plugins/dropbar.lua.bak new file mode 100644 index 00000000..a73c7210 --- /dev/null +++ b/.config/nvim/lua/plugins/dropbar.lua.bak @@ -0,0 +1,8 @@ +return { + { + "Bekaboo/dropbar.nvim", + config = function() + require("dropbar").config() + end, + }, +} diff --git a/.config/nvim/lua/plugins/edgy.lua b/.config/nvim/lua/plugins/edgy.lua.bak similarity index 100% rename from .config/nvim/lua/plugins/edgy.lua rename to .config/nvim/lua/plugins/edgy.lua.bak diff --git a/.config/nvim/lua/plugins/floaterm-telescope.lua b/.config/nvim/lua/plugins/floaterm-telescope.lua deleted file mode 100644 index 94061b59..00000000 --- a/.config/nvim/lua/plugins/floaterm-telescope.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "dawsers/telescope-floaterm.nvim", - config = function(_, opts) - require("telescope").load_extension("floaterm") - end, - } -} diff --git a/.config/nvim/lua/plugins/floaterm.lua b/.config/nvim/lua/plugins/floaterm.lua index 11ccfd73..f099d5fe 100644 --- a/.config/nvim/lua/plugins/floaterm.lua +++ b/.config/nvim/lua/plugins/floaterm.lua @@ -2,6 +2,7 @@ return { { "voldikss/vim-floaterm", "dawsers/telescope-floaterm.nvim", + cmd = { "FloatermNew", "FloatermToggle", "FloatermNext", "FloatermPrev" }, config = function(_, opts) require("telescope").load_extension("floaterm") end, diff --git a/.config/nvim/lua/plugins/glance.lua b/.config/nvim/lua/plugins/glance.lua index 0c927f52..4b207036 100644 --- a/.config/nvim/lua/plugins/glance.lua +++ b/.config/nvim/lua/plugins/glance.lua @@ -1,6 +1,13 @@ return { { "dnlhc/glance.nvim", - lazy = true, + cmd = { "Glance" }, + config = function() + require("glance").setup({ + border = { + enable = true, + }, + }) + end, }, } diff --git a/.config/nvim/lua/plugins/glow.lua b/.config/nvim/lua/plugins/glow.lua deleted file mode 100644 index 9f5c230b..00000000 --- a/.config/nvim/lua/plugins/glow.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "ellisonleao/glow.nvim", config = true, lazy = true, cmd = "Glow" }, -} diff --git a/.config/nvim/lua/plugins/live-server.lua b/.config/nvim/lua/plugins/live-server.lua deleted file mode 100644 index 3d2df7e7..00000000 --- a/.config/nvim/lua/plugins/live-server.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "barrett-ruth/live-server.nvim", lazy = true, build = "yarn global add live-server", config = true }, -} diff --git a/.config/nvim/lua/plugins/markdown-preview.lua b/.config/nvim/lua/plugins/markdown-preview.lua new file mode 100644 index 00000000..f7e1bbaf --- /dev/null +++ b/.config/nvim/lua/plugins/markdown-preview.lua @@ -0,0 +1,11 @@ +return { + { + "iamcco/markdown-preview.nvim", + cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" }, + build = "cd app && yarn install", + init = function() + vim.g.mkdp_filetypes = { "markdown" } + end, + ft = { "markdown" }, + }, +} diff --git a/.config/nvim/lua/plugins/mdpreview.lua b/.config/nvim/lua/plugins/mdpreview.lua deleted file mode 100644 index 0c177a94..00000000 --- a/.config/nvim/lua/plugins/mdpreview.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "mrjones2014/mdpreview.nvim", - ft = "markdown", -- you can lazy load on markdown files only - -- requires the `terminal` filetype to render ASCII color and format codes - dependencies = { "norcalli/nvim-terminal.lua", config = true }, - }, -} diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua new file mode 100644 index 00000000..bce8b7b2 --- /dev/null +++ b/.config/nvim/lua/plugins/neo-tree.lua @@ -0,0 +1,75 @@ +return { + { + "nvim-neo-tree/neo-tree.nvim", + branch = "v3.x", + cmd = "Neotree", + keys = { + { + "fe", + function() + require("neo-tree.command").execute({ toggle = true, dir = require("lazyvim.util").get_root() }) + end, + desc = "Explorer NeoTree (root dir)", + }, + { + "fE", + function() + require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd() }) + end, + desc = "Explorer NeoTree (cwd)", + }, + { "e", "fe", desc = "Explorer NeoTree (root dir)", remap = true }, + { "E", "fE", desc = "Explorer NeoTree (cwd)", remap = true }, + }, + deactivate = function() + vim.cmd([[Neotree close]]) + end, + init = function() + if vim.fn.argc() == 1 then + local stat = vim.loop.fs_stat(vim.fn.argv(0)) + if stat and stat.type == "directory" then + require("neo-tree") + end + end + end, + opts = { + sources = { "filesystem", "git_status", "buffers", "document_symbols" }, + source_selector = { + winbar = true, + statusline = true, + }, + open_files_do_not_replace_types = { "terminal", "Trouble", "qf", "Outline" }, + enable_git_status = true, + enable_diagnostics = true, + filesystem = { + bind_to_cwd = false, + follow_current_file = { enabled = true }, + use_libuv_file_watcher = true, + }, + window = { + mappings = { + [""] = "none", + }, + }, + default_component_configs = { + indent = { + with_expanders = true, -- if nil and file nesting is enabled, will enable expanders + expander_collapsed = "", + expander_expanded = "", + expander_highlight = "NeoTreeExpander", + }, + }, + }, + config = function(_, opts) + require("neo-tree").setup(opts) + vim.api.nvim_create_autocmd("TermClose", { + pattern = "*lazygit", + callback = function() + if package.loaded["neo-tree.sources.git_status"] then + require("neo-tree.sources.git_status").refresh() + end + end, + }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/neogen.lua b/.config/nvim/lua/plugins/neogen.lua new file mode 100644 index 00000000..dc5f69d2 --- /dev/null +++ b/.config/nvim/lua/plugins/neogen.lua @@ -0,0 +1,79 @@ +return { + { + "danymat/neogen", + dependencies = "nvim-treesitter/nvim-treesitter", + opts = { + snippet_engine = "luasnip", + enabled = true, + languages = { + lua = { + template = { + annotation_convention = "ldoc", + }, + }, + python = { + template = { + annotation_convention = "google_docstrings", + }, + }, + rust = { + template = { + annotation_convention = "rustdoc", + }, + }, + javascript = { + template = { + annotation_convention = "jsdoc", + }, + }, + typescript = { + template = { + annotation_convention = "tsdoc", + }, + }, + typescriptreact = { + template = { + annotation_convention = "tsdoc", + }, + }, + }, + }, + keys = { + { + "ad", + function() + require("neogen").generate() + end, + desc = "Default Annotation", + }, + { + "ac", + function() + require("neogen").generate({ type = "class" }) + end, + desc = "Class", + }, + { + "af", + function() + require("neogen").generate({ type = "func" }) + end, + desc = "Function", + }, + { + "at", + function() + require("neogen").generate({ type = "type" }) + end, + desc = "Type", + }, + { + "aF", + function() + require("neogen").generate({ type = "file" }) + end, + desc = "File", + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/neoscroll.lua b/.config/nvim/lua/plugins/neoscroll.lua deleted file mode 100644 index 83bb6fa6..00000000 --- a/.config/nvim/lua/plugins/neoscroll.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "karb94/neoscroll.nvim", - config = function() - require("neoscroll").setup() - end, - }, -} diff --git a/.config/nvim/lua/plugins/regex.lua b/.config/nvim/lua/plugins/regex.lua new file mode 100644 index 00000000..de1fc61d --- /dev/null +++ b/.config/nvim/lua/plugins/regex.lua @@ -0,0 +1,13 @@ +return { + { + "bennypowers/nvim-regexplainer", + config = function() + require("regexplainer").setup() + end, + event = "BufReadPost", + requires = { + "nvim-treesitter/nvim-treesitter", + "MunifTanjim/nui.nvim", + }, + }, +} diff --git a/.config/nvim/lua/plugins/relativenumbers.lua b/.config/nvim/lua/plugins/relativenumbers.lua index a374c7c8..55ec6a1d 100644 --- a/.config/nvim/lua/plugins/relativenumbers.lua +++ b/.config/nvim/lua/plugins/relativenumbers.lua @@ -1,5 +1,6 @@ return { { "sitiom/nvim-numbertoggle", + event = "BufReadPost", }, } diff --git a/.config/nvim/lua/plugins/scrollbar.lua b/.config/nvim/lua/plugins/scrollbar.lua index a1997af0..6cdb88f0 100644 --- a/.config/nvim/lua/plugins/scrollbar.lua +++ b/.config/nvim/lua/plugins/scrollbar.lua @@ -1,9 +1,10 @@ return { { "dstein64/nvim-scrollview", + event = "BufReadPost", config = function() require("scrollview").setup({ - excluded_filetypes = { "neo-tree", "neotree" }, + excluded_filetypes = { "neo-tree", "alpha", "symbols-outline" }, signs_column = 0, winblend = 25, diagnostics_error_symbol = "", diff --git a/.config/nvim/lua/plugins/symbols-outline.lua b/.config/nvim/lua/plugins/symbols-outline.lua new file mode 100644 index 00000000..1dfda59f --- /dev/null +++ b/.config/nvim/lua/plugins/symbols-outline.lua @@ -0,0 +1,14 @@ +return { + { + "simrat39/symbols-outline.nvim", + event = "BufReadPost", + cmd = "SymbolsOutline", + keys = { { "sl", "SymbolsOutline", desc = "Lsp Symbols Outline" } }, + config = function() + require("symbols-outline").setup({ + width = 40, + relative_width = false, + }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index b554c0dd..133fd168 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -175,7 +175,12 @@ return { }, opts = { defaults = { - file_ignore_patterns = { "*.git/*", "*/tmp/*" }, + file_ignore_patterns = { "node_modules", "build", "dist", "yarn.lock", "*.git/*", "*/tmp/*", "Juegos/" }, + }, + pickers = { + find_files = { + hidden = true, + }, }, extensions = { undo = { diff --git a/.config/nvim/lua/plugins/tint.lua.bak b/.config/nvim/lua/plugins/tint.lua.bak deleted file mode 100644 index 9789b943..00000000 --- a/.config/nvim/lua/plugins/tint.lua.bak +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "levouh/tint.nvim", - config = function() - require("tint").setup() - end, - }, -} diff --git a/.config/nvim/lua/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua index d06010dd..89c89951 100644 --- a/.config/nvim/lua/plugins/undotree.lua +++ b/.config/nvim/lua/plugins/undotree.lua @@ -1,5 +1,6 @@ return { { "mbbill/undotree", + cmd = "UndotreeToggle", }, } diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua new file mode 100644 index 00000000..97fc1460 --- /dev/null +++ b/.config/nvim/lua/plugins/which-key.lua @@ -0,0 +1,34 @@ +return { + { + "folke/which-key.nvim", + event = "VeryLazy", + opts = { + plugins = { spelling = true }, + defaults = { + mode = { "n", "v" }, + ["g"] = { name = "+goto" }, + ["gz"] = { name = "+surround" }, + ["]"] = { name = "+next" }, + ["["] = { name = "+prev" }, + [""] = { name = "+tabs" }, + ["a"] = { name = "+annotation" }, + ["b"] = { name = "+buffer" }, + ["c"] = { name = "+code" }, + ["f"] = { name = "+file/find" }, + ["g"] = { name = "+git" }, + ["gh"] = { name = "+hunks" }, + ["q"] = { name = "+quit/session" }, + ["s"] = { name = "+search" }, + ["u"] = { name = "+ui" }, + ["w"] = { name = "+windows" }, + ["x"] = { name = "+diagnostics/quickfix" }, + ["sp"] = { name = "+peek" }, + }, + }, + config = function(_, opts) + local wk = require("which-key") + wk.setup(opts) + wk.register(opts.defaults) + end, + }, +} diff --git a/.config/nvim/lua/plugins/workspaces.lua b/.config/nvim/lua/plugins/workspaces.lua index 2fae8fc9..7efc870a 100644 --- a/.config/nvim/lua/plugins/workspaces.lua +++ b/.config/nvim/lua/plugins/workspaces.lua @@ -7,12 +7,12 @@ return { require("workspaces").setup({ hooks = { open = { "Telescope find_files" }, - } + }, }) require("telescope").load_extension("workspaces") end, keys = { { "fw", "Telescope workspaces", desc = "Workspaces" }, }, - } + }, } diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index 4429ae87..ff5eb93f 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -6,7 +6,7 @@ # absolute path. No other format is supported. # XDG_DESKTOP_DIR="$HOME/" -XDG_DOCUMENTS_DIR="$HOME/Documents" +XDG_DOCUMENTS_DIR="$HOME/Documentos" XDG_DOWNLOAD_DIR="$HOME/Descargas" XDG_MUSIC_DIR="$HOME/Musica" XDG_PICTURES_DIR="$HOME/Imagenes"