Merge branch 'master' of gitlab.cs.fau.de:ik15ydit/config

This commit is contained in:
atlantispc_sheppy
2017-06-17 16:31:34 +02:00
4 changed files with 13 additions and 6 deletions

View File

@@ -12,9 +12,9 @@ xsetroot -solid '#5A8E3A'
# reset
hc keyunbind --all
#pkill dunst
pkill xautolock
# WONT WORK --> cause process has other name no idea which though pkill -s 15 hl_status_deamon #send SIGTERM for correct termination during write
pkill hl_status_deamo
#variables
Mod=Mod4 # Use the super key as the main modifier
@@ -35,6 +35,7 @@ if [[ "$HOST" == "atlantislaptop" ]]; then
#/usr/bin/dunst &
hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh & systemctl hibernate"
fi
### Atlantis general
if [[ ( "$HOST" == "atlantispc" ) || ( "$HOST" == "atlantislaptop" ) ]]; then
xautolock -time 15 -locker /home/ik15ydit/.config/i3lock/piclock.sh &
@@ -49,7 +50,7 @@ hc spawn ~/.config/herbstluftwm/hl_status_deamon.py
# keybindings
#client handling
hc keybind $Mod-Shift-q quit
hc keybind $Mod-Shift-q spawn /bin/bash -c "pkill hl_status_deamo & pkill ssh-agent & herbstclient quit"
if [[ $HOST =~ atlantis* ]]; then
hc keybind $Mod-Shift-p spawn sudo /sbin/poweroff
fi

View File

@@ -118,7 +118,7 @@ hc pad $monitor $panel_height
echo -n "^bg()^fg() ${windowtitle//^/^^}"
####################### Interface to python layer #########################
right="30. Mai 14 Kobras |$($HOME/.config/herbstluftwm/hl_panel_content.py) $date"
right="$($HOME/.config/herbstluftwm/hl_panel_content.py) $date"
right_text_only=$(echo -n "$right" | sed 's.\^[^(]*([^)]*)..g')
# get width of right aligned text.. and add some space..

View File

@@ -3,6 +3,7 @@ Host atlantismedion
Host gitlab.cs.fau.de
IdentityFile ~/.ssh/gitrsa
Host *.fauiwg.de
User sheppy
IdentityFile ~/.ssh/wg
Host *.cs.fau.de
IdentityFile ~/.ssh/cipkey

11
zshrc
View File

@@ -31,12 +31,13 @@ fi
setopt promptsubst
CMD_START=$'%F{$MAIN_PROMT_COLOR}--->%f '
PS1=$'%F{$USER_COLOR}%m%f%F{red}:%f%F{cyan}%~%f\n'$CMD_START #promt
PS1=%F{$MAIN_PROMT_COLOR}$'${(r:$COLUMNS::\u2500:)}'%f$PS1
if [[ ( $USER != 'sheppy') && ( $USER != 'ik15ydit') && ( $USER != 'root' ) ]]; then
PS1='%n'$PS1
PS1='%F{cyan}%n%f%F{red}@%f'$PS1
fi
PS1=%F{$MAIN_PROMT_COLOR}$'${(r:$COLUMNS::\u2500:)}'%f$PS1
### STYLE ###
zstyle ':completion:*:default' list-prompt '%p'
zstyle ':completion:*' use-cache yes; zstyle ':completion:*' cache-path #~/.zsh/cache (~/.zsh muss existieren)
@@ -164,9 +165,13 @@ alias irc="ssh ircbox.cs.fau.de -t 'command; tmux a'"
alias -g uni="ik15ydit@faui06c.cs.fau.de"
alias cipkey="ssh-add ~/.ssh/ciplogin"
alias cipra="xpra start ssh:ik15ydit@faui00n.cs.fau.de:100 --start-child urxvt"
alias mountcip="sshfs ik15ydit@faui00n.cs.fau.de:/ -o idmap=user $CIP_MOUNTPOINT"
alias mountcip="sshfs ik15ydit@faui00n.cs.fau.de:/ -o reconnect,idmap=user $CIP_MOUNTPOINT"
alias umountcip="fusermount -u $CIP_MOUNTPOINT"
## CONNECT Locally ##
alias -g atlantislaptop = "ik15ydit@atlantislaptop.local"
alias -g atlantismedion = "ik15ydit@atlantismedion.local"
## DIRECT TO CONFIG ##
alias hlconf="vim ~/.config/herbstluftwm/autostart"
alias zshconf="vim ~/.zshrc"