stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More minor improvements

Browse Source
This commit is contained in:
Austen Adler 2015-01-14 22:27:59 -05:00
parent 40ccf1c8ee
commit 680418d221
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git/gitconfig
View File

@ -16,6 +16,7 @@
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\"' - 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"
wipe = !sh -c 'git filter-branch --prune-empty -f --index-filter \\\\\"git rm -rf --cached --ignore-unmatch \\\"$1\\\"\\\\\" --tag-name-filter cat -- --all' -
[push] [push]
default = matching default = matching
[core] [core]

3
i3/config
View File

@ -75,6 +75,7 @@ mode "resize" {
#font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 #font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
floating_modifier $mod floating_modifier $mod
bindsym $mod+Return exec xterm bindsym $mod+Return exec xterm
bindsym $mod+Shift+Return exec xterm -e "cd `xcwd`&&/bin/zsh"
bindsym $mod+Shift+c kill bindsym $mod+Shift+c kill
bindsym $mod+c move absolute position center bindsym $mod+c move absolute position center
bindsym XF86TouchpadToggle exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')" bindsym XF86TouchpadToggle exec "synclient TouchpadOff=$(synclient -l | grep -c 'TouchpadOff.*=.*0')"
@ -165,7 +166,7 @@ exec --no-startup-id i3-msg /usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/xterm' exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/xterm'
exec --no-startup-id /usr/bin/shutter --min_at_startup exec --no-startup-id /usr/bin/shutter --min_at_startup
exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing exec --no-startup-id /usr/bin/screen -dmS syncthing /home/stonewareslord/Applications/syncthing/syncthing
exec --no-startup-id "sleep 10;/usr/bin/owncloud" exec --no-startup-id "sleep 25;/usr/bin/owncloud"
exec --no-startup-id /usr/bin/nm-applet exec --no-startup-id /usr/bin/nm-applet
exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000 exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
exec --no-startup-id /usr/bin/diodon exec --no-startup-id /usr/bin/diodon

1
scripts/sync.sh
View File

@ -1,4 +1,5 @@
ABSPATH=$(cd "$(dirname "$0")/.."; pwd) ABSPATH=$(cd "$(dirname "$0")/.."; pwd)
echo $ABSPATH
while getopts ":hbsdpcw" VALUE "$@"; do while getopts ":hbsdpcw" VALUE "$@"; do
if [ "$VALUE" = "h" ] ; then if [ "$VALUE" = "h" ] ; then
echo "sync.sh syncs configuration files, applications, and Vim bundles between computers" echo "sync.sh syncs configuration files, applications, and Vim bundles between computers"

5
shells/zshrc
View File

@ -47,9 +47,9 @@ 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 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$//'\'')"' 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$//'\'')"'
alias disphost='export DISPLAY=:0.0' alias disphost='export DISPLAY=:0.0'
alias ll='ls -alF' alias ll='ls -AglhF'
alias la='ls -A' alias la='ls -A'
alias l='ls -CF' alias l='ls -CFA'
alias logout='sudo pkill -u $USER' alias logout='sudo pkill -u $USER'
alias fixsh='ssh-keygen -R' alias fixsh='ssh-keygen -R'
alias tmux='tmux -2' alias tmux='tmux -2'
@ -62,7 +62,6 @@ function c() { cp "$@" }
function mv() { /bin/mv -v "$@" } function mv() { /bin/mv -v "$@" }
function m() { mv "$@" } function m() { mv "$@" }
compdef _cp c m mv cp compdef _cp c m mv cp
alias la='ls -lah $LS_COLOR'
alias dt='date "+%F %T"' alias dt='date "+%F %T"'
alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done' alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
alias adk='/home/stonewareslord/Applications/adk/bin/studio.sh & disown' alias adk='/home/stonewareslord/Applications/adk/bin/studio.sh & disown'