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

Major improvements

Browse Source
This commit is contained in:
Austen Adler 2015-03-12 16:54:37 -04:00
parent 63e2c183b6
commit e4b8d3f800
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git/gitconfig
View File

@ -3,6 +3,7 @@
email = stonewareslord@gmail.com email = stonewareslord@gmail.com
[alias] [alias]
i = "!git br&&git st" i = "!git br&&git st"
# coa = "!for i in $(git branch -a|cut -b3-|grep remotes|sed -e 's/remotes\///'|cut -d/ -f1 --complement|cut -d\ -f1);do git checkout $i;done"
pul = pull pul = pull
pus = push --all pus = push --all
co = checkout co = checkout

2
i3/config
View File

@ -183,7 +183,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/gtk-redshift -l 36.3:-80.3 -t 6500:4000
exec --no-startup-id /usr/bin/parcellite exec --no-startup-id /usr/bin/parcellite
exec --no-startup-id /usr/bin/numlockx exec --no-startup-id /usr/bin/numlockx
bindsym $mod+p exec dmenu_run -p Run -l 5 -i bindsym $mod+p exec dmenu_run -p Run -l 5 -i -f
bindsym $mod+shift+p exec "~/.i3/run.sh pass" bindsym $mod+shift+p exec "~/.i3/run.sh pass"
#exec --no-startup-id /usr/bin/synapse -s #exec --no-startup-id /usr/bin/synapse -s
exec --no-startup-id /usr/bin/zeal exec --no-startup-id /usr/bin/zeal

14
i3/run.sh
View File

@ -1,11 +1,17 @@
#!/bin/zsh #!/bin/zsh
if [ "$1" = "lock" ];then if [ "$1" = "lock" ];then
synclient TouchpadOff=1 #synclient TouchpadOff=1
while [ ! "$PASSWORD" = "a" ];do export PASSWORD=$(echo|dmenu -p Locked);done MOUSE=$(xinput list | grep Mouse | sed -e 's/.*id=//' | cut -f 1)
synclient TouchpadOff=0 TRACK=$(xinput list | grep 'TouchPad' | sed -e 's/.*id=//' | cut -f 1)
xinput set-prop $MOUSE "Device Enabled" 0
xinput set-prop $TRACK "Device Enabled" 0
while [ ! "$PASSWORD" = "a" ];do export PASSWORD=$(echo|dmenu -f -p Locked);done
xinput set-prop $MOUSE "Device Enabled" 1
xinput set-prop $TRACK "Device Enabled" 1
#synclient TouchpadOff=0
fi fi
if [ "$1" = "pass" ];then if [ "$1" = "pass" ];then
pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|dmenu -l 5|sed -e 's/\.gpg//') pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|dmenu -f -l 5|sed -e 's/\.gpg//')
fi fi
if [ "$1" = "screensaver" ];then if [ "$1" = "screensaver" ];then
cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*` cat /tmp/noss||i3lock -di `shuf -n1 -e ~/.i3/wall/*`

1
scripts/ffmpeg.sh
View File

@ -1,4 +1,3 @@
sudo apt-get -y install autoconf automake build-essential libass-dev libfreetype6-dev libgpac-dev libsdl1.2-dev libtheora-dev libtool libva-dev libvdpau-dev libvorbis-dev libx11-dev libxext-dev libxfixes-dev pkg-config texi2html zlib1g-dev yasm libx264-dev unzip libmp3lame-dev libopus-dev
mkdir ~/ffmpeg_sources mkdir ~/ffmpeg_sources
cd ~/ffmpeg_sources cd ~/ffmpeg_sources
wget -O fdk-aac.zip https://github.com/mstorsjo/fdk-aac/zipball/master wget -O fdk-aac.zip https://github.com/mstorsjo/fdk-aac/zipball/master

1
shells/liquidpromptrc
View File

@ -4,7 +4,6 @@ LP_ENABLE_BATT=1
LP_ENABLE_SSH_COLORS=1 LP_ENABLE_SSH_COLORS=1
LP_USER_ALWAYS=0 LP_USER_ALWAYS=0
LP_ENABLE_OHMYGIT=1 LP_ENABLE_OHMYGIT=1
LP_ENABLE_BATT=1
LP_ENABLE_JOBS=1 LP_ENABLE_JOBS=1
LP_ENABLE_SHORTEN_PATH=0 LP_ENABLE_SHORTEN_PATH=0
#LP_ENABLE_RUNTIME=1 #LP_ENABLE_RUNTIME=1

4
shells/zshrc
View File

@ -17,7 +17,7 @@ setopt APPEND_HISTORY SHARE_HISTORY HISTIGNOREALLDUPS
plugins=(wd gem pass pip python sudo vagrant) plugins=(wd gem pass pip python sudo vagrant)
DISABLE_AUTO_UPDATE="true" DISABLE_AUTO_UPDATE="true"
source "$HOME/.antigen/antigen.zsh" source "$HOME/.antigen/antigen.zsh"
antigen bundle stonewareslord/oh-my-git antigen bundle stonewareslord/omg
#antigen bundle arialdomartini/oh-my-git #antigen bundle arialdomartini/oh-my-git
printf "oh-my-zsh..." printf "oh-my-zsh..."
antigen use oh-my-zsh antigen use oh-my-zsh
@ -240,7 +240,7 @@ function k(){
elif [ -f "$@" ] ; then elif [ -f "$@" ] ; then
#Extract if it's extractable #Extract if it's extractable
case $1 in case $1 in
*.tar.xz) pv $1|tar xzf -;; *.tar.xz) pv $1|tar xJf -;;
*.tar.bz2) pv $1|tar xjf -;; *.tar.bz2) pv $1|tar xjf -;;
*.tar.gz) pv $1|tar xzf -;; *.tar.gz) pv $1|tar xzf -;;
*.tar) pv $1|tar xf ;; *.tar) pv $1|tar xf ;;

3
vim/vimrc
View File

@ -163,7 +163,7 @@ set ttyfast
set ff=unix set ff=unix
set encoding=utf-8 set encoding=utf-8
set laststatus=2 set laststatus=2
set foldmethod=marker set foldmethod=indent
set foldnestmax=10 set foldnestmax=10
set foldlevel=2 set foldlevel=2
set rnu set rnu
@ -396,4 +396,3 @@ function! Initialize()
endif endif
endif endif
endfunction endfunction