summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Holman <dholman@gymli.org>2018-10-19 19:39:32 -0500
committerDaniel Holman <dholman@gymli.org>2018-10-19 19:39:32 -0500
commitb0f682a943dbbc1d6318c4e1d312215f86bba2db (patch)
tree72223cc3a0b29591fc78dd3d532ea802fbf1888f
parente99fe3d1f27ddd6a6cf1a19ecb004644f092ceb5 (diff)
Added powerline configs to zsh and vim
-rw-r--r--.vimrc8
-rw-r--r--.zshenv2
-rw-r--r--.zshrc17
3 files changed, 13 insertions, 14 deletions
diff --git a/.vimrc b/.vimrc
index 6fdf77f..d7af602 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,13 +9,13 @@ set history=1000
set gcr=a:blinkon0
set grepprg="grep -nH $*"
let g:tex_flavor = "latex"
+let g:powerline_pycmd = "py3"
set visualbell
set background=dark
set runtimepath=~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after
set autowrite
set autoread
set ttyfast
-set mouse=a
let g:airline_powerline_fonts = 1
syntax on
@@ -28,12 +28,6 @@ noremap <silent> <Leader>, :noh<cr>
set incsearch
set showmatch
-" 80 character margin
-set textwidth=80
-set formatoptions=qrnl
-set wrapmargin=0
-set colorcolumn=+1
-
" X11 clipboard support
set pastetoggle=<F2> "to preserve indentation
vnoremap <C-c> "*y
diff --git a/.zshenv b/.zshenv
index c663fb1..78d1c51 100644
--- a/.zshenv
+++ b/.zshenv
@@ -10,6 +10,7 @@ appendpath () {
# Setup environment
appendpath '/home/dholman/bin'
+appendpath '/home/dholman/.local/bin'
export PATH
export EDITOR="vim"
export SUDO_EDITOR="vim"
@@ -24,3 +25,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.7/site-packages/powerline/bindings/zsh/powerline.zsh
diff --git a/.zshrc b/.zshrc
index 20875ff..639fce6 100644
--- a/.zshrc
+++ b/.zshrc
@@ -36,16 +36,19 @@ alias pacin="sudo pacman -S"
alias pacr="sudo pacman -Rns"
alias pacup="sudo pacman -Syu;checkpkg"
alias cower="cower --color=auto"
-alias msfconsole="sudo msfconsole --quiet -x \"db_connect root@msf\""
alias irssi="torsocks irssi"
+# Powerline
+if [ $(pgrep -c powerline) -eq 0 ]; then
+ powerline-daemon -q
+fi
+
# Prompt settings
-local return_code="%(?..%{$fg[red]%}%? ${exclaim}%{$reset_color%})"
-setopt PROMPT_SUBST
-GIT_PS1_SHOWUPSTREAM=auto
-GIT_PS1_SHOWDIRTYSTATE=1
-GIT_PS1_SHOWUNTRACKEDFILES=1
-PS1='${return_code}$(__git_ps1 "(%s)")$ '
+#setopt PROMPT_SUBST
+#GIT_PS1_SHOWUPSTREAM=auto
+#GIT_PS1_SHOWDIRTYSTATE=1
+#GIT_PS1_SHOWUNTRACKEDFILES=1
+#PS1='$(__git_ps1 "(%s)")$ '
# Make shell stuff behave nicely
pacsearch() {