Moved things around with nvim to allow multiple configurations, with nvims command

This commit is contained in:
Michael Housh
2023-09-23 20:39:33 -04:00
parent 6204b5f7b3
commit 8d396ff46f
37 changed files with 66 additions and 8 deletions

View File

@@ -0,0 +1,33 @@
{
"bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
"diffview.nvim": { "branch": "main", "commit": "a111d19ccceac6530448d329c63f998f77b5626e" },
"lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" },
"lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
"lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2451adb9bdb0fd32140bf3aa8dbc17ff60050db3" },
"mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "2d89ca96e08eb6e9c8e50e1bb4738bc5125c9f12" },
"neogit": { "branch": "master", "commit": "dfacf16679b120c50c8a2dcefe00f77932523708" },
"nightfox.nvim": { "branch": "main", "commit": "ee3525fdfbe2ed81270a336ccbe62f433165357b" },
"nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
"nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
"nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
"nvim-lspconfig": { "branch": "master", "commit": "ede4114e1fd41acb121c70a27e1b026ac68c42d6" },
"nvim-treesitter": { "branch": "master", "commit": "af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "bd103502252027434ec42f628d2dbf54821d4ce6" },
"nvim-web-devicons": { "branch": "master", "commit": "b844d3da4affb77fb2ba56ed235946f0ba0ab200" },
"plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
"telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" },
"vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" },
"which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
}

View File

@@ -22,5 +22,5 @@ fi
printf "#!/bin/%s\n\n" "${shell}" > "${path}" printf "#!/bin/%s\n\n" "${shell}" > "${path}"
chmod +x "${path}" chmod +x "${path}"
exec vim +2 "${path}" exec "${EDITOR}" +2 "${path}"

16
scripts/scripts/nvims Executable file
View File

@@ -0,0 +1,16 @@
#!/bin/sh
# Change / select an nvim configuration.
main() {
items=("default" "m-housh" "kickstart" "lazy")
config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config ➣ " --height=50% --layout=reverse --border --exit-0)
if [[ -z $config ]]; then
echo "Nothing selected"
return 0
elif [[ $config == "default" ]]; then
config=""
fi
unset VIMINIT && unset MYVIMRC && export NVIM_APPNAME=$config && nvim $@
}
main "$@"

View File

@@ -35,12 +35,12 @@ export DESKTOP="$HOME/Desktop"
export SCRIPTS="$HOME/.local/scripts" export SCRIPTS="$HOME/.local/scripts"
export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work" export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
export TERM=xterm-256color export TERM=xterm-256color
export EDITOR=vi export EDITOR=nvim
export VISUAL=vi export VISUAL=nvim
export EDITOR_PREFIX=vi export EDITOR_PREFIX=nvim
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
export VIMINIT='source $MYVIMRC' #export VIMINIT='source $MYVIMRC'
export MYVIMRC="$HOME/.vim/vimrc" #export MYVIMRC="$HOME/.vim/vimrc"
export MYZSHRC="$ZDOTDIR/.zshrc" export MYZSHRC="$ZDOTDIR/.zshrc"
export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals" export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
@@ -192,14 +192,23 @@ alias gs='git status'
alias l='ls -lah --color=auto' alias l='ls -lah --color=auto'
alias reload='exec zsh -l' alias reload='exec zsh -l'
alias temp='cd $(mktemp -d)' alias temp='cd $(mktemp -d)'
alias vi='vim' alias vi='nvim'
alias nvim='unset VIMINIT && unset MYVIMRC && nvim' alias nvim='unset VIMINIT && unset MYVIMRC && /opt/homebrew/bin/nvim'
alias nvim-mhoush='NVIM_APPNAME=m-housh && /opt/homebrew/bin/nvim'
alias nvim-kickstart='NVIM_APPNAME=kickstart /opt/homebrew/bin/nvim'
alias nvim-lazy='NVIM_APPNAME=lazy /opt/homebrew/bin/nvim'
#------------------------------ functions ------------------------------ #------------------------------ functions ------------------------------
# Create a directory and move into it.
mkcd() { mkcd() {
local dir="$1" local dir="$1"
mkdir -p "$dir" && cd "$dir" mkdir -p "$dir" && cd "$dir"
} && export mkcd } && export mkcd
#------------------------------ local configs ------------------------------ #------------------------------ local configs ------------------------------
_source_if "$ZDOTDIR/.zshrc-local" _source_if "$ZDOTDIR/.zshrc-local"