Made changes.

This commit is contained in:
Austen Adler 2015-07-22 16:28:39 -04:00
parent a5b49c9c77
commit 14904a1b71
4 changed files with 31 additions and 16 deletions

View File

@ -1,14 +1,29 @@
#!/bin/zsh
if [ "$1" = "lock" ];then
#synclient TouchpadOff=1
MOUSE=$(xinput list | grep Mouse | sed -e 's/.*id=//' | cut -f 1)
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=$((rofi -dmenu $(i3-color-rofi))</dev/null);done
xinput set-prop $MOUSE "Device Enabled" 1
xinput set-prop $TRACK "Device Enabled" 1
#synclient TouchpadOff=0
#!/bin/bash
declare -i ID
ID=`xinput list | grep -Eo 'TouchPad\s*id\=[0-9]{1,2}' | grep -Eo '[0-9]{1,2}'`
declare -i STATE
STATE=`xinput list-props $ID|grep 'Device Enabled'|awk '{print $4}'`
if [ $STATE -eq 1 ];then
xinput disable $ID
echo "Touchpad disabled."
else
xinput enable $ID
echo "Touchpad enabled."
fi
##synclient TouchpadOff=1
#MOUSE=$(xinput list | grep Mouse | sed -e 's/.*id=//' | cut -f 1)
#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=$((rofi -dmenu $(i3-color-rofi))</dev/null);done
#xinput set-prop $MOUSE "Device Enabled" 1
#xinput set-prop $TRACK "Device Enabled" 1
##synclient TouchpadOff=0
fi
if [ "$1" = "pass" ];then
pass -c $(ls ~/.password-store/*/*|cut -b-37 --complement|rofi -dmenu $(i3-color-rofi)|sed -e 's/\.gpg//')

View File

@ -6,9 +6,9 @@ mkdir -p /tmp/tests
echo -e "${green}Making test directories${close}"
cd /tmp/tests
git init
git remote add iHttp http://98.26.78.121/gitlab/stonewareslord/ExampleProject.git
git remote add iHttps https://98.26.78.121/gitlab/stonewareslord/ExampleProject.git
git remote add iSsh git@98.26.78.121:stonewareslord/ExampleProject.git
git remote add iHttp http://107.15.82.213/gitlab/stonewareslord/ExampleProject.git
git remote add iHttps https://107.15.82.213/gitlab/stonewareslord/ExampleProject.git
git remote add iSsh git@107.15.82.213:stonewareslord/ExampleProject.git
git remote add dHttp http://austenwares.com/gitlab/stonewareslord/ExampleProject.git
git remote add dHttps https://austenwares.com/gitlab/stonewareslord/ExampleProject.git
git remote add dSsh git@austenwares.com:stonewareslord/ExampleProject.git

View File

@ -43,7 +43,6 @@ function fixsh(){
alias tmux='tmux -2'
alias less='less -R'
alias tree='tree -C'
alias grep="grep -P"
alias skim="(head -5; tail -5) <"
alias cp='rsync -ha --info=progress2 "$@"'
function mv() { /bin/mv -v "$@" }
@ -101,8 +100,8 @@ alias -g c='rsync -ha --info=progress2 "$@"'
alias -g F='`fzf --no-mouse -m -1 -x`'
alias -g nify=" > /dev/null 2>&1 &"
alias -g nifyd=" > /dev/null 2>&1 & disown"
#alias -g L="2>&1|less"
alias -g L="2>&1|vimpager"
alias -g L="2>&1|less"
#alias -g L="2>&1|vimpager"
alias -g G='|& ag'
export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'
function ctar(){
@ -182,7 +181,7 @@ function tsh(){
fi
}
function mcl(){
mkdir $1
mkdir -p $1
cd $1
}
function k(){

View File

@ -180,6 +180,7 @@ set nocompatible
set ignorecase
set textwidth=0
syntax on
let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`', '<':'>', '%':'%'}
let g:signify_vcs_list = [ 'git', 'svn' ]
let g:signify_difftool = 'diff'
let g:ctrlp_root_markers = ['.cproot']