From 6cfeca9164b4bf2b70adfdaed4fbde92d3351001 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Mon, 23 Mar 2015 18:35:55 -0400 Subject: [PATCH] Minor changes --- i3/config | 6 +++--- shells/zshrc | 12 ++---------- vim/vimrc | 17 ++++++++--------- 3 files changed, 13 insertions(+), 22 deletions(-) diff --git a/i3/config b/i3/config index 06909b2..4526a87 100644 --- a/i3/config +++ b/i3/config @@ -28,7 +28,7 @@ set $rd #e89393 ## set some nice colors border background text #client.focused #262626 #262626 $tx -client.focused #262626 #262626 $tx +client.focused #5a5a5a #5a5a5a #000000 client.unfocused $bg $bg $ia client.focused_inactive $bg $bg $ac client.urgent $rd $rd $tx @@ -54,7 +54,7 @@ bar { } } -new_window pixel 0 +new_window pixel 1 # split in vertical orientation bindsym $mod+v split h # split in horizontal orientation @@ -184,7 +184,7 @@ exec --no-startup-id "sleep 25;/usr/bin/owncloud" exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000 exec --no-startup-id /usr/bin/parcellite exec --no-startup-id /usr/bin/numlockx -bindsym $mod+p exec dmenu_run -sb \#262626 -nb \#121212 -p Run -l 5 -i -f +bindsym $mod+p exec dmenu_run -sf \#000000 -sb \#5a5a5a -nb \#121212 -p Run -l 5 -i # -f bindsym $mod+shift+p exec "~/.i3/run.sh pass" #exec --no-startup-id /usr/bin/synapse -s exec --no-startup-id /usr/bin/zeal diff --git a/shells/zshrc b/shells/zshrc index 33df4b2..37568ff 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -57,11 +57,9 @@ export EDITOR='vim' if [ "$(uname)" != "Darwin" ]; then alias ls='ls --color=always -F' fi -alias hc='herbstclient' alias steam='sudo kill -9 `pidof steam`;sudo unshare -n -- sh -c "ifconfig lo up;sudo -u stonewareslord steam" > /dev/null 2>&1 & disown' alias matlab='matlab -glnx86' alias srm='srm -dv' -#alias pass='DISPLAY= pass' alias ehistory='cat ~/.bash_eternal_history|egrep -iP $@' alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"' alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' @@ -90,7 +88,7 @@ function ins(){ } alias etup='sudo etc-update' alias search='apt-cache search' -#alias install='sudo apt-get --show-progress install' +alias install='sudo apt-get --show-progress install' alias remove='sudo apt-get --show-progress remove' alias update='sudo apt-get update' alias upgrade='sudo apt-get --show-progress upgrade' @@ -114,13 +112,9 @@ alias tux="wemux" alias rmgit="git remote rm origin;git remote rm https;git remote rm oOrigin;git remote rm oHttps" alias rname="while true;do echo -n \"Rename: \";read A;echo -n \"To: \";read B;i3-msg 'rename workspace $A to $B';done" alias g="git $@" -alias echip="curl ifconfig.me" -alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" -alias to="~/.todo/todo.sh" alias stdns="sudo sh -c 'echo \"nameserver 8.8.8.8\\nnameserver 8.8.4.4\" > /etc/resolv.conf'" alias fvim="vim -u NONE +\"so ~/.vim/plugged/flappyvird-vim/plugin/flappyvird.vim\" +\"so ~/.vim/plugged/flappyvird-vim/autoload/flappyvird.vim\" +\":FlappyVird\" +\":q\"" alias fk='k `fzf --no-mouse -m -1 -x`' -alias fh='eval $(([ -n "$ZSH_NAME" ] && fc --no-mouse -m -1 -x -l 1 || history) | fzf +s | sed "s/ *[0-9]* *//")' alias fkill='ps -ef | sed 1d | fzf --no-mouse -m -1 -x | awk "{print $2}" | xargs kill -${1:-9}' alias slp='smon ./x&DISPLAY=:0.0 i3lock -di `echo $(shuf -n1 -e ~/.i3/wall/*) | tee /tmp/wall`' alias updateall='sudo sh -c "apt-get update;apt-get upgrade -y;apt-get dist-upgrade -y;apt-get autoremove -y"' @@ -137,9 +131,7 @@ alias -g G='|& ag' alias -g AW='austenwares.com' export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x' function ctar(){ - DST=$1 - shift - tar -cf - $@|pv -cN tar -s $(echo $(du -sb $@|awk '{print $1}'|tr '\n' '+')0|bc)|pv -cN gzip|gzip>$DST + tar -cf - $@|pv -cN tar -s $(echo $(du -sb $@|awk '{print $1}'|tr '\n' '+')0|bc)|pv -cN gzip|gzip|pv -cN dest } function pcat(){ pygmentize -f terminal "$1" | less -R diff --git a/vim/vimrc b/vim/vimrc index fb9c4f4..a190d1f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -66,7 +66,7 @@ vnoremap # :call VisualSelection('b') nnoremap :nohlsearchgzo nnoremap U nnoremap K ik$ -nnoremap :up:silent! call sy#start()g +nnoremap :up:silent! call sy#start() vnoremap gj j vnoremap gk k vnoremap j gj @@ -105,11 +105,10 @@ inoremap <> <> inoremap {} {}O inoremap {% {% %} inoremap [] [] -inoremap ;;; A inoremap ;; m`A;``a -inoremap ;; A;o -nnoremap ;; m"A;`" -nnoremap ;; A;o +"inoremap ;; A;o +"nnoremap ;; m"A;`" +"nnoremap ;; A;o inoremap inoremap inoremap @@ -123,10 +122,10 @@ nnoremap z _\| nnoremap bun G?Plug yyjp$hdi'"+gP0Wl3d/\/xjyyP$"+gp:nohlsearch:up:PluginInstall nnoremap :CtrlPFunky nnoremap :set invpaste -nnoremap [e -nnoremap ]e -vnoremap [egv -vnoremap ]egv +"nnoremap [e +"nnoremap ]e +"vnoremap [egv +"vnoremap ]egv nnoremap / /\v vnoremap / /\v inoremap jk A