Merge commit '13ace96ffd3d5848b54cee515bc2fe3a02d0cffe'

i3/i3config

@@ -162,20 +162,32 @@ bindsym Mod1+Tab exec --no-startup-id "rofi -show window"
 bindsym Mod1+F2 exec --no-startup-id "rofi -show run"
 
 #Lock
-bindsym $mod+Escape exec --no-startup-id "i3lock"
+bindsym $mod+Escape exec --no-startup-id "i3lock -c 000000 -f"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-bar {
+#bar {
-        status_command i3status
+        #status_command i3status
-}
+#}
 
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id nm-applet
 exec --no-startup-id owncloud
 exec --no-startup-id "xset dpms 60"
 exec --no-startup-id "polybar top"
-#exec --no-startup-id "polybar bottom"
+exec --no-startup-id "polybar bottom"
 exec --no-startup-id "xfsettingsd"
 exec --no-startup-id "xfce4-power-manager"
 exec --no-startup-id "owncloud"
+exec --no-startup-id "caffeine"
+
+#Colors
+# class                 border  backgr. text    indicator child_border
+client.placeholder      #242424 #242424 #242424
+client.background       #242424 #242424 #242424
+client.focused          #4A4A4A #4A4A4A #e5e5e5 #4A4A4A
+client.unfocused        #222222 #222222 #aaaaaa #222222
+client.focused_inactive #222222 #222222 #a9a9a9 #222222
+client.urgent           #4A4A4A #4A4A4A #f7f7f7 #4A4A4A
+
+hide_edge_borders both

i3/polybarconfig

@@ -61,16 +61,19 @@ padding-right = 2
 module-margin-left = 1
 module-margin-right = 2
 
+;font-0 = fixed:pixelsize=10;1
+;font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
+;font-2 = siji:pixelsize=10;1
 font-0 = fixed:pixelsize=10;1
 font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = siji:pixelsize=10;1
+font-2 = MaterialIcons:antialias=false;pixelsize=10;1
 
-modules-left = bspwm i3
+modules-left = i3
 modules-center = date 
-modules-right = filesystem xbacklight volume xkeyboard memory cpu battery temperature powermenu
+modules-right = filesystem xkeyboard volume temperature powermenu
 
-tray-position = right
+;tray-position = 
-tray-padding = 2
+;tray-padding = 2
 ;tray-transparent = true
 ;tray-background = #0063ff
 
@@ -103,6 +106,46 @@ tray-padding = 2
 ;date-alt = %A%, %d %B %Y
 ;time-alt = %H:%M:%S
 
+[bar/bottom]
+width = 100%
+height = 27
+fixed-center = true
+bottom = true
+
+background = ${colors.background}
+foreground = ${colors.foreground}
+
+line-size = 3
+line-color = #f00
+
+border-size = 4
+border-color = #00000000
+
+padding-left = 0
+padding-right = 2
+
+module-margin-left = 1
+module-margin-right = 2
+
+font-0 = fixed:pixelsize=10;1
+font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
+font-2 = MaterialIcons:pixelsize=10;1
+
+;modules-left = bspwm i3
+;modules-right = i3
+modules-center = memory cpu
+modules-left = battery
+
+tray-position = right
+tray-padding = 2
+;tray-background = #0063ff
+
+;wm-restack = bspwm
+;wm-restack = i3
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+
 [module/xwindow]
 type = internal/xwindow
 label = %title:0:30:...%
@@ -111,8 +154,8 @@ label = %title:0:30:...%
 type = internal/xkeyboard
 blacklist-0 = num lock
 
-format-prefix = " "
+format-prefix = "⌨ "
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-foreground = ${colors.foreground}
 format-prefix-underline = ${colors.secondary}
 
 label-layout = %layout%
@@ -127,7 +170,7 @@ label-indicator-underline = ${colors.secondary}
 type = internal/fs
 interval = 25
 
-mount-0 = /
+mount-0 = /home
 
 label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
 label-unmounted = %mountpoint% not mounted
@@ -224,18 +267,48 @@ card = intel_backlight
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = " "
+format-prefix = "cpu "
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #f90000
 label = %percentage%%
 
+;[module/memory]
+;type = internal/memory
+;interval = 2
+;format-prefix = " "
+;format-prefix-foreground = ${colors.foreground-alt}
+;format-underline = #4bffdc
+;label = %percentage_used%%
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
+; Available tags:
-format-prefix-foreground = ${colors.foreground-alt}
+;   <label> (default)
+;   <bar-used>
+;   <bar-free>
+format = <label> <bar-used>
+; Available tokens:
+;   %percentage_used% (default)
+;   %percentage_free%
+;   %gb_used%
+;   %gb_free%
+;   %gb_total%
+;   %mb_used%
+;   %mb_free%
+;   %mb_total%
+label = RAM %gb_used%/%gb_total%
+
+; Only applies if <bar-used> is used
+bar-used-indicator =
+bar-used-width = 15
+bar-used-foreground-0 = #55aa55
+bar-used-foreground-1 = #557755
+bar-used-foreground-2 = #f5a70a
+bar-used-foreground-3 = #ff5555
+bar-used-fill = ▐
+bar-used-empty = ▐
+bar-used-empty-foreground = #444444
 format-underline = #4bffdc
-label = %percentage_used%%
 
 [module/wlan]
 type = internal/network
@@ -290,7 +363,6 @@ format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #0a6cf5
 
 label = %date% %time%
-
 [module/volume]
 type = internal/volume
 
@@ -298,9 +370,9 @@ format-volume = <label-volume> <bar-volume>
 label-volume = VOL
 label-volume-foreground = ${root.foreground}
 
-format-muted-prefix = " "
+format-muted-prefix = ""
-format-muted-foreground = ${colors.foreground-alt}
+format-muted-foreground = ${colors.foreground}
-label-muted = sound muted
+label-muted = " sound muted"
 
 bar-volume-width = 10
 bar-volume-foreground-0 = #55aa55
@@ -370,7 +442,7 @@ type = custom/menu
 
 format-spacing = 1
 
-label-open = 
+label-open = 
 label-open-foreground = ${colors.secondary}
 label-close =  cancel
 label-close-foreground = ${colors.secondary}
@@ -381,14 +453,16 @@ menu-0-0 = reboot
 menu-0-0-exec = menu-open-1
 menu-0-1 = power off
 menu-0-1-exec = menu-open-2
+menu-0-2 =  Lock
+menu-0-2-exec = i3lock
 
 menu-1-0 = cancel
 menu-1-0-exec = menu-open-0
 menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
+menu-1-1-exec = systemctl reboot
 
 menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
+menu-2-0-exec = systemctl poweroff
 menu-2-1 = cancel
 menu-2-1-exec = menu-open-0