reorganize some stuff

master
Jordan Orelli 1 year ago
parent 7fc6a64992
commit 5fd05f650c

@ -1,11 +1,3 @@
if [[ -f "$HOME/.bashrc" ]]; then if [[ -f "$HOME/.bashrc" ]]; then
. "$HOME/.bashrc" . "$HOME/.bashrc"
fi fi
if [[ -f "$HOME/.cargo/env" ]]; then
. "$HOME/.cargo/env"
fi
if [[ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
fi

@ -40,17 +40,11 @@ export EDITOR=vim
case $( uname -s ) in case $( uname -s ) in
Darwin) Darwin)
echo "Using OSX bash settings."
alias ls="ls -G" alias ls="ls -G"
;; ;;
Linux) Linux)
# for some reason I find this welcome string more annoying on Linux # for some reason I find this welcome string more annoying on Linux
;; ;;
MSYS_NT-10.0-22000)
# I don't actually have any MSYS-specific settings yet but probably will at
# some point
echo "Using MSYS bash settings."
;;
*) *)
echo "No platform-specific bash settings are enabled." echo "No platform-specific bash settings are enabled."
;; ;;
@ -94,3 +88,11 @@ fi
export NVM_DIR="$HOME/.nvm" export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
if [[ -f "$HOME/.cargo/env" ]]; then
. "$HOME/.cargo/env"
fi
if [[ -f "$HOME/.nix-profile/etc/profile.d/nix.sh" ]]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
fi

@ -17,7 +17,7 @@ files:
[home kitty] [home kitty]
when: host.has('kitty') when: host.has('kitty')
files: files:
kitty.conf > .config/kitty/kitty.conf kitty/kitty.conf > .config/kitty/kitty.conf
# [run vim-plugins] # [run vim-plugins]
# when: host.has('vim') # when: host.has('vim')

Loading…
Cancel
Save