From c62960330fb669081edf13607ff6924a502b20c5 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@constantcontact.com>
Date: Fri, 11 Oct 2019 22:18:23 -0400
Subject: [PATCH] Starship toml, as well as fixing antibody

---
 hyperterm/hyper.js                 |  2 +-
 playbooks/roles/zsh/tasks/main.yml |  6 ++++++
 tmux/tmux.conf                     |  2 +-
 zsh/starship.toml                  |  5 +++++
 zsh/zsh_plugins.txt                |  1 -
 zsh/zshrc                          | 12 ++++++------
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 zsh/starship.toml

diff --git a/hyperterm/hyper.js b/hyperterm/hyper.js
index 1f94851..6e3d9a1 100644
--- a/hyperterm/hyper.js
+++ b/hyperterm/hyper.js
@@ -89,7 +89,7 @@ module.exports = {
 
     // for setting shell arguments (i.e. for using interactive shellArgs: ['-i'])
     // by default ['--login'] will be used
-    shellArgs: ['--login', '-c' , 'tmux new -A -s DefaultSession'],
+    shellArgs: ['--login'],
 
     // for environment variables
     env: {},
diff --git a/playbooks/roles/zsh/tasks/main.yml b/playbooks/roles/zsh/tasks/main.yml
index b479ac5..b814b01 100644
--- a/playbooks/roles/zsh/tasks/main.yml
+++ b/playbooks/roles/zsh/tasks/main.yml
@@ -16,6 +16,12 @@
     dest: ~/.zsh_plugins.txt
     state: link
 
+- name: Symlink starship.toml
+  file:
+    src: ~/.dotfiles/zsh/starship.toml
+    dest: ~/.config/starship.toml
+    state: link
+
 - name: Symlink zshrc
   file: 
     src: ~/.dotfiles/zsh/zshrc
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index f43ec7f..8b19d7d 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,6 +1,6 @@
 # set default terminal
 #set -ga terminal-overrides ",xterm-kitty:Tc,alacritty:Tc,xterm-termite:Tc"
-# set-option -g default-terminal "tmux-256color"
+set-option -g default-terminal "tmux-256color"
 # set mouse/history stuff
 set -g mouse on
 set -g history-limit 20000
diff --git a/zsh/starship.toml b/zsh/starship.toml
new file mode 100644
index 0000000..eb540ed
--- /dev/null
+++ b/zsh/starship.toml
@@ -0,0 +1,5 @@
+[character]
+symbol = "➜"
+error_symbol = "✗"
+use_symbol_for_status = true
+vicmd_symbol = "⚒️"
diff --git a/zsh/zsh_plugins.txt b/zsh/zsh_plugins.txt
index 38cc070..59adbd7 100644
--- a/zsh/zsh_plugins.txt
+++ b/zsh/zsh_plugins.txt
@@ -1,4 +1,3 @@
-robbyrussell/oh-my-zsh
 robbyrussell/oh-my-zsh path:plugins/git
 robbyrussell/oh-my-zsh path:plugins/vi-mode
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 16f61e2..cc47f50 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,5 +1,5 @@
 # Lines configured by zsh-newuser-install
-zmodload zsh/zprof
+# zmodload zsh/zprof
 
 HISTFILE=~/.histfile
 HISTSIZE=10000
@@ -7,6 +7,7 @@ SAVEHIST=10000
 setopt extendedglob nomatch notify histignorespace histignorealldups histnofunctions histnostore histverify incappendhistory 
 unsetopt autocd beep
 bindkey -v
+export RPROMPT='' # Fixes a side-effect of the vi-mode oh-my-zsh plugin
 export KEYTIMEOUT=1
 
 #keybindings
@@ -37,6 +38,8 @@ export VISUAL='nvim'
 export EDITOR='nvim'
 export PATH=$HOME/bin:$PATH
 
+source <(antibody init)
+
 antibody bundle < ~/.zsh_plugins.txt
 
 if [[ -e ~/.cargo/bin/starship ]]; then
@@ -47,14 +50,11 @@ fi
 
 alias exa="exa -l --git"
 
-# export TERM="tmux-256color"
-export SHELL="/bin/zsh"
-
 function dt() {
     local session_name
     session_name=${1:-DefaultSession}
 
-    tmux new-session -A -s $session_name
+    tmux -2 new-session -A -s $session_name
 } 
 
 function _dt_completion {
@@ -113,4 +113,4 @@ else
 	touch $HOME/.zshsrc
 fi
 
-zprof
+# zprof