You've already forked dotfiles
feat: Removing nvim-lspconfig and starting the removal of Mason, adding
in LSP definitions for servers that are used, adding in a script to check for LSPs, removing some extraneous items in the tmux conf, moving autopairs to its own file
This commit is contained in:
41
zsh/zshrc
41
zsh/zshrc
@@ -5,18 +5,18 @@
|
||||
path=(
|
||||
/opt/homebrew/bin
|
||||
/opt/homebrew/sbin
|
||||
$GOPATH/bin
|
||||
$HOME/.cargo/bin
|
||||
$HOME/.local/bin
|
||||
"$GOPATH/bin"
|
||||
"$HOME/.cargo/bin"
|
||||
"$HOME/.local/bin"
|
||||
$path
|
||||
)
|
||||
|
||||
# De-dupe path entries
|
||||
typeset -U path
|
||||
path=($^path(N-/))
|
||||
# path=($^path(N-/))
|
||||
|
||||
# Install oh-my-zsh if it doesn't exist
|
||||
if [ ! -d $HOME/.oh-my-zsh/ ]
|
||||
if [ ! -d "$HOME/.oh-my-zsh/" ]
|
||||
then
|
||||
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
|
||||
fi
|
||||
@@ -24,9 +24,9 @@ fi
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# Install the zsh-autosuggestions plugin if it doesn't exist
|
||||
if [ ! -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions ]
|
||||
if [ ! -d "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" ]
|
||||
then
|
||||
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
||||
git clone https://github.com/zsh-users/zsh-autosuggestions "${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions"
|
||||
fi
|
||||
|
||||
plugins=(
|
||||
@@ -38,10 +38,10 @@ plugins=(
|
||||
# Disable the startup update checks
|
||||
zstyle ':omz:update' mode disabled
|
||||
|
||||
ZSH_THEME="fb-custom"
|
||||
export ZSH_THEME="fb-custom"
|
||||
|
||||
# Hyphen insensitive completion, `-` and `_` are treated as interchangeable
|
||||
HYPHEN_INSENSITIVE="true"
|
||||
export HYPHEN_INSENSITIVE="true"
|
||||
|
||||
# Vim mode setup
|
||||
set -o vi
|
||||
@@ -67,32 +67,29 @@ zstyle ':completion:*:warnings' format '%BNo matches for: %d%b'
|
||||
# Autoload keychain for ssh-agent handling if it is installed
|
||||
if command -v keychain &> /dev/null
|
||||
then
|
||||
eval $(keychain --eval --quiet --nogui --noask)
|
||||
eval "$(keychain --eval --quiet --nogui --noask)"
|
||||
fi
|
||||
|
||||
# TODO: Replace above with GPG agent
|
||||
# GPG Agent handling of ssh key authorization and unlocks
|
||||
|
||||
# Inclusion of files to extend the configuration
|
||||
# From a theme to local specific changes, and grouping functions/aliases/exports
|
||||
include_files=(
|
||||
"$HOME/.config/zsh/zsh_local.zsh"
|
||||
"$HOME/.config/zsh/zsh_aliases.zsh"
|
||||
"$HOME/.config/zsh/zsh_exports.zsh"
|
||||
"$HOME/.config/zsh/zsh_functions.zsh"
|
||||
".config/zsh/zsh_local.zsh"
|
||||
".config/zsh/zsh_aliases.zsh"
|
||||
".config/zsh/zsh_exports.zsh"
|
||||
".config/zsh/zsh_functions.zsh"
|
||||
)
|
||||
|
||||
for file in $include_files; do
|
||||
if [ ! -f $file ]
|
||||
for file in "${include_files[@]}"; do
|
||||
if [ ! -f "$HOME/$file" ]
|
||||
then
|
||||
# Create files even if they aren't overriden in the environment
|
||||
touch $file
|
||||
touch "$HOME/$file"
|
||||
fi
|
||||
|
||||
source $file
|
||||
source "$HOME/$file"
|
||||
done
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
source "$ZSH/oh-my-zsh.sh"
|
||||
|
||||
# Call to zprof for startup timings
|
||||
# zprof
|
||||
|
||||
Reference in New Issue
Block a user