Compare commits
No commits in common. "ab16dc77f8e3199236fdb1080be7276f5faa8f74" and "80dd5a368c1e4c43bb2b75509df90fc0a518e64d" have entirely different histories.
ab16dc77f8
...
80dd5a368c
45 changed files with 1282 additions and 105 deletions
|
|
@ -3,8 +3,3 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
|
|
||||||
# Added by LM Studio CLI (lms)
|
|
||||||
export PATH="$PATH:/home/matt/.lmstudio/bin"
|
|
||||||
# End of LM Studio CLI section
|
|
||||||
|
|
||||||
|
|
|
||||||
96
bash/.bashrc
96
bash/.bashrc
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
iatest=$(expr index "$-" i)
|
iatest=$(expr index "$-" i)
|
||||||
|
|
||||||
#[ -f /usr/bin/fastfetch ] && fastfetch -c ~/.config/fastfetch/config-compact.jsonc
|
[ -f /usr/bin/fastfetch ] && fastfetch -c ~/.config/fastfetch/config-compact.jsonc
|
||||||
[ -f /etc/bashrc ] && . /etc/bashrc
|
[ -f /etc/bashrc ] && . /etc/bashrc
|
||||||
[ -f /usr/share/bash-completion/bash-completion ] && . /usr/share/bash-completion/bash-completion
|
[ -f /usr/share/bash-completion/bash-completion ] && . /usr/share/bash-completion/bash-completion
|
||||||
[ -f /etc/bash_completion ] && . /etc/bash_completion
|
[ -f /etc/bash_completion ] && . /etc/bash_completion
|
||||||
|
|
@ -42,40 +42,31 @@ export EDITOR=nvim
|
||||||
export VISUAL=nvim
|
export VISUAL=nvim
|
||||||
export SHELL_ICON=
|
export SHELL_ICON=
|
||||||
alias edit='nvim'
|
alias edit='nvim'
|
||||||
#alias pico='edit'
|
alias pico='edit'
|
||||||
#alias spico='sedit'
|
alias spico='sedit'
|
||||||
#alias nano='edit'
|
alias nano='edit'
|
||||||
#alias snano='sedit'
|
alias snano='sedit'
|
||||||
alias vim='nvim'
|
alias vim='nvim'
|
||||||
alias cat='bat'
|
alias cat='bat'
|
||||||
#alias browser='librewolf'
|
alias browser='librewolf'
|
||||||
alias browser='zen-browser'
|
|
||||||
|
|
||||||
export LESS="--RAW-CONTROL-CHARS"
|
export LESS="--RAW-CONTROL-CHARS"
|
||||||
|
|
||||||
# To have colors for ls and all grep commands such as grep, egrep and zgrep
|
# To have colors for ls and all grep commands such as grep, egrep and zgrep
|
||||||
export CLICOLOR=1
|
export CLICOLOR=1
|
||||||
export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'
|
export LS_COLORS='no=00:fi=00:di=00;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.ogg=01;35:*.mp3=01;35:*.wav=01;35:*.xml=00;31:'
|
||||||
|
|
||||||
if command -v rg &> /dev/null; then
|
|
||||||
alias grep='rg'
|
|
||||||
else
|
|
||||||
alias grep="/usr/bin/grep $GREP_OPTIONS"
|
|
||||||
fi
|
|
||||||
unset GREP_OPTIONS
|
|
||||||
|
|
||||||
#export GREP_OPTIONS='--color=auto' #deprecated
|
#export GREP_OPTIONS='--color=auto' #deprecated
|
||||||
#alias grep="/usr/bin/grep $GREP_OPTIONS"
|
#alias grep="/usr/bin/grep $GREP_OPTIONS"
|
||||||
#unset GREP_OPTIONS
|
#unset GREP_OPTIONS
|
||||||
|
|
||||||
# Color for manpages in less makes manpages a little easier to read
|
# Color for manpages in less makes manpages a little easier to read
|
||||||
export LESS_TERMCAP_mb=$'\E[01;31m'
|
#export LESS_TERMCAP_mb=$'\E[01;31m'
|
||||||
export LESS_TERMCAP_md=$'\E[01;31m'
|
#export LESS_TERMCAP_md=$'\E[01;31m'
|
||||||
export LESS_TERMCAP_me=$'\E[0m'
|
#export LESS_TERMCAP_me=$'\E[0m'
|
||||||
export LESS_TERMCAP_se=$'\E[0m'
|
#export LESS_TERMCAP_se=$'\E[0m'
|
||||||
export LESS_TERMCAP_so=$'\E[01;44;33m'
|
#export LESS_TERMCAP_so=$'\E[01;44;33m'
|
||||||
export LESS_TERMCAP_ue=$'\E[0m'
|
#export LESS_TERMCAP_ue=$'\E[0m'
|
||||||
export LESS_TERMCAP_us=$'\E[01;32m'
|
#export LESS_TERMCAP_us=$'\E[01;32m'
|
||||||
|
|
||||||
#######################################################
|
#######################################################
|
||||||
# GENERAL ALIAS'S
|
# GENERAL ALIAS'S
|
||||||
|
|
@ -94,7 +85,7 @@ alias stowclean='find . -type d -empty -delete' # delete empty directories
|
||||||
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
|
||||||
|
|
||||||
# Edit this .bashrc file
|
# Edit this .bashrc file
|
||||||
alias ebrc='edit ~/.bashrc && . ~/.bashrc'
|
alias ebrc='edit ~/.bashrc'
|
||||||
|
|
||||||
# Show help for this .bashrc file
|
# Show help for this .bashrc file
|
||||||
alias hlp='less ~/.bashrc_help'
|
alias hlp='less ~/.bashrc_help'
|
||||||
|
|
@ -107,17 +98,14 @@ alias cp='cp -i'
|
||||||
alias mv='mv -i'
|
alias mv='mv -i'
|
||||||
alias rm='trash -v'
|
alias rm='trash -v'
|
||||||
alias mkdir='mkdir -pv'
|
alias mkdir='mkdir -pv'
|
||||||
alias ps='ps auxf'
|
alias psa='ps auxf'
|
||||||
alias ping='ping -c 10'
|
alias ping='ping -c 10'
|
||||||
alias less='less -R'
|
alias less='less -R'
|
||||||
alias cls='clear'
|
alias cls='clear'
|
||||||
alias multitail='multitail --no-repeat -c'
|
alias multitail='multitail --no-repeat -c'
|
||||||
alias freshclam='sudo freshclam'
|
|
||||||
alias vi='nvim'
|
alias vi='nvim'
|
||||||
alias svi='sudo vi'
|
alias svi='sudo vi'
|
||||||
alias vis='nvim "+set si"'
|
alias vis='nvim "+set si"'
|
||||||
alias yayf="yay -Slq | fzf --multi --preview 'yay -Sii {1}' --preview-window=down:75% | xargs -ro yay -S"
|
|
||||||
alias paruf="paru -Slq | fzf --multi --preview 'paru -Sii {1}' --preview-window=down:75% | xargs -ro paru -S"
|
|
||||||
|
|
||||||
# Change directory aliases
|
# Change directory aliases
|
||||||
alias home='cd ~'
|
alias home='cd ~'
|
||||||
|
|
@ -156,9 +144,6 @@ else
|
||||||
alias labc='ls -lap' #alphabetical sort
|
alias labc='ls -lap' #alphabetical sort
|
||||||
alias lf="ls -l | grep -E -v '^d'" # files only
|
alias lf="ls -l | grep -E -v '^d'" # files only
|
||||||
alias ldir="ls -l | grep -E '^d'" # directories only
|
alias ldir="ls -l | grep -E '^d'" # directories only
|
||||||
alias lla='ls -Al' # List and Hidden Files
|
|
||||||
alias las='ls -A' # Hidden Files
|
|
||||||
alias lls='ls -l' # List
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -172,10 +157,10 @@ alias 755='chmod -R 755'
|
||||||
alias 777='chmod -R 777'
|
alias 777='chmod -R 777'
|
||||||
|
|
||||||
# Search command line history
|
# Search command line history
|
||||||
alias h="history | fzf "
|
alias hs="history | fzf "
|
||||||
|
|
||||||
# Search running processes
|
# Search running processes
|
||||||
alias p="ps aux | grep -v grep | grep -i -e VSZ -e"
|
alias psgrep="ps aux | grep -v grep | grep -i -e VSZ -e"
|
||||||
alias topcpu="/bin/ps -eo pcpu,pid,user,args | sort -k 1 -r | head -10"
|
alias topcpu="/bin/ps -eo pcpu,pid,user,args | sort -k 1 -r | head -10"
|
||||||
alias psmem="ps auxf | sort -nf -k 4"
|
alias psmem="ps auxf | sort -nf -k 4"
|
||||||
alias pscpu="ps auxf | sort -nf -k 3"
|
alias pscpu="ps auxf | sort -nf -k 3"
|
||||||
|
|
@ -201,11 +186,9 @@ alias rebootforce='sudo shutdown -r -n now'
|
||||||
alias diskspace="du -S | sort -n -r |more"
|
alias diskspace="du -S | sort -n -r |more"
|
||||||
alias folders='du -h --max-depth=1'
|
alias folders='du -h --max-depth=1'
|
||||||
alias folderssort='find . -maxdepth 1 -type d -print0 | xargs -0 du -sk | sort -rn'
|
alias folderssort='find . -maxdepth 1 -type d -print0 | xargs -0 du -sk | sort -rn'
|
||||||
#if type -fP tree &> /dev/null; then
|
if type -fP tree &> /dev/null; then
|
||||||
# alias tree='tree -ahC --dirsfirst -I .git'
|
alias tree='tree -ahC --dirsfirst -I .git'
|
||||||
#fi
|
fi
|
||||||
alias tree='tree -Cahf --dirsfirst'
|
|
||||||
alias treed='tree -CAFd'
|
|
||||||
alias mountedinfo='df -hT'
|
alias mountedinfo='df -hT'
|
||||||
|
|
||||||
# Alias's for archives
|
# Alias's for archives
|
||||||
|
|
@ -236,6 +219,14 @@ alias vf='nvim $(fp)'
|
||||||
# SPECIAL FUNCTIONS
|
# SPECIAL FUNCTIONS
|
||||||
#######################################################
|
#######################################################
|
||||||
|
|
||||||
|
#chezedit() {
|
||||||
|
# if [ -z "$1" ]; then
|
||||||
|
# echo "Usage: chezedit <config file>"
|
||||||
|
# return 1
|
||||||
|
# fi
|
||||||
|
# chezmoi edit "$1" && chezmoi apply "$1"
|
||||||
|
#}
|
||||||
|
|
||||||
# Extracts any archive(s) (if unp isn't installed)
|
# Extracts any archive(s) (if unp isn't installed)
|
||||||
extract() {
|
extract() {
|
||||||
for archive in "$@"; do
|
for archive in "$@"; do
|
||||||
|
|
@ -337,9 +328,9 @@ up() {
|
||||||
cd ()
|
cd ()
|
||||||
{
|
{
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
builtin cd "$@" && ls
|
builtin cd "$@" && la
|
||||||
else
|
else
|
||||||
builtin cd ~ && ls
|
builtin cd ~ && la
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -369,7 +360,7 @@ distribution ()
|
||||||
gentoo)
|
gentoo)
|
||||||
dtype="gentoo"
|
dtype="gentoo"
|
||||||
;;
|
;;
|
||||||
arch|cachyos)
|
arch)
|
||||||
dtype="arch"
|
dtype="arch"
|
||||||
;;
|
;;
|
||||||
slackware)
|
slackware)
|
||||||
|
|
@ -499,30 +490,11 @@ lazyg() {
|
||||||
git push
|
git push
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bind '"\C-f":"zi\n"'
|
||||||
|
|
||||||
export PATH=$PATH:"$HOME/.local/bin:/var/lib/flatpak/exports/bin:$HOME/.local/share/flatpak/exports/bin:$HOME/.npm/bin"
|
export PATH=$PATH:"$HOME/.local/bin:/var/lib/flatpak/exports/bin:$HOME/.local/share/flatpak/exports/bin:$HOME/.npm/bin"
|
||||||
|
|
||||||
if [[ $- == *i* ]]; then
|
# Install Starship - curl -sS https://starship.rs/install.sh | sh
|
||||||
# bind ctrl+f to insert 'zi' followed by a newline
|
|
||||||
bind '"\C-f":"zi\n"'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# pyenv
|
|
||||||
export PATH="$HOME/.pyenv/bin:$PATH"
|
|
||||||
eval "$(pyenv init --path)"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init -)"
|
|
||||||
|
|
||||||
eval "$(starship init bash)"
|
eval "$(starship init bash)"
|
||||||
|
#eval "$(oh-my-posh init bash --config "~/.cache/oh-my-posh/themes/catppuccin_macchiato.omp.json")"
|
||||||
eval "$(zoxide init bash)"
|
eval "$(zoxide init bash)"
|
||||||
|
|
||||||
# Added by LM Studio CLI (lms)
|
|
||||||
export PATH="$PATH:/home/matt/.lmstudio/bin"
|
|
||||||
# End of LM Studio CLI section
|
|
||||||
|
|
||||||
[ -f ~/.bash-preexec.sh ] && . ~/.bash-preexec.sh
|
|
||||||
|
|
||||||
|
|
||||||
# bun
|
|
||||||
export BUN_INSTALL="$HOME/.bun"
|
|
||||||
export PATH="$BUN_INSTALL/bin:$PATH"
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
[files]
|
[files]
|
||||||
recent_files=/run/user/1000/kio-fuse-xaNBCb/smb/matthieu.fortin@172.31.180.4/TCLI-Data-Repo/CMPFOR/Holding/Southby-Batches-main/Time&Date CMD PROMPT/Prompt commands.txt;/run/user/1000/kio-fuse-SxBsyA/smb/mfortin@172.31.180.13/MDAA/Read Only Files/Software/MTK/mtk-su_r23/readme.txt;/run/user/1000/kio-fuse-SxBsyA/smb/mfortin@172.31.180.13/MDAA/Read Only Files/Software 2025/O16.txt;/run/user/1000/kio-fuse-zKniRF/smb/mfortin@172.31.180.13/CMPFOR/Read Only Files/maps.bat;/run/user/1000/kio-fuse-mPGSIx/smb/mfortin@172.31.180.13/MDAA/Shared Files/Image Downloads/PA-setup.log;/run/user/1000/kio-fuse-mPGSIx/smb/mfortin@172.31.180.13/MDAA/Shared Files/ACS-Unified-MSI-Win-4290/ReadMe.txt;/run/user/1000/kio-fuse-mPGSIx/smb/mfortin@172.31.180.13/MDAA/Shared Files/Final Scenario Answer Key/BUHZINGA !.txt;/run/user/1000/kio-fuse-mPGSIx/smb/matthieu.fortin@172.31.180.4/TCLI-Data-Repo/CMPFOR/Microsoft-Office-2024-Suite/Process_Installation.txt;/home/matt/#*message*-20250130-114332#;/home/matt/Downloads/README.txt;
|
recent_files=/home/matt/#*message*-20250130-114332#;/home/matt/Downloads/README.txt;/run/user/1000/kio-fuse-QTlNOQ/smb/mfortin@172.31.180.13/CMPFOR/Read Only Files/E01s/PE07-IMAGE-24-01/PE06.txt;/home/matt/.dotfiles/.gitignore;/home/matt/.dotfiles/.stow-local-ignre;/home/matt/.dotfiles/.stow-local-ignore;/home/matt/hypr.txt;/run/user/1000/kio-fuse-QHFRuD/smb/mfortin@172.31.180.13/TCLI_Staff/mfortin/Southby-Batches-main/List Volumes/!vol.bat;/run/user/1000/kio-fuse-QHFRuD/smb/mfortin@172.31.180.13/TCLI_Staff/mfortin/Southby-Batches-main/Privilege Escalation (Admin or System)/GETSYSTEM.cmd;/run/user/1000/kio-fuse-QHFRuD/smb/mfortin@172.31.180.13/TCLI_Staff/mfortin/Southby-Batches-main/ScreenSaverPasswordDisable/ScreenSaverDisable.bat;
|
||||||
recent_projects=
|
recent_projects=
|
||||||
current_page=0
|
current_page=0
|
||||||
FILE_NAME_0=0;None;0;EUTF-8;1;1;0;%2Frun%2Fuser%2F1000%2Fkio-fuse-xaNBCb%2Fsmb%2Fmatthieu.fortin%40172.31.180.4%2FTCLI-Data-Repo%2FCMPFOR%2FHolding%2FSouthby-Batches-main%2FTime%26Date%20CMD%20PROMPT%2FPrompt%20commands.txt;0;4
|
FILE_NAME_0=0;None;0;EUTF-8;1;1;0;%2Fhome%2Fmatt%2F%23%2Amessage%2A-20250130-114332%23;0;4
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
session_file=
|
session_file=
|
||||||
|
|
@ -11,7 +11,7 @@ project_file_path=/home/matt/Projects
|
||||||
[geany]
|
[geany]
|
||||||
treeview_position=0
|
treeview_position=0
|
||||||
msgwindow_position=805
|
msgwindow_position=805
|
||||||
geometry=0;0;2991;1174;1;
|
geometry=0;0;806;534;1;
|
||||||
sidebar_page=2
|
sidebar_page=2
|
||||||
|
|
||||||
[VTE]
|
[VTE]
|
||||||
|
|
|
||||||
|
|
@ -1,44 +1,61 @@
|
||||||
|
#<<<<<<< HEAD
|
||||||
#theme = catppuccin-mocha
|
#theme = catppuccin-mocha
|
||||||
#theme = Kanawaga Wave
|
#font-size = 16
|
||||||
|
#font-family = MesloLGS Nerd Font Mono
|
||||||
|
#font-family-bold = MesloLGS Nerd Font Mono Bold
|
||||||
|
#font-family-italic = MesloLGS Nerd Font Mono Italic
|
||||||
|
#font-family-bold-italic = MesloLGS Nerd Font Mono Bold Italic
|
||||||
|
#font-feature = -calt, -liga, -dlig
|
||||||
|
#gtk-titlebar = false
|
||||||
|
#background-opacity = 0.9
|
||||||
|
#window-decoration = auto
|
||||||
|
#window-title-font-family = MesloLGS Nerd Font Mono
|
||||||
|
#window-theme = auto
|
||||||
|
#=======
|
||||||
|
theme = catppuccin-mocha
|
||||||
font-size = 16
|
font-size = 16
|
||||||
font-family = MesloLGMDZ Nerd Font Mono
|
font-family = MesloLGS Nerd Font Mono
|
||||||
|
#gtk-titlebar = false
|
||||||
|
#>>>>>>> b03e43a (How is the target directory over 100 gigs?)
|
||||||
|
|
||||||
# Window settings
|
# Window settings
|
||||||
# window-decoration = false
|
#window-decoration = false
|
||||||
window-inherit-working-directory = true
|
window-inherit-working-directory = true
|
||||||
window-theme = dark
|
window-theme = dark
|
||||||
#window-save-state = alw11ays
|
window-save-state = always
|
||||||
window-width = 110
|
#window-width = 1920
|
||||||
window-height = 30
|
#window-height = 1080
|
||||||
|
|
||||||
mouse-hide-while-typing = true
|
mouse-hide-while-typing = true
|
||||||
copy-on-select = true
|
copy-on-select = true
|
||||||
|
|
||||||
|
background = #282a36
|
||||||
background-opacity = 0.7
|
background-opacity = 0.7
|
||||||
|
|
||||||
|
font-family = MesloLGDZ Nerd Font
|
||||||
|
font-size = 16
|
||||||
cursor-style = block
|
cursor-style = block
|
||||||
|
|
||||||
palette = 0=#090618
|
# Color scheme (Dracula-inspired dark theme)
|
||||||
palette = 1=#c34043
|
foreground = #f8f8f2
|
||||||
palette = 2=#76946a
|
selection-foreground = #ffffff
|
||||||
palette = 3=#c0a36e
|
selection-background = #44475a
|
||||||
palette = 4=#7e9cd8
|
cursor-color = #f8f8f2
|
||||||
palette = 5=#957fb8
|
|
||||||
palette = 6=#6a9589
|
|
||||||
palette = 7=#c8c093
|
|
||||||
palette = 8=#727169
|
|
||||||
palette = 9=#e82424
|
|
||||||
palette = 10=#98bb6c
|
|
||||||
palette = 11=#e6c384
|
|
||||||
palette = 12=#7fb4ca
|
|
||||||
palette = 13=#938aa9
|
|
||||||
palette = 14=#7aa89f
|
|
||||||
palette = 15=#dcd7ba
|
|
||||||
background = #1f1f28
|
|
||||||
foreground = #dcd7ba
|
|
||||||
cursor-color = #c8c093
|
|
||||||
cursor-text = #1d202f
|
|
||||||
selection-background = #2d4f67
|
|
||||||
selection-foreground = #c8c093
|
|
||||||
|
|
||||||
keybind = ctrl+t=new_tab
|
# ANSI Colors (Dracula)
|
||||||
|
palette = 0=#21222c
|
||||||
|
palette = 1=#ff5555
|
||||||
|
palette = 2=#50fa7b
|
||||||
|
palette = 3=#f1fa8c
|
||||||
|
palette = 4=#bd93f9
|
||||||
|
palette = 5=#ff79c6
|
||||||
|
palette = 6=#8be9fd
|
||||||
|
palette = 7=#f8f8f2
|
||||||
|
palette = 8=#6272a4
|
||||||
|
palette = 9=#ff6e6e
|
||||||
|
palette = 10=#69ff94
|
||||||
|
palette = 11=#ffffa5
|
||||||
|
palette = 12=#d6acff
|
||||||
|
palette = 13=#ff92df
|
||||||
|
palette = 14=#a4ffff
|
||||||
|
palette = 15=#ffffff
|
||||||
|
|
|
||||||
29
ghostty/.config/ghostty/config.fist
Normal file
29
ghostty/.config/ghostty/config.fist
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
|
||||||
|
# You can preview the config here
|
||||||
|
|
||||||
|
theme = catppuccin-mocha
|
||||||
|
background = #1e1e2e
|
||||||
|
foreground = #cdd6f4
|
||||||
|
selection-background = #585b70
|
||||||
|
selection-foreground = #cdd6f4
|
||||||
|
cursor-color = #f5e0dc
|
||||||
|
cursor-text = #cdd6f4
|
||||||
|
palette = 0=#45475a
|
||||||
|
palette = 1=#f38ba8
|
||||||
|
palette = 2=#a6e3a1
|
||||||
|
palette = 3=#f9e2af
|
||||||
|
palette = 4=#89b4fa
|
||||||
|
palette = 5=#f5c2e7
|
||||||
|
palette = 6=#94e2d5
|
||||||
|
palette = 7=#a6adc8
|
||||||
|
palette = 8=#585b70
|
||||||
|
palette = 9=#f37799
|
||||||
|
palette = 10=#89d88b
|
||||||
|
palette = 11=#ebd391
|
||||||
|
palette = 12=#74a8fc
|
||||||
|
palette = 13=#f2aede
|
||||||
|
palette = 14=#6bd7ca
|
||||||
|
palette = 15=#bac2de
|
||||||
|
font-size = 14
|
||||||
|
font-family = MesloLGS Nerd Font Mono
|
||||||
|
|
||||||
5
nvim.org/.config/nvim/.luarc.json
Normal file
5
nvim.org/.config/nvim/.luarc.json
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{
|
||||||
|
"diagnostics.globals": [
|
||||||
|
"vim"
|
||||||
|
]
|
||||||
|
}
|
||||||
19
nvim.org/.config/nvim/init.lua
Normal file
19
nvim.org/.config/nvim/init.lua
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
|
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||||
|
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||||
|
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||||
|
if vim.v.shell_error ~= 0 then
|
||||||
|
vim.api.nvim_echo({
|
||||||
|
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||||
|
{ out, "WarningMsg" },
|
||||||
|
{ "\nPress any key to exit..." },
|
||||||
|
}, true, {})
|
||||||
|
vim.fn.getchar()
|
||||||
|
os.exit(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
|
require("lazy").setup("plugins")
|
||||||
|
require("vim-options")
|
||||||
|
require("keymaps")
|
||||||
42
nvim.org/.config/nvim/lua/keymaps.lua
Normal file
42
nvim.org/.config/nvim/lua/keymaps.lua
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
local keymap = vim.keymap
|
||||||
|
local opts = { noremap = true, silent = true }
|
||||||
|
|
||||||
|
-- Select all
|
||||||
|
keymap.set("n", "<C-a>", "ggVG")
|
||||||
|
|
||||||
|
-- Tabs
|
||||||
|
keymap.set("n", "te", "tabedit", opts)
|
||||||
|
keymap.set("n", "<tab>", ":tabnext<Return>", opts)
|
||||||
|
keymap.set("n", "<s-tab>", ":tabprev<Return>", opts)
|
||||||
|
|
||||||
|
-- Split window
|
||||||
|
keymap.set("n", "ss", ":split<Return>", opts)
|
||||||
|
keymap.set("n", "sv", ":vsplit<Return>", opts)
|
||||||
|
|
||||||
|
-- Move window
|
||||||
|
keymap.set("n", "sh", "<C-w>h")
|
||||||
|
keymap.set("n", "sj", "<C-w>j")
|
||||||
|
keymap.set("n", "sk", "<C-w>k")
|
||||||
|
keymap.set("n", "sl", "<C-w>l")
|
||||||
|
|
||||||
|
-- Resize window
|
||||||
|
keymap.set("n", "<C-w><left>", "<C-w><")
|
||||||
|
keymap.set("n", "<C-w><right>", "<C-w>>")
|
||||||
|
keymap.set("n", "<C-w><up>", "<C-w>+")
|
||||||
|
keymap.set("n", "<C-w><down>", "<C-w>-")
|
||||||
|
|
||||||
|
-- Lazy
|
||||||
|
keymap.set("n", "<leader>l", ":Lazy<CR>", opts)
|
||||||
|
|
||||||
|
-- Navigate vim panes better
|
||||||
|
keymap.set('n', '<c-k>', ':wincmd k<CR>', opts)
|
||||||
|
keymap.set('n', '<c-j>', ':wincmd j<CR>', opts)
|
||||||
|
keymap.set('n', '<c-h>', ':wincmd h<CR>', opts)
|
||||||
|
keymap.set('n', '<c-l>', ':wincmd l<CR>', opts)
|
||||||
|
|
||||||
|
keymap.set('n', '<leader>h', ':nohlsearch<CR>')
|
||||||
|
|
||||||
|
-- Git
|
||||||
|
keymap.set('n','<leader>gp',':Gitsigns preview_hunk<CR>',opts)
|
||||||
|
keymap.set('n','<leader>gt',':Gitsigns toggle_current_line_blame<CR>',opts)
|
||||||
|
|
||||||
1
nvim.org/.config/nvim/lua/plugins.lua
Normal file
1
nvim.org/.config/nvim/lua/plugins.lua
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
return {}
|
||||||
29
nvim.org/.config/nvim/lua/plugins/alpha.lua
Normal file
29
nvim.org/.config/nvim/lua/plugins/alpha.lua
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
return {
|
||||||
|
"goolord/alpha-nvim",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
local alpha = require("alpha")
|
||||||
|
local dashboard = require("alpha.themes.startify")
|
||||||
|
|
||||||
|
dashboard.section.header.val = {
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ████ ██████ █████ ██ ]],
|
||||||
|
[[ ███████████ █████ ]],
|
||||||
|
[[ █████████ ███████████████████ ███ ███████████ ]],
|
||||||
|
[[ █████████ ███ █████████████ █████ ██████████████ ]],
|
||||||
|
[[ █████████ ██████████ █████████ █████ █████ ████ █████ ]],
|
||||||
|
[[ ███████████ ███ ███ █████████ █████ █████ ████ █████ ]],
|
||||||
|
[[ ██████ █████████████████████ ████ █████ █████ ████ ██████ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
[[ ]],
|
||||||
|
}
|
||||||
|
alpha.setup(dashboard.opts)
|
||||||
|
end,
|
||||||
|
}
|
||||||
26
nvim.org/.config/nvim/lua/plugins/catppucin.lua
Normal file
26
nvim.org/.config/nvim/lua/plugins/catppucin.lua
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
return {
|
||||||
|
"catppuccin/nvim",
|
||||||
|
config = function()
|
||||||
|
require("catppuccin").setup({
|
||||||
|
flavour = "mocha",
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
-- {
|
||||||
|
-- "catppuccin/nvim",
|
||||||
|
-- lazy = true,
|
||||||
|
-- --name = "catppuccin",
|
||||||
|
-- priority = 1000,
|
||||||
|
-- config = function()
|
||||||
|
-- -- require("catppuccin").setup({
|
||||||
|
-- -- flavour = "mocha",
|
||||||
|
-- -- background = {
|
||||||
|
-- -- light = "latte",
|
||||||
|
-- -- dark = "mocha",
|
||||||
|
-- -- },
|
||||||
|
-- -- transparent_background = true,
|
||||||
|
-- -- })
|
||||||
|
-- vim.cmd.colorscheme("catppuccin") --mocha"
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
--}
|
||||||
45
nvim.org/.config/nvim/lua/plugins/completions.lua
Normal file
45
nvim.org/.config/nvim/lua/plugins/completions.lua
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"hrsh7th/cmp-nvim-lsp"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
dependencies = {
|
||||||
|
"saadparwaiz1/cmp_luasnip",
|
||||||
|
"rafamadriz/friendly-snippets",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
config = function()
|
||||||
|
local cmp = require("cmp")
|
||||||
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
|
|
||||||
|
cmp.setup({
|
||||||
|
snippet = {
|
||||||
|
expand = function(args)
|
||||||
|
require("luasnip").lsp_expand(args.body)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
window = {
|
||||||
|
completion = cmp.config.window.bordered(),
|
||||||
|
documentation = cmp.config.window.bordered(),
|
||||||
|
},
|
||||||
|
mapping = cmp.mapping.preset.insert({
|
||||||
|
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||||
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
|
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||||
|
}),
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
{ name = "nvim_lsp" },
|
||||||
|
{ name = "luasnip" }, -- For luasnip users.
|
||||||
|
{ name = "orgmode" },
|
||||||
|
}, {
|
||||||
|
{ name = "buffer" },
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
14
nvim.org/.config/nvim/lua/plugins/git-stuff.lua
Normal file
14
nvim.org/.config/nvim/lua/plugins/git-stuff.lua
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"tpope/vim-fugitive"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"lewis6991/gitsigns.nvim",
|
||||||
|
config = function()
|
||||||
|
require("gitsigns").setup()
|
||||||
|
|
||||||
|
-- vim.keymap.set("n", "<leader>gp", ":Gitsigns preview_hunk<CR>", {})
|
||||||
|
-- vim.keymap.set("n", "<leader>gt", ":Gitsigns toggle_current_line_blame<CR>", {})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
}
|
||||||
43
nvim.org/.config/nvim/lua/plugins/lsp-config.lua
Normal file
43
nvim.org/.config/nvim/lua/plugins/lsp-config.lua
Normal file
|
|
@ -0,0 +1,43 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
'williamboman/mason.nvim',
|
||||||
|
config = function()
|
||||||
|
require("mason").setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'williamboman/mason-lspconfig.nvim',
|
||||||
|
config = function()
|
||||||
|
require("mason-lspconfig").setup({
|
||||||
|
ensure_installed = { "lua_ls", "bashls", "cssls", "docker_compose_language_service", "html", "yamlls" }
|
||||||
|
})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'neovim/nvim-lspconfig',
|
||||||
|
config = function()
|
||||||
|
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||||
|
local lspconfig = require("lspconfig")
|
||||||
|
lspconfig.lua_ls.setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
lspconfig.bashls.setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
lspconfig.cssls.setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
lspconfig.html.setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
lspconfig.yamlls.setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
vim.keymap.set('n', 'K', vim.lsp.buf.hover, {})
|
||||||
|
vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition, {})
|
||||||
|
vim.keymap.set('n', '<leader>gr', vim.lsp.buf.references, {})
|
||||||
|
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, {})
|
||||||
|
end
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
9
nvim.org/.config/nvim/lua/plugins/lualine.lua
Normal file
9
nvim.org/.config/nvim/lua/plugins/lualine.lua
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"nvim-lualine/lualine.nvim",
|
||||||
|
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
|
config = function()
|
||||||
|
require('lualine').setup()
|
||||||
|
end
|
||||||
|
},
|
||||||
|
}
|
||||||
6
nvim.org/.config/nvim/lua/plugins/neorg.lua
Normal file
6
nvim.org/.config/nvim/lua/plugins/neorg.lua
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
return {
|
||||||
|
"nvim-neorg/neorg",
|
||||||
|
lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
|
||||||
|
version = "*", -- Pin Neorg to the latest stable release
|
||||||
|
config = true,
|
||||||
|
}
|
||||||
13
nvim.org/.config/nvim/lua/plugins/neotree.lua
Normal file
13
nvim.org/.config/nvim/lua/plugins/neotree.lua
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
return {
|
||||||
|
"nvim-neo-tree/neo-tree.nvim",
|
||||||
|
branch = "v3.x",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
"MunifTanjim/nui.nvim",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
vim.keymap.set("n", "<C-n>", ":Neotree filesystem reveal left<CR>", {})
|
||||||
|
vim.keymap.set("n", "<leader>bf", ":Neotree buffers reveal float<CR>", {})
|
||||||
|
end,
|
||||||
|
}
|
||||||
17
nvim.org/.config/nvim/lua/plugins/none-ls.lua
Normal file
17
nvim.org/.config/nvim/lua/plugins/none-ls.lua
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
return {
|
||||||
|
"nvimtools/none-ls.nvim",
|
||||||
|
dependencies = {
|
||||||
|
"nvimtools/none-ls-extras.nvim",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
local null_ls = require("null-ls")
|
||||||
|
null_ls.setup({
|
||||||
|
sources = {
|
||||||
|
null_ls.builtins.formatting.stylua,
|
||||||
|
null_ls.builtins.formatting.prettier,
|
||||||
|
require("none-ls.diagnostics.eslint_d"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
return {
|
||||||
|
'christoomey/vim-tmux-navigator',
|
||||||
|
vim.keymap.set('n','C-h',':TmuxNavigateLeft<CR>'),
|
||||||
|
vim.keymap.set('n','C-j',':TmuxNavigateDown<CR>'),
|
||||||
|
vim.keymap.set('n','C-k',':TmuxNavigateUp<CR>'),
|
||||||
|
vim.keymap.set('n','C-l',':TmuxNavigateRight<CR>'),
|
||||||
|
}
|
||||||
8
nvim.org/.config/nvim/lua/plugins/oil.lua
Normal file
8
nvim.org/.config/nvim/lua/plugins/oil.lua
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
return {
|
||||||
|
"stevearc/oil.nvim",
|
||||||
|
config = function()
|
||||||
|
local oil = require("oil")
|
||||||
|
oil.setup()
|
||||||
|
vim.keymap.set("n", "-", oil.toggle_float, {})
|
||||||
|
end,
|
||||||
|
}
|
||||||
19
nvim.org/.config/nvim/lua/plugins/orgmode.lua.disabled
Normal file
19
nvim.org/.config/nvim/lua/plugins/orgmode.lua.disabled
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
return {
|
||||||
|
'nvim-orgmode/orgmode',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
ft = { 'org' },
|
||||||
|
config = function()
|
||||||
|
-- Setup orgmode
|
||||||
|
require('orgmode').setup({
|
||||||
|
org_agenda_files = '~/orgfiles/**/*',
|
||||||
|
org_default_notes_file = '~/orgfiles/refile.org',
|
||||||
|
})
|
||||||
|
|
||||||
|
-- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
|
||||||
|
-- add ~org~ to ignore_install
|
||||||
|
-- require('nvim-treesitter.configs').setup({
|
||||||
|
-- ensure_installed = 'all',
|
||||||
|
-- ignore_install = { 'org' },
|
||||||
|
-- })
|
||||||
|
end,
|
||||||
|
}
|
||||||
25
nvim.org/.config/nvim/lua/plugins/telescope.lua
Normal file
25
nvim.org/.config/nvim/lua/plugins/telescope.lua
Normal file
|
|
@ -0,0 +1,25 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"nvim-telescope/telescope-ui-select.nvim",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"nvim-telescope/telescope.nvim",
|
||||||
|
tag = "0.1.5",
|
||||||
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
|
config = function()
|
||||||
|
require("telescope").setup({
|
||||||
|
extensions = {
|
||||||
|
["ui-select"] = {
|
||||||
|
require("telescope.themes").get_dropdown({}),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
local builtin = require("telescope.builtin")
|
||||||
|
vim.keymap.set("n", "<C-p>", builtin.find_files, {})
|
||||||
|
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
|
||||||
|
vim.keymap.set("n", "<leader><leader>", builtin.oldfiles, {})
|
||||||
|
|
||||||
|
require("telescope").load_extension("ui-select")
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
14
nvim.org/.config/nvim/lua/plugins/treesitter.lua
Normal file
14
nvim.org/.config/nvim/lua/plugins/treesitter.lua
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
build = ":TSUpdate",
|
||||||
|
config = function()
|
||||||
|
local config = require("nvim-treesitter.configs")
|
||||||
|
config.setup({
|
||||||
|
auto_install = true,
|
||||||
|
highlight = { enable = true },
|
||||||
|
indent = { enable = true },
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
|
}
|
||||||
13
nvim.org/.config/nvim/lua/vim-options.lua
Normal file
13
nvim.org/.config/nvim/lua/vim-options.lua
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
vim.cmd("set expandtab")
|
||||||
|
vim.cmd("set tabstop=2")
|
||||||
|
vim.cmd("set softtabstop=2")
|
||||||
|
vim.cmd("set shiftwidth=2")
|
||||||
|
vim.g.background = "dark"
|
||||||
|
|
||||||
|
vim.opt.swapfile = false
|
||||||
|
|
||||||
|
vim.cmd.colorscheme "catppuccin-mocha"
|
||||||
|
vim.wo.number = true
|
||||||
|
|
||||||
|
vim.cmd("set mouse=")
|
||||||
|
vim.g.mapleader = " "
|
||||||
|
|
@ -18,7 +18,7 @@ vim.opt.rtp:prepend(lazypath)
|
||||||
-- Make sure to setup `mapleader` and `maplocalleader` before
|
-- Make sure to setup `mapleader` and `maplocalleader` before
|
||||||
-- loading lazy.nvim so that mappings are correct.
|
-- loading lazy.nvim so that mappings are correct.
|
||||||
-- This is also a good place to setup other settings (vim.opt)
|
-- This is also a good place to setup other settings (vim.opt)
|
||||||
vim.g.mapleader = ","
|
vim.g.mapleader = " "
|
||||||
vim.g.maplocalleader = "\\"
|
vim.g.maplocalleader = "\\"
|
||||||
|
|
||||||
require("config.options")
|
require("config.options")
|
||||||
|
|
@ -39,4 +39,4 @@ require("lazy").setup({
|
||||||
require("config.keymaps")
|
require("config.keymaps")
|
||||||
|
|
||||||
-- For video recording purposes
|
-- For video recording purposes
|
||||||
-- vim.cmd("ShowkeysToggle")
|
--vim.cmd("ShowkeysToggle")
|
||||||
|
|
|
||||||
1
nvim2/.config/nvim/init.lua
Normal file
1
nvim2/.config/nvim/init.lua
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
require("config.lazy")
|
||||||
10
nvim2/.config/nvim/lua/config/keymaps.lua
Normal file
10
nvim2/.config/nvim/lua/config/keymaps.lua
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
vim.keymap.set("n", "-", "<cmd>Oil --float<CR>", { desc = "Open Parent Directory in Oil" })
|
||||||
|
vim.keymap.set("n", "gl", function()
|
||||||
|
vim.diagnostic.open_float()
|
||||||
|
end, { desc = "Open Diagnostics in Float" })
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>cf", function()
|
||||||
|
require("conform").format({
|
||||||
|
lsp_format = "fallback",
|
||||||
|
})
|
||||||
|
end, { desc = "Format current file" })
|
||||||
42
nvim2/.config/nvim/lua/config/lazy.lua
Normal file
42
nvim2/.config/nvim/lua/config/lazy.lua
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
-- Bootstrap lazy.nvim
|
||||||
|
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||||
|
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||||
|
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||||
|
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||||
|
if vim.v.shell_error ~= 0 then
|
||||||
|
vim.api.nvim_echo({
|
||||||
|
{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
|
||||||
|
{ out, "WarningMsg" },
|
||||||
|
{ "\nPress any key to exit..." },
|
||||||
|
}, true, {})
|
||||||
|
vim.fn.getchar()
|
||||||
|
os.exit(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
vim.opt.rtp:prepend(lazypath)
|
||||||
|
|
||||||
|
-- Make sure to setup `mapleader` and `maplocalleader` before
|
||||||
|
-- loading lazy.nvim so that mappings are correct.
|
||||||
|
-- This is also a good place to setup other settings (vim.opt)
|
||||||
|
vim.g.mapleader = ","
|
||||||
|
vim.g.maplocalleader = "\\"
|
||||||
|
|
||||||
|
require("config.options")
|
||||||
|
|
||||||
|
-- Setup lazy.nvim
|
||||||
|
require("lazy").setup({
|
||||||
|
spec = {
|
||||||
|
-- import your plugins
|
||||||
|
{ import = "plugins" },
|
||||||
|
},
|
||||||
|
-- Configure any other settings here. See the documentation for more details.
|
||||||
|
-- colorscheme that will be used when installing plugins.
|
||||||
|
install = { colorscheme = { "kanagawa" } },
|
||||||
|
-- automatically check for plugin updates
|
||||||
|
checker = { enabled = true },
|
||||||
|
})
|
||||||
|
|
||||||
|
require("config.keymaps")
|
||||||
|
|
||||||
|
-- For video recording purposes
|
||||||
|
-- vim.cmd("ShowkeysToggle")
|
||||||
53
nvim2/.config/nvim/lua/config/options.lua
Normal file
53
nvim2/.config/nvim/lua/config/options.lua
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
-- Some keyboard mappings as I don't want to break my fingers, while typing on a "german" keyboard ;)
|
||||||
|
vim.opt.langmap = "+]ü["
|
||||||
|
-- Plain langmap remapping does not seem to do the trick :(
|
||||||
|
vim.keymap.set("n", "ü", "[", { remap = true })
|
||||||
|
|
||||||
|
vim.opt.expandtab = true -- Convert tabs to spaces
|
||||||
|
vim.opt.shiftwidth = 4 -- Amount to indent with << and >>
|
||||||
|
vim.opt.tabstop = 4 -- How many spaces are shown per Tab
|
||||||
|
vim.opt.softtabstop = 4 -- How many spaces are applied when pressing Tab
|
||||||
|
|
||||||
|
vim.opt.smarttab = true
|
||||||
|
vim.opt.smartindent = true
|
||||||
|
vim.opt.autoindent = true -- Keep identation from previous line
|
||||||
|
|
||||||
|
-- Enable break indent
|
||||||
|
vim.opt.breakindent = true
|
||||||
|
|
||||||
|
-- Always show relative line numbers
|
||||||
|
vim.opt.number = true
|
||||||
|
vim.opt.relativenumber = true
|
||||||
|
|
||||||
|
-- Show line under cursor
|
||||||
|
vim.opt.cursorline = true
|
||||||
|
|
||||||
|
-- Store undos between sessions
|
||||||
|
vim.opt.undofile = true
|
||||||
|
|
||||||
|
-- Enable mouse mode, can be useful for resizing splits for example!
|
||||||
|
vim.opt.mouse = "a"
|
||||||
|
|
||||||
|
-- Don't show the mode, since it's already in the status line
|
||||||
|
vim.opt.showmode = false
|
||||||
|
|
||||||
|
-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
|
||||||
|
vim.opt.ignorecase = true
|
||||||
|
vim.opt.smartcase = true
|
||||||
|
|
||||||
|
-- Keep signcolumn on by default
|
||||||
|
vim.opt.signcolumn = "yes"
|
||||||
|
|
||||||
|
-- Configure how new splits should be opened
|
||||||
|
vim.opt.splitright = true
|
||||||
|
vim.opt.splitbelow = true
|
||||||
|
|
||||||
|
-- Sets how neovim will display certain whitespace characters in the editor.
|
||||||
|
-- See `:help 'list'`
|
||||||
|
-- and `:help 'listchars'`
|
||||||
|
vim.opt.list = true
|
||||||
|
vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" }
|
||||||
|
|
||||||
|
-- Minimal number of screen lines to keep above and below the cursor.
|
||||||
|
vim.opt.scrolloff = 5
|
||||||
|
|
||||||
110
nvim2/.config/nvim/lua/plugins/blink-cmp.lua
Normal file
110
nvim2/.config/nvim/lua/plugins/blink-cmp.lua
Normal file
|
|
@ -0,0 +1,110 @@
|
||||||
|
return {
|
||||||
|
{
|
||||||
|
"saghen/blink.compat",
|
||||||
|
-- use the latest release, via version = '*', if you also use the latest release for blink.cmp
|
||||||
|
version = "*",
|
||||||
|
-- lazy.nvim will automatically load the plugin when it's required by blink.cmp
|
||||||
|
lazy = true,
|
||||||
|
-- make sure to set opts so that lazy.nvim calls blink.compat's setup
|
||||||
|
opts = {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
-- optional: provides snippets for the snippet source
|
||||||
|
dependencies = {
|
||||||
|
"rafamadriz/friendly-snippets",
|
||||||
|
"moyiz/blink-emoji.nvim",
|
||||||
|
"ray-x/cmp-sql",
|
||||||
|
},
|
||||||
|
|
||||||
|
-- use a release tag to download pre-built binaries
|
||||||
|
version = "1.*",
|
||||||
|
-- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
|
||||||
|
-- build = 'cargo build --release',
|
||||||
|
-- If you use nix, you can build from source using latest nightly rust with:
|
||||||
|
-- build = 'nix run .#build-plugin',
|
||||||
|
|
||||||
|
---@module 'blink.cmp'
|
||||||
|
---@type blink.cmp.Config
|
||||||
|
opts = {
|
||||||
|
-- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
|
||||||
|
-- 'super-tab' for mappings similar to vscode (tab to accept)
|
||||||
|
-- 'enter' for enter to accept
|
||||||
|
-- 'none' for no mappings
|
||||||
|
--
|
||||||
|
-- All presets have the following mappings:
|
||||||
|
-- C-space: Open menu or open docs if already open
|
||||||
|
-- C-n/C-p or Up/Down: Select next/previous item
|
||||||
|
-- C-e: Hide menu
|
||||||
|
-- C-k: Toggle signature help (if signature.enabled = true)
|
||||||
|
--
|
||||||
|
-- See :h blink-cmp-config-keymap for defining your own keymap
|
||||||
|
keymap = {
|
||||||
|
preset = "default",
|
||||||
|
["<C-Z>"] = { "accept", "fallback" },
|
||||||
|
},
|
||||||
|
|
||||||
|
appearance = {
|
||||||
|
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
||||||
|
-- Adjusts spacing to ensure icons are aligned
|
||||||
|
nerd_font_variant = "mono",
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Only show the documentation popup when manually triggered
|
||||||
|
completion = { documentation = { auto_show = true } },
|
||||||
|
signature = { enabled = true },
|
||||||
|
|
||||||
|
-- Default list of enabled providers defined so that you can extend it
|
||||||
|
-- elsewhere in your config, without redefining it, due to `opts_extend`
|
||||||
|
sources = {
|
||||||
|
default = { "lsp", "path", "snippets", "buffer", "emoji", "sql" },
|
||||||
|
providers = {
|
||||||
|
emoji = {
|
||||||
|
module = "blink-emoji",
|
||||||
|
name = "Emoji",
|
||||||
|
score_offset = 15, -- Tune by preference
|
||||||
|
opts = { insert = true }, -- Insert emoji (default) or complete its name
|
||||||
|
should_show_items = function()
|
||||||
|
return vim.tbl_contains(
|
||||||
|
-- Enable emoji completion only for git commits and markdown.
|
||||||
|
-- By default, enabled for all file-types.
|
||||||
|
{ "gitcommit", "markdown" },
|
||||||
|
vim.o.filetype
|
||||||
|
)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
sql = {
|
||||||
|
-- IMPORTANT: use the same name as you would for nvim-cmp
|
||||||
|
name = "sql",
|
||||||
|
module = "blink.compat.source",
|
||||||
|
|
||||||
|
-- all blink.cmp source config options work as normal:
|
||||||
|
score_offset = -3,
|
||||||
|
|
||||||
|
-- this table is passed directly to the proxied completion source
|
||||||
|
-- as the `option` field in nvim-cmp's source config
|
||||||
|
--
|
||||||
|
-- this is NOT the same as the opts in a plugin's lazy.nvim spec
|
||||||
|
opts = {},
|
||||||
|
should_show_items = function()
|
||||||
|
return vim.tbl_contains(
|
||||||
|
-- Enable emoji completion only for git commits and markdown.
|
||||||
|
-- By default, enabled for all file-types.
|
||||||
|
{ "sql" },
|
||||||
|
vim.o.filetype
|
||||||
|
)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
|
||||||
|
-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
|
||||||
|
-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
|
||||||
|
--
|
||||||
|
-- See the fuzzy documentation for more information
|
||||||
|
fuzzy = { implementation = "prefer_rust_with_warning" },
|
||||||
|
},
|
||||||
|
opts_extend = { "sources.default" },
|
||||||
|
},
|
||||||
|
}
|
||||||
20
nvim2/.config/nvim/lua/plugins/conform.lua
Normal file
20
nvim2/.config/nvim/lua/plugins/conform.lua
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
return {
|
||||||
|
"stevearc/conform.nvim",
|
||||||
|
opts = {
|
||||||
|
formatters_by_ft = {
|
||||||
|
lua = { "stylua" },
|
||||||
|
-- Conform will run multiple formatters sequentially
|
||||||
|
python = { "isort", "black" },
|
||||||
|
-- You can customize some of the format options for the filetype (:help conform.format)
|
||||||
|
rust = { "rustfmt" },
|
||||||
|
-- Conform will run the first available formatter
|
||||||
|
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
|
typescript = { "prettierd", "prettier", stop_after_first = true },
|
||||||
|
},
|
||||||
|
format_on_save = {
|
||||||
|
-- These options will be passed to conform.format()
|
||||||
|
timeout_ms = 500,
|
||||||
|
lsp_format = "fallback",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
4
nvim2/.config/nvim/lua/plugins/dressing.lua
Normal file
4
nvim2/.config/nvim/lua/plugins/dressing.lua
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
return {
|
||||||
|
'stevearc/dressing.nvim',
|
||||||
|
opts = {},
|
||||||
|
}
|
||||||
95
nvim2/.config/nvim/lua/plugins/fzflua.lua
Normal file
95
nvim2/.config/nvim/lua/plugins/fzflua.lua
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
return {
|
||||||
|
"ibhagwan/fzf-lua",
|
||||||
|
-- optional for icon support
|
||||||
|
-- dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||||
|
-- or if using mini.icons/mini.nvim
|
||||||
|
dependencies = { "echasnovski/mini.icons" },
|
||||||
|
opts = {},
|
||||||
|
keys={
|
||||||
|
{
|
||||||
|
"<leader>ff",
|
||||||
|
function() require('fzf-lua').files() end,
|
||||||
|
desc="Find Files in project directory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fg",
|
||||||
|
function() require('fzf-lua').live_grep() end,
|
||||||
|
desc="Find by grepping in project directory"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fc",
|
||||||
|
function() require('fzf-lua').files({cwd=vim.fn.stdpath("config")}) end,
|
||||||
|
desc="Find in neovim configuration"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fh",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").helptags()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [H]elp",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fk",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").keymaps()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [K]eymaps",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fb",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").builtin()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [B]uiltin FZF",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fw",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").grep_cword()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind current [W]ord",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fW",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").grep_cWORD()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind current [W]ORD",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fd",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").diagnostics_document()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [D]iagnostics",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fr",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").resume()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [R]esume",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>fo",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").oldfiles()
|
||||||
|
end,
|
||||||
|
desc = "[F]ind [O]ld Files",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader><leader>",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").buffers()
|
||||||
|
end,
|
||||||
|
desc = "[,] Find existing buffers",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>/",
|
||||||
|
function()
|
||||||
|
require("fzf-lua").lgrep_curbuf()
|
||||||
|
end,
|
||||||
|
desc = "[/] Live grep the current buffer",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
21
nvim2/.config/nvim/lua/plugins/kanagawa.lua
Normal file
21
nvim2/.config/nvim/lua/plugins/kanagawa.lua
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
return {
|
||||||
|
"rebelot/kanagawa.nvim",
|
||||||
|
branch="master",
|
||||||
|
config=function()
|
||||||
|
require('kanagawa').setup({
|
||||||
|
transparent=true,
|
||||||
|
overrides=function(colors)
|
||||||
|
return {
|
||||||
|
["@markup.link.url.markdown_inline"] = { link = "Special" }, -- (url)
|
||||||
|
["@markup.link.label.markdown_inline"] = { link = "WarningMsg" }, -- [label]
|
||||||
|
["@markup.italic.markdown_inline"] = { link = "Exception" }, -- *italic*
|
||||||
|
["@markup.raw.markdown_inline"] = { link = "String" }, -- `code`
|
||||||
|
["@markup.list.markdown"] = { link = "Function" }, -- + list
|
||||||
|
["@markup.quote.markdown"] = { link = "Error" }, -- > blockcode
|
||||||
|
["@markup.list.checked.markdown"] = { link = "WarningMsg" } -- - [X] checked list item
|
||||||
|
}
|
||||||
|
end
|
||||||
|
});
|
||||||
|
vim.cmd("colorscheme kanagawa");
|
||||||
|
end,
|
||||||
|
}
|
||||||
272
nvim2/.config/nvim/lua/plugins/lsp.lua
Normal file
272
nvim2/.config/nvim/lua/plugins/lsp.lua
Normal file
|
|
@ -0,0 +1,272 @@
|
||||||
|
return {
|
||||||
|
-- Main LSP Configuration
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
dependencies = {
|
||||||
|
-- Automatically install LSPs and related tools to stdpath for Neovim
|
||||||
|
-- Mason must be loaded before its dependents so we need to set it up here.
|
||||||
|
-- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
|
||||||
|
{ "williamboman/mason.nvim", opts = {} },
|
||||||
|
"williamboman/mason-lspconfig.nvim",
|
||||||
|
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||||
|
|
||||||
|
-- Useful status updates for LSP.
|
||||||
|
{ "j-hui/fidget.nvim", opts = {} },
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
-- Brief aside: **What is LSP?**
|
||||||
|
--
|
||||||
|
-- LSP is an initialism you've probably heard, but might not understand what it is.
|
||||||
|
--
|
||||||
|
-- LSP stands for Language Server Protocol. It's a protocol that helps editors
|
||||||
|
-- and language tooling communicate in a standardized fashion.
|
||||||
|
--
|
||||||
|
-- In general, you have a "server" which is some tool built to understand a particular
|
||||||
|
-- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
|
||||||
|
-- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
|
||||||
|
-- processes that communicate with some "client" - in this case, Neovim!
|
||||||
|
--
|
||||||
|
-- LSP provides Neovim with features like:
|
||||||
|
-- - Go to definition
|
||||||
|
-- - Find references
|
||||||
|
-- - Autocompletion
|
||||||
|
-- - Symbol Search
|
||||||
|
-- - and more!
|
||||||
|
--
|
||||||
|
-- Thus, Language Servers are external tools that must be installed separately from
|
||||||
|
-- Neovim. This is where `mason` and related plugins come into play.
|
||||||
|
--
|
||||||
|
-- If you're wondering about lsp vs treesitter, you can check out the wonderfully
|
||||||
|
-- and elegantly composed help section, `:help lsp-vs-treesitter`
|
||||||
|
|
||||||
|
-- This function gets run when an LSP attaches to a particular buffer.
|
||||||
|
-- That is to say, every time a new file is opened that is associated with
|
||||||
|
-- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
|
||||||
|
-- function will be executed to configure the current buffer
|
||||||
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
|
group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
|
||||||
|
callback = function(event)
|
||||||
|
-- NOTE: Remember that Lua is a real programming language, and as such it is possible
|
||||||
|
-- to define small helper and utility functions so you don't have to repeat yourself.
|
||||||
|
--
|
||||||
|
-- In this case, we create a function that lets us more easily define mappings specific
|
||||||
|
-- for LSP related items. It sets the mode, buffer and description for us each time.
|
||||||
|
local map = function(keys, func, desc, mode)
|
||||||
|
mode = mode or "n"
|
||||||
|
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Jump to the definition of the word under your cursor.
|
||||||
|
-- This is where a variable was first declared, or where a function is defined, etc.
|
||||||
|
-- To jump back, press <C-t>.
|
||||||
|
map("gd", require("fzf-lua").lsp_definitions, "[G]oto [D]efinition")
|
||||||
|
|
||||||
|
-- Find references for the word under your cursor.
|
||||||
|
map("gr", require("fzf-lua").lsp_references, "[G]oto [R]eferences")
|
||||||
|
|
||||||
|
-- Jump to the implementation of the word under your cursor.
|
||||||
|
-- Useful when your language has ways of declaring types without an actual implementation.
|
||||||
|
map("gI", require("fzf-lua").lsp_implementations, "[G]oto [I]mplementation")
|
||||||
|
|
||||||
|
-- Jump to the type of the word under your cursor.
|
||||||
|
-- Useful when you're not sure what type a variable is and you want to see
|
||||||
|
-- the definition of its *type*, not where it was *defined*.
|
||||||
|
map("<leader>D", require("fzf-lua").lsp_typedefs, "Type [D]efinition")
|
||||||
|
|
||||||
|
-- Fuzzy find all the symbols in your current document.
|
||||||
|
-- Symbols are things like variables, functions, types, etc.
|
||||||
|
map("<leader>ds", require("fzf-lua").lsp_document_symbols, "[D]ocument [S]ymbols")
|
||||||
|
|
||||||
|
-- Fuzzy find all the symbols in your current workspace.
|
||||||
|
-- Similar to document symbols, except searches over your entire project.
|
||||||
|
map("<leader>ws", require("fzf-lua").lsp_live_workspace_symbols, "[W]orkspace [S]ymbols")
|
||||||
|
|
||||||
|
-- Rename the variable under your cursor.
|
||||||
|
-- Most Language Servers support renaming across files, etc.
|
||||||
|
map("<leader>cr", vim.lsp.buf.rename, "[R]e[n]ame")
|
||||||
|
|
||||||
|
-- Execute a code action, usually your cursor needs to be on top of an error
|
||||||
|
-- or a suggestion from your LSP for this to activate.
|
||||||
|
map("<leader>ca", vim.lsp.buf.code_action, "[C]ode [A]ction", { "n", "x" })
|
||||||
|
|
||||||
|
-- WARN: This is not Goto Definition, this is Goto Declaration.
|
||||||
|
-- For example, in C this would take you to the header.
|
||||||
|
map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
|
||||||
|
|
||||||
|
-- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
|
||||||
|
---@param client vim.lsp.Client
|
||||||
|
---@param method vim.lsp.protocol.Method
|
||||||
|
---@param bufnr? integer some lsp support methods only in specific files
|
||||||
|
---@return boolean
|
||||||
|
local function client_supports_method(client, method, bufnr)
|
||||||
|
if vim.fn.has("nvim-0.11") == 1 then
|
||||||
|
return client:supports_method(method, bufnr)
|
||||||
|
else
|
||||||
|
return client.supports_method(method, { bufnr = bufnr })
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- The following two autocommands are used to highlight references of the
|
||||||
|
-- word under your cursor when your cursor rests there for a little while.
|
||||||
|
-- See `:help CursorHold` for information about when this is executed
|
||||||
|
--
|
||||||
|
-- When you move your cursor, the highlights will be cleared (the second autocommand).
|
||||||
|
local client = vim.lsp.get_client_by_id(event.data.client_id)
|
||||||
|
if
|
||||||
|
client
|
||||||
|
and client_supports_method(
|
||||||
|
client,
|
||||||
|
vim.lsp.protocol.Methods.textDocument_documentHighlight,
|
||||||
|
event.buf
|
||||||
|
)
|
||||||
|
then
|
||||||
|
local highlight_augroup = vim.api.nvim_create_augroup("kickstart-lsp-highlight", { clear = false })
|
||||||
|
vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
|
||||||
|
buffer = event.buf,
|
||||||
|
group = highlight_augroup,
|
||||||
|
callback = vim.lsp.buf.document_highlight,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
|
||||||
|
buffer = event.buf,
|
||||||
|
group = highlight_augroup,
|
||||||
|
callback = vim.lsp.buf.clear_references,
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd("LspDetach", {
|
||||||
|
group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }),
|
||||||
|
callback = function(event2)
|
||||||
|
vim.lsp.buf.clear_references()
|
||||||
|
vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf })
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
||||||
|
-- The following code creates a keymap to toggle inlay hints in your
|
||||||
|
-- code, if the language server you are using supports them
|
||||||
|
--
|
||||||
|
-- This may be unwanted, since they displace some of your code
|
||||||
|
if
|
||||||
|
client
|
||||||
|
and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf)
|
||||||
|
then
|
||||||
|
map("<leader>th", function()
|
||||||
|
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
|
||||||
|
end, "[T]oggle Inlay [H]ints")
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Diagnostic Config
|
||||||
|
-- See :help vim.diagnostic.Opts
|
||||||
|
vim.diagnostic.config({
|
||||||
|
severity_sort = true,
|
||||||
|
float = { border = "rounded", source = "if_many" },
|
||||||
|
underline = { severity = vim.diagnostic.severity.ERROR },
|
||||||
|
signs = {
|
||||||
|
text = {
|
||||||
|
[vim.diagnostic.severity.ERROR] = " ",
|
||||||
|
[vim.diagnostic.severity.WARN] = " ",
|
||||||
|
[vim.diagnostic.severity.INFO] = " ",
|
||||||
|
[vim.diagnostic.severity.HINT] = " ",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
virtual_text = {
|
||||||
|
source = "if_many",
|
||||||
|
spacing = 2,
|
||||||
|
format = function(diagnostic)
|
||||||
|
local diagnostic_message = {
|
||||||
|
[vim.diagnostic.severity.ERROR] = diagnostic.message,
|
||||||
|
[vim.diagnostic.severity.WARN] = diagnostic.message,
|
||||||
|
[vim.diagnostic.severity.INFO] = diagnostic.message,
|
||||||
|
[vim.diagnostic.severity.HINT] = diagnostic.message,
|
||||||
|
}
|
||||||
|
return diagnostic_message[diagnostic.severity]
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- LSP servers and clients are able to communicate to each other what features they support.
|
||||||
|
-- By default, Neovim doesn't support everything that is in the LSP specification.
|
||||||
|
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
|
||||||
|
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
|
||||||
|
local original_capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
local capabilities = require("blink.cmp").get_lsp_capabilities(original_capabilities)
|
||||||
|
-- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
||||||
|
|
||||||
|
-- Enable the following language servers
|
||||||
|
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
||||||
|
--
|
||||||
|
-- Add any additional override configuration in the following tables. Available keys are:
|
||||||
|
-- - cmd (table): Override the default command used to start the server
|
||||||
|
-- - filetypes (table): Override the default list of associated filetypes for the server
|
||||||
|
-- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
|
||||||
|
-- - settings (table): Override the default settings passed when initializing the server.
|
||||||
|
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
|
||||||
|
local servers = {
|
||||||
|
bashls = {},
|
||||||
|
marksman = {},
|
||||||
|
-- clangd = {},
|
||||||
|
-- gopls = {},
|
||||||
|
-- pyright = {},
|
||||||
|
-- rust_analyzer = {},
|
||||||
|
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
|
||||||
|
--
|
||||||
|
-- Some languages (like typescript) have entire language plugins that can be useful:
|
||||||
|
-- https://github.com/pmizio/typescript-tools.nvim
|
||||||
|
--
|
||||||
|
-- But for many setups, the LSP (`ts_ls`) will work just fine
|
||||||
|
-- ts_ls = {},
|
||||||
|
--
|
||||||
|
|
||||||
|
lua_ls = {
|
||||||
|
-- cmd = { ... },
|
||||||
|
-- filetypes = { ... },
|
||||||
|
-- capabilities = {},
|
||||||
|
-- settings = {
|
||||||
|
-- Lua = {
|
||||||
|
-- completion = {
|
||||||
|
-- callSnippet = 'Replace',
|
||||||
|
-- },
|
||||||
|
-- -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
|
||||||
|
-- -- diagnostics = { disable = { 'missing-fields' } },
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Ensure the servers and tools above are installed
|
||||||
|
--
|
||||||
|
-- To check the current status of installed tools and/or manually install
|
||||||
|
-- other tools, you can run
|
||||||
|
-- :Mason
|
||||||
|
--
|
||||||
|
-- You can press `g?` for help in this menu.
|
||||||
|
--
|
||||||
|
-- `mason` had to be setup earlier: to configure its options see the
|
||||||
|
-- `dependencies` table for `nvim-lspconfig` above.
|
||||||
|
--
|
||||||
|
-- You can add other tools here that you want Mason to install
|
||||||
|
-- for you, so that they are available from within Neovim.
|
||||||
|
local ensure_installed = vim.tbl_keys(servers or {})
|
||||||
|
vim.list_extend(ensure_installed, {
|
||||||
|
"stylua", -- Used to format Lua code
|
||||||
|
"prettierd", -- Used to format javascript and typescript code
|
||||||
|
})
|
||||||
|
require("mason-tool-installer").setup({ ensure_installed = ensure_installed })
|
||||||
|
|
||||||
|
require("mason-lspconfig").setup({
|
||||||
|
ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer)
|
||||||
|
automatic_installation = false,
|
||||||
|
handlers = {
|
||||||
|
function(server_name)
|
||||||
|
local server = servers[server_name] or {}
|
||||||
|
-- This handles overriding only values explicitly passed
|
||||||
|
-- by the server configuration above. Useful when disabling
|
||||||
|
-- certain features of an LSP (for example, turning off formatting for ts_ls)
|
||||||
|
server.capabilities = vim.tbl_deep_extend("force", {}, capabilities, server.capabilities or {})
|
||||||
|
require("lspconfig")[server_name].setup(server)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
return {
|
||||||
|
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-treesitter/nvim-treesitter"
|
||||||
|
},
|
||||||
|
init = function()
|
||||||
|
local config = require'nvim-treesitter.configs';
|
||||||
|
config.setup({
|
||||||
|
textobjects = {
|
||||||
|
select = {
|
||||||
|
enable = true,
|
||||||
|
|
||||||
|
-- Automatically jump forward to textobj, similar to targets.vim
|
||||||
|
lookahead = true,
|
||||||
|
|
||||||
|
keymaps = {
|
||||||
|
-- You can use the capture groups defined in textobjects.scm
|
||||||
|
["af"] = "@function.outer",
|
||||||
|
["if"] = "@function.inner",
|
||||||
|
["ac"] = "@class.outer",
|
||||||
|
["ao"] = "@comment.outer",
|
||||||
|
-- You can optionally set descriptions to the mappings (used in the desc parameter of
|
||||||
|
-- nvim_buf_set_keymap) which plugins like which-key display
|
||||||
|
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
|
||||||
|
-- You can also use captures from other query groups like `locals.scm`
|
||||||
|
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select language scope" },
|
||||||
|
},
|
||||||
|
-- You can choose the select mode (default is charwise 'v')
|
||||||
|
--
|
||||||
|
-- Can also be a function which gets passed a table with the keys
|
||||||
|
-- * query_string: eg '@function.inner'
|
||||||
|
-- * method: eg 'v' or 'o'
|
||||||
|
-- and should return the mode ('v', 'V', or '<c-v>') or a table
|
||||||
|
-- mapping query_strings to modes.
|
||||||
|
selection_modes = {
|
||||||
|
['@parameter.outer'] = 'v', -- charwise
|
||||||
|
['@function.outer'] = 'V', -- linewise
|
||||||
|
['@class.outer'] = '<c-v>', -- blockwise
|
||||||
|
},
|
||||||
|
-- If you set this to `true` (default is `false`) then any textobject is
|
||||||
|
-- extended to include preceding or succeeding whitespace. Succeeding
|
||||||
|
-- whitespace has priority in order to act similarly to eg the built-in
|
||||||
|
-- `ap`.
|
||||||
|
--
|
||||||
|
-- Can also be a function which gets passed a table with the keys
|
||||||
|
-- * query_string: eg '@function.inner'
|
||||||
|
-- * selection_mode: eg 'v'
|
||||||
|
-- and should return true or false
|
||||||
|
include_surrounding_whitespace = true,
|
||||||
|
},
|
||||||
|
swap = {
|
||||||
|
enable = true,
|
||||||
|
swap_next = {
|
||||||
|
["<leader>a"] = {query="@parameter.inner", desc="Swap with next parameter"},
|
||||||
|
},
|
||||||
|
swap_previous = {
|
||||||
|
["<leader>A"] = "@parameter.inner",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
end
|
||||||
|
}
|
||||||
27
nvim2/.config/nvim/lua/plugins/nvim-treesitter.lua
Normal file
27
nvim2/.config/nvim/lua/plugins/nvim-treesitter.lua
Normal file
|
|
@ -0,0 +1,27 @@
|
||||||
|
return {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
build = ":TSUpdate",
|
||||||
|
config = function ()
|
||||||
|
local configs = require("nvim-treesitter.configs")
|
||||||
|
|
||||||
|
configs.setup({
|
||||||
|
ensure_installed = {
|
||||||
|
"c", "lua", "vim", "vimdoc", "query", "elixir", "heex", "javascript", "html", "markdown", "markdown_inline"
|
||||||
|
},
|
||||||
|
auto_install = true,
|
||||||
|
sync_install = false,
|
||||||
|
highlight = { enable = true },
|
||||||
|
indent = { enable = true },
|
||||||
|
|
||||||
|
incremental_selection = {
|
||||||
|
enable = true,
|
||||||
|
keymaps = {
|
||||||
|
init_selection = "<Enter>", -- set to `false` to disable one of the mappings
|
||||||
|
node_incremental = "<Enter>",
|
||||||
|
scope_incremental = false,
|
||||||
|
node_decremental = "<Backspace>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
15
nvim2/.config/nvim/lua/plugins/oil.lua
Normal file
15
nvim2/.config/nvim/lua/plugins/oil.lua
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
return {
|
||||||
|
"stevearc/oil.nvim",
|
||||||
|
---@module 'oil'
|
||||||
|
---@type oil.SetupOpts
|
||||||
|
opts = {
|
||||||
|
view_options = {
|
||||||
|
show_hidden = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
-- Optional dependencies
|
||||||
|
dependencies = { { "echasnovski/mini.icons", opts = {} } },
|
||||||
|
-- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons
|
||||||
|
-- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations.
|
||||||
|
lazy = false,
|
||||||
|
}
|
||||||
40
nvim2/.config/nvim/lua/plugins/project.lua
Normal file
40
nvim2/.config/nvim/lua/plugins/project.lua
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
return {
|
||||||
|
"ahmedkhalf/project.nvim",
|
||||||
|
init = function()
|
||||||
|
require("project_nvim").setup {
|
||||||
|
-- your configuration comes her
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-- Absolutely minimal implementation of fzf-lua based project finder
|
||||||
|
-- for fzf-lua, due to request from @KrisWilliams1 (Maybe extended to a
|
||||||
|
-- full blown port from the original selector in the future)
|
||||||
|
local history = require("project_nvim.utils.history")
|
||||||
|
local project = require("project_nvim.project")
|
||||||
|
|
||||||
|
vim.api.nvim_create_user_command("FzfProjects", function()
|
||||||
|
local projects = history.get_recent_projects()
|
||||||
|
|
||||||
|
require("fzf-lua").fzf_exec(projects, {
|
||||||
|
prompt = "Projects> ",
|
||||||
|
actions = {
|
||||||
|
["default"] = function(selected)
|
||||||
|
if selected and #selected > 0 then
|
||||||
|
local project_path = selected[1]
|
||||||
|
if project.set_pwd(project_path, "fzf-lua") then
|
||||||
|
require("fzf-lua").files()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
}
|
||||||
|
})
|
||||||
|
end, {})
|
||||||
|
end,
|
||||||
|
keys = {
|
||||||
|
{
|
||||||
|
"<leader>fp", "<cmd>FzfProjects<CR>", desc="Find Recent Projects"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
5
nvim2/.config/nvim/lua/plugins/rustacean.lua
Normal file
5
nvim2/.config/nvim/lua/plugins/rustacean.lua
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
return {
|
||||||
|
'mrcjkb/rustaceanvim',
|
||||||
|
version = '^5', -- Recommended
|
||||||
|
lazy = false, -- This plugin is already lazy
|
||||||
|
}
|
||||||
7
nvim2/.config/nvim/lua/plugins/showkeys.lua
Normal file
7
nvim2/.config/nvim/lua/plugins/showkeys.lua
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
return {
|
||||||
|
"nvzone/showkeys",
|
||||||
|
cmd = "ShowkeysToggle",
|
||||||
|
opts={
|
||||||
|
maxkeys=5
|
||||||
|
}
|
||||||
|
}
|
||||||
5
nvim2/.config/nvim/lua/plugins/sleuth-vim.lua
Normal file
5
nvim2/.config/nvim/lua/plugins/sleuth-vim.lua
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
return {
|
||||||
|
"tpope/vim-sleuth",
|
||||||
|
-- No further initialization needed, as this is a real "vim" not a lua
|
||||||
|
-- plugin.
|
||||||
|
}
|
||||||
1
nvim2/.config/nvim/lua/plugins/statusline.lua
Normal file
1
nvim2/.config/nvim/lua/plugins/statusline.lua
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
return { 'echasnovski/mini.statusline', version = false, opts={} }
|
||||||
18
nvim2/.config/nvim/lua/plugins/which-key.lua
Normal file
18
nvim2/.config/nvim/lua/plugins/which-key.lua
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
return {
|
||||||
|
"folke/which-key.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
opts = {
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{
|
||||||
|
"<leader>?",
|
||||||
|
function()
|
||||||
|
require("which-key").show({ global = false })
|
||||||
|
end,
|
||||||
|
desc = "Buffer Local Keymaps (which-key)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue