more hsotname checking and small fixes

This commit is contained in:
Sheppy
2016-12-15 17:32:10 +01:00
parent e85f2e4cb0
commit 48d5b2ecef
2 changed files with 21 additions and 13 deletions

View File

@@ -16,17 +16,24 @@ hc keyunbind --all
#variables #variables
Mod=Mod4 # Use the super key as the main modifier Mod=Mod4 # Use the super key as the main modifier
######### MACHINE SPECIFIC SETUP #########
### Atlantis PC-specific setup ### ### Atlantis PC-specific setup ###
if [[ $HOST == "atlantispc" ]]; then if [[ $HOST == "atlantispc" ]]; then
hc detect_monitors hc detect_monitors
/usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1 /usr/bin/xrandr --output DVI-I-2 --right-of DVI-I-1
xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh & xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
fi fi
### Atlantislaptop specific setup ###
if [[ $HOST == "atlantislaptop" ]]; then
hc keybind XF86MonBrightnessUp spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) + 5)"'
hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
fi
######### GENERAL SETUP #########
# keybindings # keybindings
#client handling #client handling
hc keybind $Mod-Shift-q quit hc keybind $Mod-Shift-q quit
if [[ $HOST =~ atlantis.* ]]; then if [[ $HOST =~ atlantis* ]]; then
hc keybind $Mod-Shift-p spawn /sbin/poweroff hc keybind $Mod-Shift-p spawn /sbin/poweroff
fi fi
hc keybind $Mod-Shift-r reload hc keybind $Mod-Shift-r reload
@@ -37,7 +44,7 @@ hc keybind $Mod-q close
hc keybind $Mod-Return spawn urxvt hc keybind $Mod-Return spawn urxvt
hc keybind $Mod-Shift-Return spawn xterm /bin/bash hc keybind $Mod-Shift-Return spawn xterm /bin/bash
hc keybind $Mod-i spawn chromium hc keybind $Mod-i spawn chromium
if [[ $HOST =~ atlantis.* ]]; then if [[ $HOST =~ atlantis* ]]; then
hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t
fi fi
hc keybind $Mod-p spawn pavucontrol hc keybind $Mod-p spawn pavucontrol
@@ -129,11 +136,6 @@ hc keybind $Mod-Shift-u spawn /bin/sh -c 'pactl set-sink-volume @DEFAULT_SINK@ -
hc keybind XF86AudioMute spawn /bin/sh -c 'pactl set-sink-mute @DEFAULT_SINK@ toggle' #toggle mute hc keybind XF86AudioMute spawn /bin/sh -c 'pactl set-sink-mute @DEFAULT_SINK@ toggle' #toggle mute
hc keybind $Mod-m spawn /bin/sh -c 'pactl set-sink-mute @DEFAULT_SINK@ toggle' hc keybind $Mod-m spawn /bin/sh -c 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
#brightness
hc keybind XF86MonBrightnessUp spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) + 5)"'
hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
# theme # theme
hc attr theme.tiling.reset 1 hc attr theme.tiling.reset 1
hc attr theme.floating.reset 1 hc attr theme.floating.reset 1

18
zshrc
View File

@@ -85,8 +85,9 @@ fi
## MARKINGBIRD ## ## MARKINGBIRD ##
export PYTHONPATH=/local/python3-typing export PYTHONPATH=/local/python3-typing
if [[ $HOST =~ faui.* ]]; then if [[ $HOST == faui* ]]; then
alias mabird="/proj/ik15ydit/reps/MarkingBird/MarkingBird.py" alias mabird="/proj/ik15ydit/reps/MarkingBird/MarkingBird.py"
fi
## PATHS ## ## PATHS ##
if [[ $HOST =~ faui* ]]; then if [[ $HOST =~ faui* ]]; then
@@ -107,12 +108,18 @@ alias zshconf="vim ~/.zshrc"
alias vimconf="vim ~/.vimrc" alias vimconf="vim ~/.vimrc"
alias sshconf="vim ~/.ssh/config" alias sshconf="vim ~/.ssh/config"
## CIP SHORTCUTS ##
if [[ $HOST =~ faui* ]]; then
alias mpstubs="cd /proj/ciptmp/ik15ydit/reps/mpstubs/"
alias reps="cd /proj/ciptmp/ik15ydit/reps/"
alias rudipub='cd /home/cip/2010/he29heri/pub/'
fi
if [[ $HOST =~ atlantis.* ]]; then ## DIPLAY CONTROL ##
if [[ $HOST =~ atlantis* ]]; then
alias dual="xrandr --output DVI-I-2 --right-of DVI-I-1" alias dual="xrandr --output DVI-I-2 --right-of DVI-I-1"
alias shutown="/sbin/poweroff" alias shutown="/sbin/poweroff"
fi fi
if [[ $HOST == "atlantislaptop" ]]; then if [[ $HOST == "atlantislaptop" ]]; then
alias backlightctl="tee /sys/class/backlight/intel_backlight/brightness <<< $1" alias backlightctl="tee /sys/class/backlight/intel_backlight/brightness <<< $1"
fi fi
@@ -121,11 +128,10 @@ fi
alias javac-all-test4='javac -cp .:/usr/share/java/junit4.jar *.java' alias javac-all-test4='javac -cp .:/usr/share/java/junit4.jar *.java'
alias java-test4='java -cp .:/usr/share/java/junit4.jar' alias java-test4='java -cp .:/usr/share/java/junit4.jar'
#aliases migrated from bashrc ## /zsh/random ##
alias spc='gcc -std=c99 -pedantic -Wall -Werror -D_XOPEN_SOURCE=700 -o' alias spc='gcc -std=c99 -pedantic -Wall -Werror -D_XOPEN_SOURCE=700 -o'
alias woist='ssh ircbox nc localhost 1339 | grep -B1 " in .zshrci' alias woist='ssh ircbox nc localhost 1339 | grep -B1 " in .zshrci'
alias logins='nc localhost 1339 | grep -B1' alias logins='nc localhost 1339 | grep -B1'
alias rudipub='cd /home/cip/2010/he29heri/pub/'
alias cltex="rm *.log *.aux *.fdb_latexmk *.fls" alias cltex="rm *.log *.aux *.fdb_latexmk *.fls"
alias wordcount="find . -type f -exec cat {} + | wc -w" alias wordcount="find . -type f -exec cat {} + | wc -w"
@@ -155,6 +161,6 @@ if [[ $HOST == "atlantislaptop" ]]; then
fi fi
### DISABLE MESSAGES ### ### DISABLE MESSAGES ###
if [[ $HOST =~ faui.* ]]; then if [[ $HOST =~ faui* ]]; then
mesg n mesg n
fi fi