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

This commit is contained in:
Sheppy
2017-07-24 17:52:35 +02:00
3 changed files with 17 additions and 5 deletions

View File

@@ -129,6 +129,7 @@ hc add "6"
hc add "7" hc add "7"
hc add "8" hc add "8"
hc add "9" hc add "9"
hc add "0"
hc keybind $Mod-1 use_index 0 hc keybind $Mod-1 use_index 0
hc keybind $Mod-Shift-1 move_index 0 hc keybind $Mod-Shift-1 move_index 0
hc keybind $Mod-2 use_index 1 hc keybind $Mod-2 use_index 1
@@ -147,6 +148,8 @@ hc keybind $Mod-8 use_index 7
hc keybind $Mod-Shift-8 move_index 7 hc keybind $Mod-Shift-8 move_index 7
hc keybind $Mod-9 use_index 8 hc keybind $Mod-9 use_index 8
hc keybind $Mod-Shift-9 move_index 8 hc keybind $Mod-Shift-9 move_index 8
hc keybind $Mod-0 use_index 9
hc keybind $Mod-Shift-0 move_index 9
# cycle through tags # cycle through tags

View File

@@ -27,8 +27,10 @@ def color_panel(s,hex_code,seper=True):
def get_color(nr,start,end): def get_color(nr,start,end):
if nr == 88: if nr == 88:
return hex(GREEN) return hex(GREEN)
if end == start or nr >= end: elif end == start or nr >= end:
return hex(GREEN) return hex(GREEN)
elif nr <= 0:
return hex(RED)
else: else:
r,g,b = 0,0,0 r,g,b = 0,0,0
interval = 256 + 256 interval = 256 + 256
@@ -65,11 +67,11 @@ def get_color(nr,start,end):
def guthaben(): def guthaben():
guthaben = '' guthaben = ''
if hl_utils.is_cip(): if hl_utils.is_cip():
tmp = -1 raw = ""
with open(hl_utils.hlpath("pracct.log")) as f: with open(hl_utils.hlpath("pracct.log")) as f:
tmp = float(f.read()); raw = f.read();
guthaben = "Druckerguthaben: " + str(tmp) + " Euro" guthaben = "Druckerguthaben: " + raw + " Euro"
col = get_color(tmp,0,COLOR_BORDER) col = get_color(float(raw),0,COLOR_BORDER)
guthaben = color_panel(guthaben,col) guthaben = color_panel(guthaben,col)
return guthaben; return guthaben;

7
zshrc
View File

@@ -264,3 +264,10 @@ source ~/.config/other/zsh-history-substring-search.zsh
bindkey '^[[5~' history-substring-search-up bindkey '^[[5~' history-substring-search-up
bindkey '^[[6~' history-substring-search-down bindkey '^[[6~' history-substring-search-down
alias genserverkey='openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 100000' alias genserverkey='openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 100000'
if [[ $FIRST_RUN == "FALSE" ]]; then
;
else
FIRST_RUN="FALSE"
export FIRST_RUN
exec zsh
fi