From 1e908994e372c00b5adc524d76e83da80a16d5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 5 Sep 2023 11:30:49 +0200 Subject: [PATCH] New LSPs, null-ls modules and plugins for neovim setup. Using eza as new ls replacer instead of exa. Change in the hypr config to be more modular in terms of workspaces and monitors, as well as installing pyprland to use scratchpads --- .config/fish/conf.d/fzf.fish | 2 +- .../_fzf_configure_bindings_help.fish | 2 +- .../fish/functions/_fzf_search_variables.fish | 2 +- .config/fish/functions/gfetch.fish | 4 +++ .config/fish/functions/l.fish | 6 ++-- .config/fish/functions/ld.fish | 6 ++-- .config/fish/functions/ldh.fish | 6 ++-- .config/fish/functions/lh.fish | 6 ++-- .config/fish/functions/ls.fish | 6 ++-- .config/fish/functions/lsh.fish | 6 ++-- .config/fish/functions/lt.fish | 6 ++-- .config/fish/functions/lth.fish | 6 ++-- .config/fish/variables.fish | 3 +- .config/hypr/configs/monitors.conf | 6 ++++ .config/hypr/configs/workspaces.conf | 32 +++++++++++++++++ .config/hypr/hyprland.conf | 10 ++++-- .config/hypr/keybinds/binds.conf | 4 +++ .config/hypr/pyprland.json | 13 +++++++ .config/hypr/scripts/autostart | 3 ++ .../hypr/{configs => themes/luna}/luna.conf | 18 +++++----- .config/hypr/themes/luna/rules.conf | 4 ++- .config/hypr/themes/luna/theme.conf | 35 ++----------------- .config/keyb/bindings/nvim.yml | 2 ++ .config/kitty/kitty.conf | 2 +- .config/nvim/lazy-lock.json | 34 +++++++++--------- .config/nvim/lua/plugins/diffview.lua | 14 ++++++++ .config/nvim/lua/plugins/lspconfig.lua | 19 ++++++---- .config/nvim/lua/plugins/mason.lua | 9 +++++ .config/nvim/lua/plugins/null-ls.lua | 8 +++-- .config/nvim/lua/plugins/overseer.lua | 20 ----------- .config/nvim/lua/plugins/windows.lua | 23 ++++++++++++ .config/nvim/lua/plugins/workspaces.lua.bak | 18 ++++++++++ 32 files changed, 215 insertions(+), 120 deletions(-) create mode 100644 .config/fish/functions/gfetch.fish create mode 100644 .config/hypr/configs/monitors.conf create mode 100644 .config/hypr/configs/workspaces.conf create mode 100644 .config/hypr/pyprland.json rename .config/hypr/{configs => themes/luna}/luna.conf (81%) create mode 100644 .config/nvim/lua/plugins/diffview.lua delete mode 100644 .config/nvim/lua/plugins/overseer.lua create mode 100644 .config/nvim/lua/plugins/windows.lua create mode 100644 .config/nvim/lua/plugins/workspaces.lua.bak diff --git a/.config/fish/conf.d/fzf.fish b/.config/fish/conf.d/fzf.fish index 8156c11b..f899dd53 100644 --- a/.config/fish/conf.d/fzf.fish +++ b/.config/fish/conf.d/fzf.fish @@ -3,7 +3,7 @@ if not status is-interactive && test "$CI" != true exit end -# Because of scoping rules, to capture the shell variables exactly as they are, we must read +# Because of scoping rules, to capture the shell variables ezactly as they are, we must read # them before even executing _fzf_search_variables. We use psub to store the # variables' info in temporary files and pass in the filenames as arguments. # This variable is global so that it can be referenced by fzf_configure_bindings and in tests diff --git a/.config/fish/functions/_fzf_configure_bindings_help.fish b/.config/fish/functions/_fzf_configure_bindings_help.fish index ecfe68ec..f30e16d6 100644 --- a/.config/fish/functions/_fzf_configure_bindings_help.fish +++ b/.config/fish/functions/_fzf_configure_bindings_help.fish @@ -29,7 +29,7 @@ DESCRIPTION Pass -h or --help to print this help message and exit. -EXAMPLES +ezaMPLES Default bindings but bind Search Directory to Ctrl+F and Search Variables to Ctrl+Alt+V \$ fzf_configure_bindings --directory=\cf --variables=\e\cv Default bindings but disable Search History diff --git a/.config/fish/functions/_fzf_search_variables.fish b/.config/fish/functions/_fzf_search_variables.fish index bf823403..dfd3d37e 100644 --- a/.config/fish/functions/_fzf_search_variables.fish +++ b/.config/fish/functions/_fzf_search_variables.fish @@ -12,7 +12,7 @@ function _fzf_search_variables --argument-names set_show_output set_names_output # Exclude the history variable from being piped into fzf because # 1. it's not included in $set_names_output # 2. it tends to be a very large value => increases computation time - # 3._fzf_search_history is a much better way to examine history anyway + # 3._fzf_search_history is a much better way to ezamine history anyway set -f all_variable_names (string match --invert history <$set_names_output) set -f current_token (commandline --current-token) diff --git a/.config/fish/functions/gfetch.fish b/.config/fish/functions/gfetch.fish new file mode 100644 index 00000000..07e42d97 --- /dev/null +++ b/.config/fish/functions/gfetch.fish @@ -0,0 +1,4 @@ +function gfetch --wraps=onefetch --description 'alias gfetch=onefetch' + onefetch $argv + +end diff --git a/.config/fish/functions/l.fish b/.config/fish/functions/l.fish index 4c7f6563..afb9baae 100644 --- a/.config/fish/functions/l.fish +++ b/.config/fish/functions/l.fish @@ -1,4 +1,4 @@ -function l --wraps='exa --long --header -a --icons --git --group-directories-first' --description 'alias l=exa --long --header -a --icons --git --group-directories-first' - exa --long --header -a --icons --git --group-directories-first $argv - +function l --wraps='eza --long --header -a --icons --git --group-directories-first' --description 'alias l=eza --long --header -a --icons --git --group-directories-first' + eza --long --header -a --icons --git --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/functions/ld.fish b/.config/fish/functions/ld.fish index 8bb47dcb..49efb2e3 100644 --- a/.config/fish/functions/ld.fish +++ b/.config/fish/functions/ld.fish @@ -1,4 +1,4 @@ -function ld --wraps='exa --long --header -a --icons -D --git' --description 'alias ld=exa --long --header -a --icons -D --git' - exa --long --header -a --icons -D --git $argv - +function ld --wraps='eza --long --header -a --icons -D --git' --description 'alias ld=eza --long --header -a --icons -D --git' + eza --long --header -a --icons -D --git --hyperlink $argv + end diff --git a/.config/fish/functions/ldh.fish b/.config/fish/functions/ldh.fish index df740666..a64e416d 100644 --- a/.config/fish/functions/ldh.fish +++ b/.config/fish/functions/ldh.fish @@ -1,4 +1,4 @@ -function ldh --wraps='exa --long --header --icons -D --git' --description 'alias ldh=exa --long --header --icons -D --git' - exa --long --header --icons -D --git $argv - +function ldh --wraps='eza --long --header --icons -D --git' --description 'alias ldh=eza --long --header --icons -D --git' + eza --long --header --icons -D --git --hyperlink $argv + end diff --git a/.config/fish/functions/lh.fish b/.config/fish/functions/lh.fish index 88eb2ea3..1886b91d 100644 --- a/.config/fish/functions/lh.fish +++ b/.config/fish/functions/lh.fish @@ -1,4 +1,4 @@ -function lh --wraps='exa --long --header --icons --git --group-directories-first' --description 'alias lh=exa --long --header --icons --git --group-directories-first' - exa --long --header --icons --git --group-directories-first $argv - +function lh --wraps='eza --long --header --icons --git --group-directories-first' --description 'alias lh=eza --long --header --icons --git --group-directories-first' + eza --long --header --icons --git --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/functions/ls.fish b/.config/fish/functions/ls.fish index ae1caa01..017dbe3b 100644 --- a/.config/fish/functions/ls.fish +++ b/.config/fish/functions/ls.fish @@ -1,4 +1,4 @@ -function ls --wraps='exa -a --icons --group-directories-first' --description 'alias ls=exa -a --icons --group-directories-first' - exa -a --icons --group-directories-first $argv - +function ls --wraps='eza -a --icons --group-directories-first' --description 'alias ls=eza -a --icons --group-directories-first' + eza -a --icons --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/functions/lsh.fish b/.config/fish/functions/lsh.fish index 82a10b05..24764616 100644 --- a/.config/fish/functions/lsh.fish +++ b/.config/fish/functions/lsh.fish @@ -1,4 +1,4 @@ -function lsh --wraps='exa --icons --git --group-directories-first' --description 'alias lsh=exa --icons --git --group-directories-first' - exa --icons --git --group-directories-first $argv - +function lsh --wraps='eza --icons --git --group-directories-first' --description 'alias lsh=eza --icons --git --group-directories-first' + eza --icons --git --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/functions/lt.fish b/.config/fish/functions/lt.fish index 73133fd7..041bc642 100644 --- a/.config/fish/functions/lt.fish +++ b/.config/fish/functions/lt.fish @@ -1,4 +1,4 @@ -function lt --wraps='exa --long --header -a --icons --tree --git --group-directories-first' --description 'alias lt=exa --long --header -a --icons --tree --git --group-directories-first' - exa --long --header -a --icons --tree --git --group-directories-first $argv - +function lt --wraps='eza --long --header -a --icons --tree --git --group-directories-first' --description 'alias lt=eza --long --header -a --icons --tree --git --group-directories-first' + eza --long --header -a --icons --tree --git --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/functions/lth.fish b/.config/fish/functions/lth.fish index 5b8372f8..be51ca88 100644 --- a/.config/fish/functions/lth.fish +++ b/.config/fish/functions/lth.fish @@ -1,4 +1,4 @@ -function lth --wraps='exa --long --header --icons --tree --git --group-directories-first' --description 'alias lth=exa --long --header --icons --tree --git --group-directories-first' - exa --long --header --icons --tree --git --group-directories-first $argv - +function lth --wraps='eza --long --header --icons --tree --git --group-directories-first' --description 'alias lth=eza --long --header --icons --tree --git --group-directories-first' + eza --long --header --icons --tree --git --group-directories-first --hyperlink $argv + end diff --git a/.config/fish/variables.fish b/.config/fish/variables.fish index 6c60a97b..889965d9 100644 --- a/.config/fish/variables.fish +++ b/.config/fish/variables.fish @@ -12,7 +12,6 @@ set -xg RUSTUP_HOME $XDG_DATA_HOME/rustup 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 @@ -42,7 +41,7 @@ set -xg FZF_DEFAULT_OPTS "--height=90% --layout=reverse --info=inline --border - --color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \ --color=fg:#cad3f5,header:#ed8796,info:#c6a0f6,pointer:#f4dbd6 \ --color=marker:#f4dbd6,fg+:#cad3f5,prompt:#c6a0f6,hl+:#ed8796" -set -xg fzf_preview_dir_cmd exa --long --header --icons --all --color=always --group-directories-first +set -xg fzf_preview_dir_cmd eza --long --header --icons --all --color=always --group-directories-first set -xg fzf_fd_opts --hidden --exclude=.git --color=always set -xg fzf_diff_highlighter delta --paging=never --width=20 diff --git a/.config/hypr/configs/monitors.conf b/.config/hypr/configs/monitors.conf new file mode 100644 index 00000000..f533db16 --- /dev/null +++ b/.config/hypr/configs/monitors.conf @@ -0,0 +1,6 @@ +# Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually. + +monitor=HDMI-A-1,1920x1080@74.973,2560x300,1.0 +monitor=HDMI-A-1,transform,3 +monitor=DP-3,2560x1080@74.990997,0x0,1.0 +monitor=DP-1,2560x1080@74.991,0x1080,1.0 diff --git a/.config/hypr/configs/workspaces.conf b/.config/hypr/configs/workspaces.conf new file mode 100644 index 00000000..d7aa5ecd --- /dev/null +++ b/.config/hypr/configs/workspaces.conf @@ -0,0 +1,32 @@ +# Generated by nwg-displays on 2023-09-04 at 18:08:34. Do not edit manually. + +workspace=DP-1,1 +workspace=DP-1,2 +workspace=DP-1,3 +workspace=DP-1,4 +workspace=DP-1,5 +workspace=DP-1,6 +workspace=DP-1,7 +workspace=DP-1,8 +workspace=DP-1,9 +workspace=DP-1,10 +workspace=DP-3,11 +workspace=DP-3,12 +workspace=DP-3,13 +workspace=DP-3,14 +workspace=DP-3,15 +workspace=DP-3,16 +workspace=DP-3,17 +workspace=DP-3,18 +workspace=DP-3,19 +workspace=DP-3,20 +workspace=HDMI-A-1,21 +workspace=HDMI-A-1,22 +workspace=HDMI-A-1,23 +workspace=HDMI-A-1,24 +workspace=HDMI-A-1,25 +workspace=HDMI-A-1,26 +workspace=HDMI-A-1,27 +workspace=HDMI-A-1,28 +workspace=HDMI-A-1,29 +workspace=HDMI-A-1,30 diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 42c8d5d6..91876cb7 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,10 +1,14 @@ # Autostart exec-once=$HOME/.config/hypr/scripts/autostart -# Keybinds and Configs (change to whichever config you want to use) +# Keybinds (change to whichever keybinds you want to use) source=~/.config/hypr/keybinds/binds.conf -source=~/.config/hypr/configs/luna.conf -# Themes (change to whichever theme you want to use) +# Configs (change to whichever config you want to use) +source=~/.config/hypr/configs/monitors.conf +source=~/.config/hypr/configs/workspaces.conf + +# Theme (change to whichever theme you want to use) +source=~/.config/hypr/themes/luna/luna.conf source=~/.config/hypr/themes/luna/theme.conf source=~/.config/hypr/themes/luna/rules.conf diff --git a/.config/hypr/keybinds/binds.conf b/.config/hypr/keybinds/binds.conf index 8a13bc4f..73fb7b85 100644 --- a/.config/hypr/keybinds/binds.conf +++ b/.config/hypr/keybinds/binds.conf @@ -9,6 +9,7 @@ bind=SUPERCTRL,M,exit, bind=SUPER,A,togglefloating, bind=SUPER,P,pseudo, bind=SUPER,F,fullscreen,0 +bind=SUPER,Z,exec,pypr zoom ## Applications bind=SUPER,91,exec,librewolf # Numpad dot @@ -41,6 +42,9 @@ bind=SUPERSHIFT,81,exec,kitty ~/.config # Numpad 9 # Launchers bind=SUPER, 23, exec, rofi -show drun -theme ~/.config/rofi/style.rasi # Space key +# Scratchpads +bind=SUPER,V,exec,pypr toggle volume + # 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 diff --git a/.config/hypr/pyprland.json b/.config/hypr/pyprland.json new file mode 100644 index 00000000..d63c94f7 --- /dev/null +++ b/.config/hypr/pyprland.json @@ -0,0 +1,13 @@ +{ + "pyprland": { + "plugins": ["scratchpads", "expose", "magnify"] + }, + "scratchpads": { + "volume": { + "command": "pavucontrol", + "unfocus": "hide", + "animation": "fromLeft", + "margin": 20 + } + } +} diff --git a/.config/hypr/scripts/autostart b/.config/hypr/scripts/autostart index e01fcedc..d5c05dd2 100755 --- a/.config/hypr/scripts/autostart +++ b/.config/hypr/scripts/autostart @@ -4,6 +4,9 @@ config=$HOME/.config/hypr scripts=$config/scripts +# Plugins +pypr & + # Notification Daemon swaync & diff --git a/.config/hypr/configs/luna.conf b/.config/hypr/themes/luna/luna.conf similarity index 81% rename from .config/hypr/configs/luna.conf rename to .config/hypr/themes/luna/luna.conf index 86a73a55..f2f73980 100644 --- a/.config/hypr/configs/luna.conf +++ b/.config/hypr/themes/luna/luna.conf @@ -1,10 +1,3 @@ -# Monitors Config (Change it to fit yours) -monitor=DP-3,2560x1080@75,0x0,1 -monitor=DP-1,2560x1080@75,0x1080,1 -monitor=HDMI-A-1,1920x1080@75,2560x240,1 -monitor=HDMI-A-1,transform,3 - - # Mouse and keyboard Config input { kb_layout=es @@ -29,6 +22,9 @@ misc { animate_manual_resizes=false animate_mouse_windowdragging=false enable_swallow=true + groupbar_titles_font_size=11 + groupbar_text_color=rgba(cad3f5ff) + groupbar_gradients = false } dwindle { @@ -46,4 +42,10 @@ master { gestures { workspace_swipe=yes workspace_swipe_fingers=4 -} \ No newline at end of file +} + +plugin { + split-monitor-workspaces { + count = 10 + } +} diff --git a/.config/hypr/themes/luna/rules.conf b/.config/hypr/themes/luna/rules.conf index a5daa4e1..7a9122ab 100644 --- a/.config/hypr/themes/luna/rules.conf +++ b/.config/hypr/themes/luna/rules.conf @@ -3,7 +3,6 @@ windowrulev2 = workspace 22 silent,class:^(discord)$ windowrulev2 = workspace 21,silent,class:^(Spotify)$ windowrulev2 = workspace 21,class:^(YouTube Music)$ windowrulev2 = workspace 18,class:^(steam)$ -windowrulev2 = workspace 16,class:^(pavucontrol)$ windowrulev2 = workspace 16,class:^(com.github.wwmm.easyeffects)$ windowrulev2 = workspace 12,class:^(GitKraken)$ windowrulev2 = workspace 26,class:^(nm-connection-editor)$ @@ -33,8 +32,11 @@ windowrulev2 = workspace 8,class:^(Ryujinx)$ windowrulev2 = workspace 8,class:^(.*steam_app.*)$ windowrulev2 = workspace 5,class:^(photoshop.exe)$ windowrulev2 = workspace 5,class:^(pinta)$ +windowrule = workspace special silent,^(pavucontrol)$ ## Float +windowrule = float,^(pavucontrol)$ +windowrule = size 30% 85%,^(pavucontrol)$ windowrule = float, xfce-polkit windowrule = float, galculator windowrule = float, Geeqie diff --git a/.config/hypr/themes/luna/theme.conf b/.config/hypr/themes/luna/theme.conf index b0ac8e7a..ff44beca 100644 --- a/.config/hypr/themes/luna/theme.conf +++ b/.config/hypr/themes/luna/theme.conf @@ -1,40 +1,9 @@ -# Did this to let the workspaces behave as awesome workspaces -workspace=DP-1,1 -workspace=DP-1,2 -workspace=DP-1,3 -workspace=DP-1,4 -workspace=DP-1,5 -workspace=DP-1,6 -workspace=DP-1,7 -workspace=DP-1,8 -workspace=DP-1,9 -workspace=DP-1,10 -workspace=DP-3,11 -workspace=DP-3,12 -workspace=DP-3,13 -workspace=DP-3,14 -workspace=DP-3,15 -workspace=DP-3,16 -workspace=DP-3,17 -workspace=DP-3,18 -workspace=DP-3,19 -workspace=DP-3,20 -workspace=HDMI-A-1,21 -workspace=HDMI-A-1,22 -workspace=HDMI-A-1,23 -workspace=HDMI-A-1,24 -workspace=HDMI-A-1,25 -workspace=HDMI-A-1,26 -workspace=HDMI-A-1,27 -workspace=HDMI-A-1,28 -workspace=HDMI-A-1,29 -workspace=HDMI-A-1,30 - - general { border_size=2 col.inactive_border=rgba(c6d0f599) col.active_border = rgba(c6d0f5ee) rgba(b7bdf880) rgba(b7bdf880) rgba(c6d0f5ee) 45deg + col.group_border =rgba(c6d0f599) + col.group_border_active = rgba(b7bdf8ff) gaps_in=10 gaps_out=20 diff --git a/.config/keyb/bindings/nvim.yml b/.config/keyb/bindings/nvim.yml index 89af04c6..13a6f70d 100644 --- a/.config/keyb/bindings/nvim.yml +++ b/.config/keyb/bindings/nvim.yml @@ -402,6 +402,8 @@ key: Space + s + W - name: (Nor) Word (root) key: Space + s + w + - name: (Nor) Word Under Cursor + key: '*' - name: (Nor) Terminals key: Space + T - name: (Nor) Yank History diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 9632daa7..4e8f7cd4 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1096,7 +1096,7 @@ shell fish #: --login and --interactive to ensure that the shell starts in #: interactive mode and reads its startup rc files. -editor codium +editor nvim #: The terminal based text editor (such as vim or nano) to use when #: editing the kitty config file or similar tasks. diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 10b6a134..2f4bdb73 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,11 +1,11 @@ { - "LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" }, + "LazyVim": { "branch": "main", "commit": "a72a84972d85e5bbc6b9d60a0983b37efef21b8a" }, "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, - "SchemaStore.nvim": { "branch": "main", "commit": "a6759df4dcfc052246ee7a6cccfdb37d2180d617" }, + "SchemaStore.nvim": { "branch": "main", "commit": "9d7b4c8d1c2ad029234d531871a55c075a116b7d" }, "alpha-nvim": { "branch": "main", "commit": "5f211a1597b06be24b1600d72a62b94cab1e2df9" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bufferline.nvim": { "branch": "main", "commit": "9961d87bb3ec008213c46ba14b3f384a5f520eb5" }, - "catppuccin": { "branch": "main", "commit": "2e3e5ebcdc24ef0d5b14a0a999dbbe7936512c46" }, + "catppuccin": { "branch": "main", "commit": "1c15c5e51a998c9198d63c6d2b75e9d1e4a84541" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -13,12 +13,12 @@ "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, "compiler.nvim": { "branch": "main", "commit": "260de20b8c7bdc7d6137613d8d2df4744d0329aa" }, "copilot-cmp": { "branch": "master", "commit": "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd" }, - "copilot.lua": { "branch": "master", "commit": "0fa30d6846aae1af1c94a9ead93fa7dcf8affbe6" }, + "copilot.lua": { "branch": "master", "commit": "2c942f33ba5c621c906e625e00a1bb504b65e2f0" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, - "dressing.nvim": { "branch": "master", "commit": "b1c7b70e1e0875243ed38f51fe7a61d08e11607e" }, + "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" }, "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, - "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, + "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, "gitsigns.nvim": { "branch": "main", "commit": "d927caa075df63bf301d92f874efb72fd22fd3b4" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "highlight-undo.nvim": { "branch": "main", "commit": "d9e674a2eb4d95ee16cd477d47eab7ddc586e336" }, @@ -29,7 +29,7 @@ "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "6148b51db945b55b3b725da39eaea6441e59dff8" }, - "mason.nvim": { "branch": "main", "commit": "0942198fb9a998b6ccee36fb8dd7495eb8ba659c" }, + "mason.nvim": { "branch": "main", "commit": "ee6a7f179ebf8aa9da9d53b1cf1b57d292ea0182" }, "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, "mini.ai": { "branch": "main", "commit": "7ae226f331885e6f30e9a8229e113debc59308ae" }, "mini.bufremove": { "branch": "main", "commit": "7821606e35c1ac931b56d8e3155f45ffe76ee7e5" }, @@ -39,12 +39,12 @@ "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5b4c874b13e372500f07c37187ba06c0c1ac0a" }, "neoconf.nvim": { "branch": "main", "commit": "9873bc90d7e6bee70ec8f552b4663c3ff51ec7f6" }, - "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, + "neodev.nvim": { "branch": "main", "commit": "dcd34653b0f1d3e7ea9aeb3e37dc7c8da445c4fe" }, "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" }, "neotest": { "branch": "master", "commit": "bec7be0f13ee19c85561943fc5f7b8daa4f4d465" }, "neotest-go": { "branch": "main", "commit": "f2580cad67ef0181403cf65858ab638ffd3ede9f" }, "neotest-python": { "branch": "master", "commit": "81d2265efac717bb567bc15cc652ae10801286b3" }, - "neotest-rust": { "branch": "main", "commit": "95161da0fbe0570395a938927b654931a82caecb" }, + "neotest-rust": { "branch": "main", "commit": "dd49d0de3a4ccde0c8ce99dbae9e7b04bcdbfc85" }, "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" }, "nui.nvim": { "branch": "main", "commit": "aa1b4c1e05983ff7debd2b4b2788651db099de2f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, @@ -55,20 +55,20 @@ "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, - "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, + "nvim-lspconfig": { "branch": "master", "commit": "499314f76fa6e8f82f7cfd116578906d61ba2560" }, "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-numbertoggle": { "branch": "main", "commit": "1dcc1507578f6f216917065da9dac169670dbcd3" }, + "nvim-numbertoggle": { "branch": "main", "commit": "50fef7e421a27294e834084625ad0dd8cffee72c" }, "nvim-regexplainer": { "branch": "main", "commit": "4250c8f3c1307876384e70eeedde5149249e154f" }, - "nvim-scrollview": { "branch": "main", "commit": "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b" }, + "nvim-scrollview": { "branch": "main", "commit": "b0737d036cfbb39e066d144702197eda0a4b6cf1" }, "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-treesitter": { "branch": "master", "commit": "17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d" }, + "nvim-treesitter": { "branch": "master", "commit": "95d02cdafe704fa5b86eac81f2eb1de3d8f52330" }, "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" }, - "nvim-web-devicons": { "branch": "master", "commit": "cfc8824cc1db316a276b36517f093baccb8e799a" }, - "overseer.nvim": { "branch": "master", "commit": "3047ede61cc1308069ad1184c0d447ebee92d749" }, + "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" }, + "overseer.nvim": { "branch": "master", "commit": "dc67e8500b81dcfe18192e900f952be73966c35f" }, "package-info.nvim": { "branch": "master", "commit": "4d98c8cc90d970d87c472c04bf7ca712336cc753" }, "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, @@ -82,13 +82,13 @@ "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": "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748" }, + "telescope.nvim": { "branch": "master", "commit": "20a37e43bb43c74c6091f9fea6551af0964ad45a" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" }, "typescript.nvim": { "branch": "main", "commit": "4de85ef699d7e6010528dcfbddc2ed4c2c421467" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, - "venv-selector.nvim": { "branch": "main", "commit": "037b9af70942991b87eb54a80c989e26187e9f47" }, + "venv-selector.nvim": { "branch": "main", "commit": "6841d78e4f88efbceca9b2546e6080a9914109c4" }, "vim-floaterm": { "branch": "master", "commit": "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd" }, "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, diff --git a/.config/nvim/lua/plugins/diffview.lua b/.config/nvim/lua/plugins/diffview.lua new file mode 100644 index 00000000..0d220a22 --- /dev/null +++ b/.config/nvim/lua/plugins/diffview.lua @@ -0,0 +1,14 @@ +return { + { + "sindrets/diffview.nvim", + cmd = { "DiffviewOpen", "DiffviewFileHistory" }, + keys = { + { "gd", "DiffviewFileHistory", desc = "Diff File" }, + { "gv", "DiffviewOpen", desc = "Diff View" }, + }, + event = "BufRead", + config = function() + require("diffview").setup() + end, + }, +} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index c9e4fed3..00a6d578 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -10,12 +10,19 @@ return { end, opts = { servers = { - marksman = {}, - }, - setup = { - marksman = function() - require("lazyvim.util").on_attach(function(client, _) end) - end, + cssmodules_ls = { + filetypes = { + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "css", + "scss", + "less", + "html", + }, + }, + omnisharp_mono = {}, }, }, }, diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 014c106c..4feedfff 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -7,13 +7,22 @@ return { "beautysh", "codespell", "csharpier", + "css-lsp", + "cssmodules-language-server", "ktlint", + "hadolint", + "html-lsp", "rustywind", "sqlfmt", "markdownlint", "marksman", + "markuplint", "stylua", "shfmt", + "angular-language-server", + "bash-language-server", + "omnisharp", + "sqlls", }, }, }, diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua index 434842e4..93a90f97 100644 --- a/.config/nvim/lua/plugins/null-ls.lua +++ b/.config/nvim/lua/plugins/null-ls.lua @@ -8,13 +8,17 @@ return { vim.list_extend(opts.sources, { nls.builtins.formatting.beautysh, nls.builtins.formatting.black, - nls.builtins.formatting.codespell, nls.builtins.formatting.csharpier, - nls.builtins.formatting.ktlint, nls.builtins.formatting.rustywind, nls.builtins.formatting.sqlfmt, nls.builtins.formatting.rustfmt, + --nls.builtins.diagnostics.cspell, + --nls.builtins.code_actions.cspell, + nls.builtins.hover.dictionary, + nls.builtins.hover.printenv, + --nls.builtins.diagnostics.markuplint, nls.builtins.diagnostics.markdownlint, + --nls.builtins.diagnostics.codespell, }) end, }, diff --git a/.config/nvim/lua/plugins/overseer.lua b/.config/nvim/lua/plugins/overseer.lua deleted file mode 100644 index 317b4a35..00000000 --- a/.config/nvim/lua/plugins/overseer.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - { - "stevearc/overseer.nvim", - commit = "3047ede61cc1308069ad1184c0d447ebee92d749", - cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, - opts = { - task_list = { - direction = "bottom", - min_height = 25, - max_height = 27, - default_detail = 1, - bindings = { - ["q"] = function() - vim.cmd("OverseerClose") - end, - }, - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/windows.lua b/.config/nvim/lua/plugins/windows.lua new file mode 100644 index 00000000..52e57e74 --- /dev/null +++ b/.config/nvim/lua/plugins/windows.lua @@ -0,0 +1,23 @@ +return { + { + "anuvyklack/windows.nvim", + event = "WinNew", + dependencies = { + { "anuvyklack/middleclass" }, + { "anuvyklack/animation.nvim", enabled = false }, + }, + keys = { + { "wv", "WindowsMaximizeVertically", desc = "Vertical Zoom" }, + { "wh", "WindowsMaximizeHorizontally", desc = "Horizontal Zoom" }, + { "we", "WindowsEqualize", desc = "Equalize Zoom" }, + }, + config = function() + vim.o.winwidth = 10 + vim.o.winminwidth = 10 + vim.o.equalalways = false + require("windows").setup({ + animation = { enable = false, duration = 150 }, + }) + end, + }, +} diff --git a/.config/nvim/lua/plugins/workspaces.lua.bak b/.config/nvim/lua/plugins/workspaces.lua.bak new file mode 100644 index 00000000..7efc870a --- /dev/null +++ b/.config/nvim/lua/plugins/workspaces.lua.bak @@ -0,0 +1,18 @@ +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" }, + }, + }, +}