about summary refs log tree commit diff
path: root/configs/shared/zsh/.zshrc
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2019-03-18T14·14+0000
committerWilliam Carroll <wpcarro@gmail.com>2019-03-18T14·14+0000
commitf7b3e0a7a92903307ef1f4c66992721be6e01e08 (patch)
tree11f1959ee6dc34d2f8b20e6425cbb85700b55c63 /configs/shared/zsh/.zshrc
parentbf33edaa6efbf3572d9335bb07b530af249de0d2 (diff)
Drop OSX support; support desktop, laptop, cloudtop
Dropping support for OSX. Moving forward these dotfiles will depend on Linux
systems. Furthermore, since I'm support a ~/bin, the machines that consume these
dotfiles depend on i386 architectures. Linux and i386 are two dependencies that
I'm okay with since the leverage this assumption provides, makes their existence
tolerable.

There is some Google leakage herein, which includes aliases, functions, and
mentions of cloudtop. For now, this is okay. I may break the Google specific
code into its own repository, but for now, this is less maintenance.

This also introduces a ~/.profile instead of erroneously defining environment
variables in my zshrc file, which was unadvised.

This is a large commit and also introduces new aliases, variables, functions
that I accumulated over the past week or so while migrating away from OSX and
onto my new setup. Hopefully in the future I'll be more precise with my commits.
Diffstat (limited to 'configs/shared/zsh/.zshrc')
-rw-r--r--configs/shared/zsh/.zshrc23
1 files changed, 10 insertions, 13 deletions
diff --git a/configs/shared/zsh/.zshrc b/configs/shared/zsh/.zshrc
index 721bc8c74cab..349e7cebf0df 100644
--- a/configs/shared/zsh/.zshrc
+++ b/configs/shared/zsh/.zshrc
@@ -5,8 +5,6 @@ antigen use oh-my-zsh
 
 # Bundles from robbyrussell's oh-my-zsh repo.
 antigen bundle git
-antigen bundle alias-tips      # friendly reminders to prefer an alias if exists
-# antigen bundle common-aliases  # be careful with the load order here. Can easily eclipse aliases undesirably
 antigen bundle extract         # extracts archives polymorphically
 antigen bundle zsh-completions # extracts archives polymorphically
 
@@ -16,19 +14,20 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 # Theming
 # This supports different ZSH themes for each machine
 case "$(hostname)" in
-  wpcarro.c.googlers.com)      antigen theme cloud;;
-  wpcarro.lon.corp.google.com) antigen theme frisk;;
-  *)                           antigen theme refined;;
+  # desktop
+  wpcarro.lon.corp.google.com)
+    antigen theme frisk;;
+  # cloudtop
+  wpcarro.c.googlers.com)
+    antigen theme cloud;;
+  # laptop
+  wpcarro.roam.googlers.com)
+    antigen theme refined;;
 esac
 
 # Leave this last
 antigen apply
 
-# Personal Configuration
-
-# Set environment variables for Nix
-source ~/.nix-profile/etc/profile.d/nix.sh
-
 # Configure fzf
 source "$(fzf-share)/key-bindings.zsh"
 
@@ -45,9 +44,7 @@ fi
 # Directories.
 zstyle ':completion:*' users root $USER
 
-# use full path instead of $DOTFILES, since DOTFILES is set herein
-DOTFILES="$HOME/programming/dotfiles"
 source "$DOTFILES/configs/shared/zsh/variables.zsh"
 source "$DOTFILES/configs/shared/zsh/aliases.zsh"
 source "$DOTFILES/configs/shared/zsh/functions.zsh"
-source "$DOTFILES/configs/shared/zsh/dumping_grounds.zsh"
+source "$DOTFILES/configs/shared/zsh/zle.zsh"