Fixed git dt command, initial konsole now opens without wemux. Added tdfsb and sqlitebrowser to desktop.txt. Improved k. Improved vimperatorrc

This commit is contained in:
Austen Adler 2014-08-30 15:59:01 -04:00
parent 38b625763b
commit 07ada7e8c3
5 changed files with 81 additions and 51 deletions

View File

@ -11,8 +11,9 @@
st = status st = status
br = branch -av 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 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\"' - 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" size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i"
[push] [push]
default = matching default = matching

View File

@ -13,8 +13,9 @@ exec --no-startup-id xautolock -time 3 -locker 'i3lock -i `shuf -n1 -e ~/.i3/wal
#startup #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/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 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 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 -e wemux&'
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole &'
exec --no-startup-id i3-msg 'nitrogen --restore' exec --no-startup-id i3-msg 'nitrogen --restore'
#colors #colors

View File

@ -51,3 +51,5 @@ kvpnc
nitrogen nitrogen
banshee banshee
xautolock xautolock
sqlitebrowser
tdfsb

View File

@ -1,7 +1,7 @@
export ZSH=$HOME/.oh-my-zsh export ZSH=$HOME/.oh-my-zsh
ZSH_THEME="af-magic" ZSH_THEME="af-magic"
# Uncomment the following line to enable command auto-correction. # Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true" ENABLE_CORRECTION="true"
COMPLETION_WAITING_DOTS="true" COMPLETION_WAITING_DOTS="true"
# Uncomment the following line if you want to change the command execution time # Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output. # stamp shown in the history command output.
@ -12,12 +12,10 @@ HISTSIZE=12000
SAVEHIST=10000000 SAVEHIST=10000000
setopt HIST_EXPIRE_DUPS_FIRST setopt HIST_EXPIRE_DUPS_FIRST
setopt EXTENDED_HISTORY setopt EXTENDED_HISTORY
export PAGER=/usr/local/bin/vimpager export PAGER=/usr/local/bin/vimpager
alias less=$PAGER alias less=$PAGER
alias zless=$PAGER alias zless=$PAGER
# Would you like to use another custom folder than $ZSH/custom? # Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder # ZSH_CUSTOM=/path/to/new-custom-folder
plugins=(git) 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 g="git $@"
alias echip="curl ifconfig.me" alias echip="curl ifconfig.me"
alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -" alias vpn="cd ~/.openvpn;sudo openvpn config.ovpn;cd -"
alias to="~/tmp/todo/todo.sh"
alias -s html="firefox" alias -s html="firefox"
alias -s log="less -MN" alias -s log="less -MN"
alias -g nify=" > /dev/null 2>&1 &" alias -g nify=" > /dev/null 2>&1 &"
alias -g G='|& egrep -i'
function dnstest(){ function dnstest(){
echo "Testing ping:" echo "Testing ping:"
ping -c 3 8.8.8.8 ping -c 3 8.8.8.8
@ -131,12 +131,28 @@ function tsh(){
} }
function k(){ function k(){
if [[ $# > 1 ]] ; then 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 elif [ -d "$@" ] ; then
#cd then ls
cd "$@" && ls cd "$@" && ls
elif [[ "$@" == "-" ]] ; then elif [[ "$@" == "-" ]] ; then
#Because if this isn't here, k - won't work
cd - && ls cd - && ls
elif [ -f "$@" ] ; then elif [ -f "$@" ] ; then
#Extract if it's extractable
case $1 in case $1 in
*.tar.xz) tar xvf $1 ;; *.tar.xz) tar xvf $1 ;;
*.tar.bz2) tar xvjf $1 ;; *.tar.bz2) tar xvjf $1 ;;
@ -153,22 +169,30 @@ function k(){
*) vim $1 *) vim $1
esac esac
else else
echo -n "Exec [dcyfx]: " echo -n "Exec [dcvfxX]: "
read a read a
if [[ $a == "d" ]] ; then if [[ $a == "d" ]] ; then
#Create directory
mkdir $@ mkdir $@
elif [[ $a == "c" ]] ; then elif [[ $a == "c" ]] ; then
#Create directory and cd into it
mkdir $@ mkdir $@
cd $@ cd $@
elif [[ $a == "y" ]] ; then elif [[ $a == "v" ]] ; then
#Edit with vim
vim "$@" vim "$@"
elif [[ $a == "f" ]] ; then elif [[ $a == "f" ]] ; then
#Open with Firefox
firefox "$@" firefox "$@"
elif [[ $a == "x" ]] ; then elif [[ $a == "x" ]] ; then
#rm file
rm "$@" rm "$@"
elif [[ $a == "xd" ]] ; then elif [[ $a == "X" ]] ; then
#rm directory
rmdir "$@" rmdir "$@"
elif [[ $a == "XX" ]] ; then
#rm -rf everything
rm -rf "$@"
fi fi
fi fi
} }
function mcl(){ mkdir "$@"&&k "$@"; }

View File

@ -1,46 +1,48 @@
nunmap j silent! nunmap j
nunmap k silent! nunmap k
unmap J silent! unmap J
unmap K silent! unmap K
unmap <C-j> silent! unmap <C-j>
unmap <C-k> silent! unmap <C-k>
unmap gH silent! unmap gH
unmap gt silent! unmap gt
unmap gT silent! unmap gT
unmap Y silent! unmap Y
unmap !! silent! unmap !!
unmap <C-o> silent! unmap <C-o>
unmap <C-i> silent! unmap <C-i>
unmap G silent! unmap G
unmap gg silent! unmap gg
unmap / silent! unmap /
unmap a silent! unmap a
unmap A silent! unmap A
iunmap <C-L> silent! iunmap <C-L>
iunmap <C-H> silent! iunmap <C-H>
iunmap <C-b> silent! iunmap <C-b>
iunmap <C-w> silent! iunmap <C-w>
vunmap L silent! vunmap L
vunmap H silent! vunmap H
nnoremap j 6j nnoremap j 6j
nnoremap k 6k nnoremap k 6k
noremap J gt nnoremap J gt
noremap K gT nnoremap K gT
noremap <C-j> :tabm +1<CR> nnoremap <C-j> :tabm +1<CR>
noremap <C-k> :tabm -1<CR> nnoremap <C-k> :tabm -1<CR>
noremap gH yHP nnoremap gH yHP
noremap gt :set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation<CR> nnoremap gt :set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation<CR>
noremap gT :set toolbars=noaddons,nobookmarks,menu,tabs,navigation<CR> nnoremap gT :set toolbars=noaddons,nobookmarks,menu,tabs,navigation<CR>
noremap Y i<C-c> nnoremap Y i<C-c>
noremap !! :<Up> nnoremap !! :<Up>
noremap <C-o> mn'p<Esc> nnoremap <C-o> mn'p<Esc>
noremap <C-i> mp'n<Esc> nnoremap <C-i> mp'n<Esc>
noremap G mpG<Esc> nnoremap G mpG<Esc>
noremap gg mpgg<Esc> nnoremap gg mpgg<Esc>
noremap / mp/ nnoremap / mp/
noremap a A nnoremap a A
noremap A a nnoremap A a
nnoremap \"a :open https://austenwares.com/
nnoremap \"A :tabopen https://austenwares.com/
inoremap <C-L> <End> inoremap <C-L> <End>
inoremap <C-H> <Home> inoremap <C-H> <Home>
inoremap <C-b> <C-Left> inoremap <C-b> <C-Left>