From 52ec61bfe5a32abe8cab65dec952e22739a66cc6 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Fri, 2 Dec 2016 12:08:59 -0500
Subject: [PATCH] Switch to antigen, probably doesn't have everything I want
 yet

---
 .gitmodules |  3 ---
 .zim        |  1 -
 .zimrc      | 27 ---------------------------
 .zshrc      | 24 ++++++++++++++++++------
 PRESTOW     | 17 -----------------
 5 files changed, 18 insertions(+), 54 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 .zim
 delete mode 100644 .zimrc
 delete mode 100755 PRESTOW

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f348de8..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".zim"]
-	path = .zim
-	url = http://adamgoldsmith.name/cgit/zim.git
diff --git a/.zim b/.zim
deleted file mode 160000
index 6dbf5ed..0000000
--- a/.zim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6dbf5eda31cbfb02acc9eccfdb72bca2cc9e1a57
diff --git a/.zimrc b/.zimrc
deleted file mode 100644
index 0bd7f49..0000000
--- a/.zimrc
+++ /dev/null
@@ -1,27 +0,0 @@
-#-*- mode: sh; -*-
-## Zim settings
-
-# Select what modules you would like enabled.
-# The second line of modules may depend on options set by modules in the first line.
-# These dependencies are noted on the respective module's README.md.
-zmodules=(directory environment git history input utility custom \
-          syntax-highlighting prompt git completion)
-
-## Prompt
-# Set your desired prompt here
-zprompt_theme='fred'
-
-## Utility
-# Uncomment to enable command correction prompts; 'setopt CORRECT'
-# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
-zcorrection='true'
-
-## Syntax-Highlighting
-# This determines what highlighters will be used with the completion module.
-# Documentation of the highlighters can be found here:
-#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
-zhighlighters=(main brackets)
-
-## SSH
-# Load these ssh identities with the ssh module
-zssh_ids=(id_rsa)
diff --git a/.zshrc b/.zshrc
index 4c7f5e4..0171800 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,10 +1,20 @@
-#-*- mode: sh; -*-
-# User configuration sourced by interactive shells
+# Antigen Stuff
+ADOTDIR="$HOME/.antigen"
+[ ! -e "$ADOTDIR" ] && git clone https://github.com/zsh-users/antigen.git "$ADOTDIR"
+source "$ADOTDIR/antigen.zsh"
 
-# Source zim
-if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then
-  source ${ZDOTDIR:-${HOME}}/.zim/init.zsh
-fi
+antigen bundles <<EOBUNDLES
+  http://adamgoldsmith.name/cgit/zsh/fred-prompt.git prompt_fred_setup
+  zsh-users/zsh-syntax-highlighting
+  zsh-users/zsh-completions
+  zsh-users/zsh-history-substring-search
+  Eriner/zim modules/directory
+  Eriner/zim modules/git
+  Eriner/zim modules/history
+  Eriner/zim modules/input
+  Eriner/zim modules/utility
+EOBUNDLES
+antigen apply
 
 # Command Specific Aliases
 for i in $HOME/.aliases/command-specific/*
@@ -19,7 +29,9 @@ done
 source $HOME/.aliases/general
 
 # Various Options
+setopt CORRECT
 CORRECT_IGNORE="_*"
+zhighlighters=(main brackets)
 stty -ixon #disable XON/XOFF, which breaks C-s
 setopt no_share_history
 
diff --git a/PRESTOW b/PRESTOW
deleted file mode 100755
index 249aa3c..0000000
--- a/PRESTOW
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-[ -d .zim ] && firstRun=1
-
-echo "Getting zim"
-git submodule update --init --recursive
-
-echo "Updating .dotfiles/zsh/.zim"
-cd .zim
-if [ $firstRun -eq 1 ]
-then
-	git remote set-url origin "http://adamgoldsmith.name/cgit/zim.git"
-	git remote set-url --push origin "ag:/srv/git/zim.git"
-	git remote add upstream "https://github.com/Eriner/zim.git"
-fi
-git submodule init
-git submodule update