summaryrefslogtreecommitdiff
path: root/.zshrc
diff options
context:
space:
mode:
authorDanny Holman <dholman@gymli.xyz>2020-06-16 18:48:24 -0500
committerDanny Holman <dholman@gymli.xyz>2020-06-16 18:53:13 -0500
commitacd74716fecf6537e1177f646a035328cec6ff72 (patch)
tree01ef5a19eb740e69233b1b2c651f6f575060fab1 /.zshrc
parent4c7aff7e20ba8b59406cc26945637e563f8f8186 (diff)
Remove powerline configs
Remove the configuration options for powerline. I use framework-free zsh and vim now.
Diffstat (limited to '.zshrc')
-rw-r--r--.zshrc34
1 files changed, 21 insertions, 13 deletions
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() {