david/myzsh
david
/
myzsh
Archived
1
0
Fork 0

david.zsh

This commit is contained in:
david 2016-10-02 08:48:33 +02:00
commit 426e19d2eb
1 changed files with 11 additions and 1 deletions

View File

@ -12,15 +12,20 @@ alias vless="/usr/share/vim/vim73/macros/less.sh"
alias publish="python2 -m SimpleHTTPServer"
alias push="git push origin master"
alias pull="git pull origin master"
<<<<<<< HEAD
alias dev="ssh -l david 10.9.0.43"
alias t="todo.sh"
alias vpn="sudo openvpn --writepid /var/run/openvpn --config /home/david/.vpn/david.conf"
alias aec="sshuttle -vvr 90.146.8.233 192.168.6.0/24 90.146.8.0/26 10.9.0.0/26 10.12.0.0/16 10.2.0.0/26 192.168.3.0/24 10.12.4.0/22"
alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/24"
=======
alias home="sshuttle -vvr stargazer.socialnerds.org:2222 10.1.2.0/26"
alias aec="sshuttle -vvr 90.146.8.9 90.146.8.0/26"
>>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
alias c="clear"
alias bat="acpi && date"
alias vn="vim ~/ownCloud/Notes/notes.md"
alias horizon="sshfs david@horizon.socialnerds.org:/ /home/david/horizon"
#alias spacedock="sshfs spacedock.socialnerds.org:/ /home/david/spacedock"
# Functions
pingscan()
@ -50,6 +55,7 @@ rdp()
domain="aec.at"
fi
<<<<<<< HEAD
which rdesktop >/dev/null
if [ $? -eq 0 ]; then
#rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
@ -63,6 +69,10 @@ rdp()
exit 1
fi
fi
=======
#rdesktop -u $username -p - -d $domain -g 1366x768 $server -k de
rdesktop -K -u $username -p - -d $domain -g workarea $server -k de -x l
>>>>>>> 09c08907e220f0e3c8c0165ce31ac4129581a9d4
}