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

This commit is contained in:
Sheppy
2017-09-26 11:43:06 +02:00
2 changed files with 18 additions and 14 deletions

View File

@@ -27,13 +27,14 @@ if [[ "$HOST" == "atlantispc" ]]; then
#hc detect_monitors #hc detect_monitors
hc set swap_monitors_to_get_tag 0 hc set swap_monitors_to_get_tag 0
hc set_monitors 3840x1080+0+0 hc set_monitors 3840x1080+0+0
hc keybind $Mod-o spawn /bin/bash -c "/home/sheppy/.config/i3lock/piclock.sh && sudo s2disk"
fi fi
### Atlantislaptop specific setup ### ### Atlantislaptop specific setup ###
if [[ "$HOST" == "atlantislaptop" ]]; then 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 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)"' hc keybind XF86MonBrightnessDown spawn /bin/bash -c 'tee /sys/class/backlight/intel_backlight/brightness <<< "$(expr $(cat /sys/class/backlight/intel_backlight/brightness) - 5)"'
#/usr/bin/dunst & #/usr/bin/dunst &
hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh & systemctl hibernate" hc keybind $Mod-o spawn /bin/bash -c "/home/ik15ydit/.config/i3lock/piclock.sh && sudo s2disk"
fi fi
### Atlantis general ### Atlantis general

29
zshrc
View File

@@ -1,8 +1,21 @@
#### SET CONDITIONALS #### ### COLOR STDERR ###
NO_LDPRELOAD=false NO_LDPRELOAD=false
if [[ $HOST == "squarez" ]]; then if [[ $HOST == "squarez" ]]; then
NO_LDPRELOAD=true NO_LDPRELOAD=true
fi fi
if [[ $NO_LDPRELOAD == false ]]; then
LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
COLORED_STDERR_FDS=2,
export LD_PRELOAD COLORED_STDERR_FDS
fi
if [[ $FIRST_RUN == "FALSE" ]]; then
;
else
FIRST_RUN="FALSE"
export FIRST_RUN
exec zsh
fi
#### ZSH-INTERNAL #### #### ZSH-INTERNAL ####
### HISTORY ### ### HISTORY ###
@@ -10,13 +23,7 @@ STSIZE=20000
SAVEHIST=20000 SAVEHIST=20000
HISTFILE=~/.config/zshhistory.log HISTFILE=~/.config/zshhistory.log
### COLOR STDERR ###
#legacy, this causes problems in output odering exec 2>>( while IFS='' read X; do print "\e[91m${X}\e[0m" > /dev/tty; done & )
if [[ $NO_LDPRELOAD == false ]]; then
LD_PRELOAD="$HOME/.config/libcoloredstderr.so"
COLORED_STDERR_FDS=2,
export LD_PRELOAD COLORED_STDERR_FDS
fi
### PROMT ### ### PROMT ###
MAIN_PROMT_COLOR="green" MAIN_PROMT_COLOR="green"
@@ -259,11 +266,7 @@ hhs(){print -z "$(cat ~/.config/zshhistory.log | $PECO/peco)"}
zle -N hhstest hhs zle -N hhstest hhs
bindkey ^R hhstest bindkey ^R hhstest
### Experimental ### ### LD PRELOAD FOR ZSH ###
source ~/.config/other/zsh-history-substring-search.zsh
bindkey '^[[5~' history-substring-search-up
bindkey '^[[6~' history-substring-search-down
alias genserverkey='openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 100000'
if [[ $FIRST_RUN == "FALSE" ]]; then if [[ $FIRST_RUN == "FALSE" ]]; then
; ;
else else