Merge branch 'master' of fucktheforce.de:xeno

2 files changed, 53 insertions, 65 deletions

diff --git a/i3/config b/i3/config
index b12902e..2a0b22f 100644
--- a/i3/config
+++ b/i3/config
@@ -1,72 +1,62 @@
-#workspace 1 com
-#workspace 2 web
-#workspace 3 div
-#workspace 4 div
-#workspace 5 div
-#workspace 6 div
-#workspace 7 div
-#workspace 8 div
-#workspace 9 div
-#workspace 10 div
-
 client.focused			#303030 #202020 #fecf35
 client.unfocused 		#303030 #202020 #b8b8b8
 client.focused_inactive #303030 #202020 #b8b8b8
 client.urgent			#303030 #202020 #ff9800
 
-bar.focused				#303030 #202020 #fecf35
-bar.unfocused 			#303030 #202020 #b8b8b8
-bar.urgent				#303030 #202020 #ff9800
-
 font *-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*
-workspace_bar yes
-
-bind mod1+58 f
-bind mod1+43 s
-bind mod1+47 d
-bind mod1+65 t
-bind mod1+27 kill
-
-bind mod1+44 h
-bind mod1+45 j
-bind mod1+31 k
-bind mod1+46 l
-
-bind mod1+shift+44 mh
-bind mod1+shift+45 mj
-bind mod1+shift+31 mk
-bind mod1+shift+46 ml
-
-bind mod1+10 1
-bind mod1+11 2
-bind mod1+12 3
-bind mod1+13 4
-bind mod1+14 5
-bind mod1+15 6
-bind mod1+16 7
-bind mod1+17 8
-bind mod1+18 9
-bind mod1+19 10
-
-bind mod1+shift+10 m1
-bind mod1+shift+11 m2
-bind mod1+shift+12 m3
-bind mod1+shift+13 m4
-bind mod1+shift+14 m5
-bind mod1+shift+15 m6
-bind mod1+shift+16 m7
-bind mod1+shift+17 m8
-bind mod1+shift+18 m9
-bind mod1+shift+19 m10
-
-bind mod1+36 exec /usr/bin/urxvt
-bind mod1+26 exec /usr/bin/xscreensaver-command -lock
-bind mod1+33 exec /usr/bin/dmenu_run -nb "#000000" -nf "#fecf35" -sb "#303030" -sf "#fecf35"
-
-bind mod1+shift+33 exit
-bind mod1+shift+45 restart
+floating_modifier mod1
+
+bindcode mod1+58 fullscreen
+bindcode mod1+43 layout stacking
+bindcode mod1+47 layout default
+bindcode mod1+48 layout tabbed
+bindcode mod1+65 floating toggle
+bindcode mod1+27 kill
+
+bindcode mod1+44 focus left
+bindcode mod1+45 focus down
+bindcode mod1+31 focus up
+bindcode mod1+46 focus right
+
+bindcode mod1+shift+44 move left
+bindcode mod1+shift+45 move down
+bindcode mod1+shift+31 move up
+bindcode mod1+shift+46 move right
+
+bindcode mod1+59 split v
+bindcode mod1+60 split h
+
+bindcode mod1+10 workspace 1
+bindcode mod1+11 workspace 2
+bindcode mod1+12 workspace 3
+bindcode mod1+13 workspace 4
+bindcode mod1+14 workspace 5
+bindcode mod1+15 workspace 6
+bindcode mod1+16 workspace 7
+bindcode mod1+17 workspace 8
+bindcode mod1+18 workspace 9
+bindcode mod1+19 workspace 10
+
+bindcode mod1+shift+10 move workspace 1
+bindcode mod1+shift+11 move workspace 2
+bindcode mod1+shift+12 move workspace 3
+bindcode mod1+shift+13 move workspace 4
+bindcode mod1+shift+14 move workspace 5
+bindcode mod1+shift+15 move workspace 6
+bindcode mod1+shift+16 move workspace 7
+bindcode mod1+shift+17 move workspace 8
+bindcode mod1+shift+18 move workspace 9
+bindcode mod1+shift+19 move workspace 10
+
+bindcode mod1+36 exec /usr/bin/urxvt
+bindcode mod1+26 exec /usr/bin/xscreensaver-command -lock
+bindcode mod1+33 exec /usr/bin/dmenu_run -nb "#000000" -nf "#fecf35" -sb "#303030" -sf "#fecf35"
+bindcode mod1+29 exec ~/etc/bin/randwall
+
+bindcode mod1+control+33 exit
+bindcode mod1+control+45 restart
 
-#exec i3status -c .i3/status | dzen2 -bg '#000000' -fg "#fecf35" -ta 'c' -fn '-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*'
 exec conky
+exec i3bar -d --color-focus-ws-fg "fecf35" --color-focus-ws-bg "202020" --color-inactive-ws-fg "b8b8b8" --color-inactive-ws-bg "202020" --color-urgent-ws-fg "ff9800"
 
 ipc-socket ~/.i3/ipc.sock
diff --git a/zsh/zshrc b/zsh/zshrc
index 140ae04..e1f2aae 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,6 +1,4 @@
-PROMPT="%F{red}$(date +%H:%M) %F{white}%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% "
-
-umask 077
+PROMPT="%F{red}%D{%k:%M} %F{white}%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% "
 
 zstyle ':completion:*' special-dirs true
 zstyle ':completion:*:*:kill:*' menu yes select