From acd74716fecf6537e1177f646a035328cec6ff72 Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.xyz>
Date: Tue, 16 Jun 2020 18:48:24 -0500
Subject: Remove powerline configs

Remove the configuration options for powerline. I use framework-free zsh
and vim now.
---
 .config/powerline/themes/shell/default.json | 46 -----------------------------
 .tmux.conf                                  |  2 --
 .vimrc                                      |  1 -
 .zshenv                                     |  2 --
 .zshrc                                      | 34 +++++++++++++--------
 5 files changed, 21 insertions(+), 64 deletions(-)
 delete mode 100644 .config/powerline/themes/shell/default.json

diff --git a/.config/powerline/themes/shell/default.json b/.config/powerline/themes/shell/default.json
deleted file mode 100644
index 9fceca6..0000000
--- a/.config/powerline/themes/shell/default.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"segments": {
-		"left": [
-                        {
-				"function": "powerline.segments.shell.last_pipe_status",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.common.net.hostname",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.common.env.user",
-				"priority": 30
-			},
-			{
-				"function": "powerline.segments.common.env.virtualenv",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.shell.cwd",
-				"priority": 10,
-                                "args": {
-                                        "dir_limit_depth": 2
-                                }
-			},
-                        {
-				"function": "powerline.segments.common.vcs.branch",
-				"priority": 40,
-                                "args": {
-                                        "status_colors": true
-                                }
-			},
-			{
-				"function": "powerline.segments.shell.jobnum",
-				"priority": 20
-			}
-		],
-		"right": [
-			{
-				"function": "powerline.segments.common.vcs.stash",
-				"priority": 50
-			}
-		]
-	}
-}
diff --git a/.tmux.conf b/.tmux.conf
index 19c14e7..5e82cbf 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,5 +1,3 @@
 set -g default-terminal "tmux-256color"
 set -g terminal-overrides ",xterm-termite:Tc"
 set -g mouse on
-
-source /usr/lib/python3.8/site-packages/powerline/bindings/tmux/powerline.conf
diff --git a/.vimrc b/.vimrc
index 5afbba3..86f383d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,7 +9,6 @@ set history=1000
 set gcr=a:blinkon0
 set grepprg="grep -nH $*"
 let g:tex_flavor = "latex"
-let g:powerline_pycmd = "py3"
 set laststatus=2
 set visualbell
 set background=dark
diff --git a/.zshenv b/.zshenv
index 2cbc002..1737049 100644
--- a/.zshenv
+++ b/.zshenv
@@ -13,7 +13,6 @@ appendpath '/home/dholman/bin'
 appendpath '/home/dholman/.local/bin'
 appendpath '/home/dholman/.gem/ruby/2.7.0/bin'
 appendpath '/home/dholman/.rvm/bin'
-export PATH="/usr/lib/distcc/bin:$PATH"
 export PATH
 export DISTCC_HOSTS="192.168.1.26/24"
 export EDITOR="vim"
@@ -29,5 +28,4 @@ source /usr/share/doc/pkgfile/command-not-found.zsh
 source /usr/share/git/completion/git-prompt.sh
 source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
-source /usr/lib/python3.8/site-packages/powerline/bindings/zsh/powerline.zsh
 source ~/.rvm/scripts/rvm
diff --git a/.zshrc b/.zshrc
index 1824cfd..22faea7 100644
--- a/.zshrc
+++ b/.zshrc
@@ -26,9 +26,17 @@ zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:kill:*' force-list always
 zstyle ':completion:*' squeeze-slashes true
 
-# Vim-style history searching
-bindkey -M vicmd 'k' history-substring-search-up
-bindkey -M vicmd 'j' history-substring-search-down
+# History options
+setopt hist_ignore_dups
+setopt hist_ignore_space
+
+# History search
+autoload -U up-line-or-beginning-search
+autoload -U down-line-or-beginning-search
+zle -N up-line-or-beginning-search
+zle -N down-line-or-beginning-search
+bindkey "^[[A" up-line-or-beginning-search
+bindkey "^[[B" down-line-or-beginning-search
 
 # Aliases
 alias ls="ls --color=auto"
@@ -37,17 +45,17 @@ alias pacr="sudo pacman -Rns"
 alias pacup="sudo pacman -Syu;auracle sync"
 alias msfconsole="sudo msfconsole -q"
 
-# Powerline
-if [ $(pgrep -c powerline) -eq 0 ]; then
-        powerline-daemon -q
-fi
-
 # Prompt settings
-#setopt PROMPT_SUBST
-#GIT_PS1_SHOWUPSTREAM=auto
-#GIT_PS1_SHOWDIRTYSTATE=1
-#GIT_PS1_SHOWUNTRACKEDFILES=1
-#PS1='$(__git_ps1 "(%s)")$ '
+setopt prompt_subst
+GIT_PS1_SHOWUPSTREAM=auto
+GIT_PS1_SHOWDIRTYSTATE=1
+GIT_PS1_SHOWUNTRACKEDFILES=1
+GIT_PS1_SHOWCOLORHINTS=1
+if [[ -z "$SSH_CLIENT" ]]; then
+        PROMPT='%(?..%? )%3~ $(__git_ps1 "(%s)")%(!.#.$) '
+else
+        PROMPT='%(?..%? )%m %3~ $(__git_ps1 "(%s)")%(!.#.$) '
+fi
 
 # Make shell stuff behave nicely
 pacsearch() {
-- 
cgit v1.2.3