mirror of
https://github.com/mitchell/dotfiles.git
synced 2025-12-17 12:27:22 +00:00
Migrate Neovim to lazy.nvim and update dotfiles
- Neovim:
- Migrate from vim-plug to lazy.nvim.
- Refactor config (`init.lua`, `config.vim`).
- Replace Coq with blink.cmp, add CodeCompanion.
- Fish:
- Add aliases (`cl`, `ai`), env vars (`ANDROID_HOME`, `PYENV`).
- Update keybindings and conditional tool initialization (starship, zoxide, fzf, pyenv).
- Refine ASDF/Homebrew setup.
- Git: Add aliases (`rs`, `rss`, `ap`).
- Other: Update SKHD bindings and WezTerm path/settings.
This commit is contained in:
parent
4d4e715cb1
commit
b55aab8a89
11 changed files with 436 additions and 3066 deletions
|
|
@ -11,9 +11,6 @@ function configure_fish
|
|||
import_sources $uname
|
||||
define_aliases $uname
|
||||
ssh_agent_startup
|
||||
starship init fish | source
|
||||
zoxide init fish | source
|
||||
fzf --fish | source
|
||||
end
|
||||
|
||||
configure_fish
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
function define_aliases -a uname -d 'Defines aliases for commonly used commands'
|
||||
alias q exit
|
||||
alias cl clear
|
||||
alias rcp 'rsync -aP'
|
||||
alias vg vagrant
|
||||
alias tf terraform
|
||||
|
|
@ -15,6 +16,7 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands'
|
|||
alias pn pnpm
|
||||
alias nv 'neovide --fork; and clear'
|
||||
alias hx helix
|
||||
alias ai aichat
|
||||
|
||||
switch "$uname"
|
||||
case Linux
|
||||
|
|
|
|||
|
|
@ -21,7 +21,13 @@ function define_global_variables -d 'Defines all and exclusively globally export
|
|||
|
||||
set -gx LIBVIRT_DEFAULT_URI 'qemu:///system'
|
||||
|
||||
set -gx ANDROID_HOME $HOME/Android/Sdk
|
||||
if test (uname) = "Darwin"
|
||||
set -gx ANDROID_HOME $HOME/Library/Android/Sdk
|
||||
else
|
||||
set -gx ANDROID_HOME $HOME/Android/Sdk
|
||||
end
|
||||
|
||||
set -gx PYENV_ROOT $HOME/.pyenv
|
||||
|
||||
fish_add_path $GOBIN \
|
||||
$HOME/.local/bin \
|
||||
|
|
@ -31,6 +37,7 @@ function define_global_variables -d 'Defines all and exclusively globally export
|
|||
$HOME/.cargo/bin \
|
||||
$HOME/.dotnet/tools \
|
||||
$BUN_INSTALL/bin \
|
||||
$PYENV_ROOT/bin \
|
||||
$ANDROID_HOME/emulator \
|
||||
$ANDROID_HOME/platform-tools
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
function fish_user_key_bindings
|
||||
bind --mode insert jj "if commandline -P; commandline -f cancel; else; set fish_bind_mode default; commandline -f backward-char repaint-mode; end"
|
||||
bind --mode insert ,a 'ssh_add; commandline -f repaint'
|
||||
bind --mode insert ,p 'nvim +"Telescope git_files"; commandline -f repaint'
|
||||
bind --mode insert ,f 'nvim +"Telescope find_files"; commandline -f repaint'
|
||||
bind --mode insert ,n 'nvim .; commandline -f repaint'
|
||||
bind --mode insert ,s 'sysz; commandline -f repaint'
|
||||
bind --mode insert ,z 'zi; commandline -f repaint'
|
||||
bind --mode insert ,t 'fzf-file-widget'
|
||||
bind --mode insert ,r 'fzf-history-widget'
|
||||
bind --mode insert ,c 'fzf-cd-widget'
|
||||
bind --mode insert comma,a 'ssh_add; commandline -f repaint'
|
||||
bind --mode insert comma,p 'nvim +"Telescope git_files"; commandline -f repaint'
|
||||
bind --mode insert comma,f 'nvim +"Telescope find_files"; commandline -f repaint'
|
||||
bind --mode insert comma,n 'nvim .; commandline -f repaint'
|
||||
bind --mode insert comma,s 'sysz; commandline -f repaint'
|
||||
bind --mode insert comma,z 'zi; commandline -f repaint'
|
||||
bind --mode insert comma,t 'fzf-file-widget'
|
||||
bind --mode insert comma,r 'fzf-history-widget'
|
||||
bind --mode insert comma,c 'fzf-cd-widget'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,10 +1,27 @@
|
|||
function import_sources -a uname -d 'Loads any additional fish files needed at init.'
|
||||
test -f ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish; and source ~/.asdf/plugins/dotnet-core/set-dotnet-home.fish
|
||||
|
||||
test -e ~/.asdf/asdf.fish
|
||||
and source ~/.asdf/asdf.fish
|
||||
and mkdir -p ~/.config/fish/completions
|
||||
and ln -sf ~/.asdf/completions/asdf.fish ~/.config/fish/completions
|
||||
# ASDF configuration code
|
||||
if test -z $ASDF_DATA_DIR
|
||||
set _asdf_shims "$HOME/.asdf/shims"
|
||||
else
|
||||
set _asdf_shims "$ASDF_DATA_DIR/shims"
|
||||
end
|
||||
|
||||
# Do not use fish_add_path (added in Fish 3.2) because it
|
||||
# potentially changes the order of items in PATH
|
||||
if not contains $_asdf_shims $PATH
|
||||
set -gx --prepend PATH $_asdf_shims
|
||||
end
|
||||
set --erase _asdf_shims
|
||||
|
||||
test -e /opt/homebrew/bin/brew
|
||||
and /opt/homebrew/bin/brew shellenv | source -
|
||||
|
||||
command -q starship; and starship init fish | source
|
||||
command -q zoxide; and zoxide init fish | source
|
||||
command -q fzf; and fzf --fish | source
|
||||
command -q pyenv; and pyenv init - | source
|
||||
|
||||
# The next line updates PATH for the Google Cloud SDK.
|
||||
# if test -f '/Users/m/Documents/google-cloud-sdk/path.fish.inc'; source '/Users/m/Documents/google-cloud-sdk/path.fish.inc'; end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue