From 07ada7e8c394c75aa5d40d01d0c72d21f42360cc Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Sat, 30 Aug 2014 15:59:01 -0400 Subject: [PATCH] Fixed git dt command, initial konsole now opens without wemux. Added tdfsb and sqlitebrowser to desktop.txt. Improved k. Improved vimperatorrc --- git/gitconfig | 3 +- i3/config | 5 ++- scripts/desktop.txt | 2 + shells/zshrc | 40 ++++++++++++++++---- vimperator/vimperatorrc | 82 +++++++++++++++++++++-------------------- 5 files changed, 81 insertions(+), 51 deletions(-) diff --git a/git/gitconfig b/git/gitconfig index 7f685d1..faadcc5 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -11,8 +11,9 @@ st = status br = branch -av hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit - d = difftool + dt = difftool cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - + nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i" [push] default = matching diff --git a/i3/config b/i3/config index 65ce12f..7cd06b9 100644 --- a/i3/config +++ b/i3/config @@ -13,8 +13,9 @@ exec --no-startup-id xautolock -time 3 -locker 'i3lock -i `shuf -n1 -e ~/.i3/wal #startup exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&' #exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/applications/Telegram/Telegram&' -exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox&' -exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux&' +exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox &' +#exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux&' +exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole &' exec --no-startup-id i3-msg 'nitrogen --restore' #colors diff --git a/scripts/desktop.txt b/scripts/desktop.txt index 0aa783d..0a55c34 100644 --- a/scripts/desktop.txt +++ b/scripts/desktop.txt @@ -51,3 +51,5 @@ kvpnc nitrogen banshee xautolock +sqlitebrowser +tdfsb diff --git a/shells/zshrc b/shells/zshrc index 7f74da7..3752ca1 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -1,7 +1,7 @@ export ZSH=$HOME/.oh-my-zsh ZSH_THEME="af-magic" # Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" +ENABLE_CORRECTION="true" COMPLETION_WAITING_DOTS="true" # Uncomment the following line if you want to change the command execution time # stamp shown in the history command output. @@ -12,12 +12,10 @@ HISTSIZE=12000 SAVEHIST=10000000 setopt HIST_EXPIRE_DUPS_FIRST setopt EXTENDED_HISTORY - export PAGER=/usr/local/bin/vimpager alias less=$PAGER alias zless=$PAGER - # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder plugins=(git) @@ -74,9 +72,11 @@ alias rname="while true;do echo -n \"Rename: \";read A;echo -n \"To: \";read B;i alias g="git $@" alias echip="curl ifconfig.me" alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" +alias to="~/tmp/todo/todo.sh" alias -s html="firefox" alias -s log="less -MN" alias -g nify=" > /dev/null 2>&1 &" +alias -g G='|& egrep -i' function dnstest(){ echo "Testing ping:" ping -c 3 8.8.8.8 @@ -131,12 +131,28 @@ function tsh(){ } function k(){ if [[ $# > 1 ]] ; then - vim "$@" + #More than 1 arguement + echo -n "Exec [mcvxX]: " + read a + if [[ $a == "m" ]] ; then + mv $@ + elif [[ $a == "c" ]] ; then + cp $@ + elif [[ $a == "v" ]] ; then + vim $@ + elif [[ $a == "x" ]] ; then + rm "$@" + elif [[ $a == "XX" ]] ; then + rm -rf "$@" + fi elif [ -d "$@" ] ; then + #cd then ls cd "$@" && ls elif [[ "$@" == "-" ]] ; then + #Because if this isn't here, k - won't work cd - && ls elif [ -f "$@" ] ; then + #Extract if it's extractable case $1 in *.tar.xz) tar xvf $1 ;; *.tar.bz2) tar xvjf $1 ;; @@ -153,22 +169,30 @@ function k(){ *) vim $1 esac else - echo -n "Exec [dcyfx]: " + echo -n "Exec [dcvfxX]: " read a if [[ $a == "d" ]] ; then + #Create directory mkdir $@ elif [[ $a == "c" ]] ; then + #Create directory and cd into it mkdir $@ cd $@ - elif [[ $a == "y" ]] ; then + elif [[ $a == "v" ]] ; then + #Edit with vim vim "$@" elif [[ $a == "f" ]] ; then + #Open with Firefox firefox "$@" elif [[ $a == "x" ]] ; then + #rm file rm "$@" - elif [[ $a == "xd" ]] ; then + elif [[ $a == "X" ]] ; then + #rm directory rmdir "$@" + elif [[ $a == "XX" ]] ; then + #rm -rf everything + rm -rf "$@" fi fi } -function mcl(){ mkdir "$@"&&k "$@"; } diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc index d57e26b..4cacaa5 100644 --- a/vimperator/vimperatorrc +++ b/vimperator/vimperatorrc @@ -1,46 +1,48 @@ -nunmap j -nunmap k -unmap J -unmap K -unmap -unmap -unmap gH -unmap gt -unmap gT -unmap Y -unmap !! -unmap -unmap -unmap G -unmap gg -unmap / -unmap a -unmap A -iunmap -iunmap -iunmap -iunmap -vunmap L -vunmap H +silent! nunmap j +silent! nunmap k +silent! unmap J +silent! unmap K +silent! unmap +silent! unmap +silent! unmap gH +silent! unmap gt +silent! unmap gT +silent! unmap Y +silent! unmap !! +silent! unmap +silent! unmap +silent! unmap G +silent! unmap gg +silent! unmap / +silent! unmap a +silent! unmap A +silent! iunmap +silent! iunmap +silent! iunmap +silent! iunmap +silent! vunmap L +silent! vunmap H nnoremap j 6j nnoremap k 6k -noremap J gt -noremap K gT -noremap :tabm +1 -noremap :tabm -1 -noremap gH yHP -noremap gt :set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation -noremap gT :set toolbars=noaddons,nobookmarks,menu,tabs,navigation -noremap Y i -noremap !! : -noremap mn'p -noremap mp'n -noremap G mpG -noremap gg mpgg -noremap / mp/ -noremap a A -noremap A a +nnoremap J gt +nnoremap K gT +nnoremap :tabm +1 +nnoremap :tabm -1 +nnoremap gH yHP +nnoremap gt :set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation +nnoremap gT :set toolbars=noaddons,nobookmarks,menu,tabs,navigation +nnoremap Y i +nnoremap !! : +nnoremap mn'p +nnoremap mp'n +nnoremap G mpG +nnoremap gg mpgg +nnoremap / mp/ +nnoremap a A +nnoremap A a +nnoremap \"a :open https://austenwares.com/ +nnoremap \"A :tabopen https://austenwares.com/ inoremap inoremap inoremap