Switch to antigen

Author: linuxdaemon

home/.chezmoidata/packages.yaml

@@ -49,3 +49,7 @@ packages:
     platforms:
       - darwin
       - linux
+  antigen:
+    platforms:
+      - darwin
+      - linux

home/.chezmoiexternal.toml

@@ -0,0 +1,3 @@
+{{ if stat . -}}
+{{ include . }}
+{{ end -}}

home/.chezmoitemplates/includeIfExists.tmpl

@@ -1,21 +1,4 @@
 source {{ joinPath .chezmoi.sourceDir "lib" "common" "functions.sh" | quote }}
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-# Path to your oh-my-zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="agnoster"
-
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in $ZSH/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -24,14 +7,6 @@ ZSH_THEME="agnoster"
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment one of the following lines to change the auto-update behavior
-# zstyle ':omz:update' mode disabled  # disable automatic updates
-zstyle ':omz:update' mode auto      # update automatically without asking
-# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
-
-# Uncomment the following line to change how often to auto-update (in days).
-# zstyle ':omz:update' frequency 13
-
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS="true"
 
@@ -50,38 +25,6 @@ zstyle ':omz:update' mode auto      # update automatically without asking
 # Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
 # COMPLETION_WAITING_DOTS="true"
 
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=()
-
-source "$ZSH/oh-my-zsh.sh"
-
-# User configuration
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
 # Preferred editor for local and remote sessions
 if [[ -n $SSH_CONNECTION ]]; then
   export EDITOR='vim'
@@ -92,22 +35,10 @@ fi
 export GIT_EDITOR="$EDITOR"
 export VISUAL="$EDITOR"
 
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
 source_if_exists .aliases
 
 {{ if $.gui -}}
-source_if_exists ".iterm2_shell_integration.zsh"
+test -e "$HOME/.iterm2_shell_integration.zsh" && source "$HOME/.iterm2_shell_integration.zsh"
 {{ end -}}
 
 {{ if has "personal" $.tags -}}
@@ -179,10 +110,17 @@ add_ibrew
 
 unset ibrew_bin mbrew_bin ibrew_default_bin mbrew_default_bin
 
+source "$HOMEBREW_PREFIX/share/antigen/antigen.zsh"
+antigen use oh-my-zsh
+antigen theme agnoster
+antigen apply
+
+zstyle ':omz:update' mode auto      # update automatically without asking
+
 if has_cmd brew; then
     gcloud_dir="$HOMEBREW_PREFIX/share/google-cloud-sdk"
-    source_if_exists "$gcloud_dir/path.zsh.inc"
-    source_if_exists "$gcloud_dir/completion.zsh.inc"
+    test -e "$gcloud_dir/path.zsh.inc" && source_if_exists "$gcloud_dir/path.zsh.inc"
+    test -e "$gcloud_dir/completion.zsh.inc" && source_if_exists "$gcloud_dir/completion.zsh.inc"
     unset gcloud_dir
 
     source_if_exists "$HOMEBREW_PREFIX/opt/asdf/libexec/asdf.sh"
@@ -192,8 +130,10 @@ if has_cmd direnv; then
     eval "$(direnv hook zsh)"
 fi
 
-{{ include (joinPath $.chezmoi.homeDir ".zshrc.local") -}}
+{{ template "includeIfExists.tmpl" (joinPath $.chezmoi.homeDir ".zshrc.local") -}}
 
 # We finished init, set up completions (OMZ does this above, but we add our own, so do it again)
 autoload -Uz compinit
 compinit
+
+{{ template "includeIfExists.tmpl" (joinPath $.chezmoi.homeDir ".zsh_completion_aliases.local") -}}

home/dot_zshrc.tmpl

@@ -8,7 +8,7 @@ source_if_exists() {
         file="$HOME/$file"
     fi
 
-    test -f "$file" && source "$file"
+    test -e "$file" && source "$file"
 }
 
 add_to_path() {

home/lib/common/functions.sh

@@ -1452,6 +1452,8 @@
 	</dict>
 	<key>QuitWhenAllWindowsClosed</key>
 	<true/>
+	<key>ShowFullScreenTabBar</key>
+	<false/>
 	<key>SoundForEsc</key>
 	<false/>
 	<key>TabStyleWithAutomaticOption</key>