Commit 5508a99b authored by Jay Ta'ala's avatar Jay Ta'ala
Browse files

Merge branch 'development'

parents 22c533c7 ceaf0c39
...@@ -57,8 +57,8 @@ bindsym $mod+F2 exec pactl set-sink-volume 1 -5%; exec notify-send 'sink 1 volum ...@@ -57,8 +57,8 @@ bindsym $mod+F2 exec pactl set-sink-volume 1 -5%; exec notify-send 'sink 1 volum
bindsym $mod+F3 exec pactl set-sink-volume 1 +5%; exec notify-send 'sink 1 volume increased' bindsym $mod+F3 exec pactl set-sink-volume 1 +5%; exec notify-send 'sink 1 volume increased'
# Screen brightness controls # Screen brightness controls
bindsym $mod+F6 exec "xbacklight -inc 5; notify-send \\"brightness up [$(xbacklight)%]\\"" bindsym $mod+F6 exec xbacklight -inc 5
bindsym $mod+F5 exec "xbacklight -dec 5; notify-send \\"brightness down [$(xbacklight)%]\\"" bindsym $mod+F5 exec xbacklight -dec 5
# Start Applications # Start Applications
bindsym $mod+Ctrl+b exec terminal -e 'bmenu' bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
...@@ -120,9 +120,9 @@ bindsym $mod+Mod1+s split h; layout stacking ...@@ -120,9 +120,9 @@ bindsym $mod+Mod1+s split h; layout stacking
bindsym $mod+w layout tabbed;exec notify-send 'tabbed layout' bindsym $mod+w layout tabbed;exec notify-send 'tabbed layout'
bindsym $mod+Mod1+w split h; layout tabbed bindsym $mod+Mod1+w split h; layout tabbed
# special combo for vertical split of two windows next to each other # special combo for horizontal split of two windows next to each other
bindsym $mod+x split h, layout splitv, focus right, move left, focus up bindsym $mod+x split h, layout splith, focus right, move left, focus left
bindsym $mod+Shift+x split h, layout splitv, focus left, move right, move up, focus down bindsym $mod+Shift+x split h, layout splith, focus left, move right, focus right
# special combo for tabbed split of two windows next to each other # special combo for tabbed split of two windows next to each other
bindsym $mod+z split h, layout tabbed, focus right, move left, focus left bindsym $mod+z split h, layout tabbed, focus right, move left, focus left
...@@ -132,6 +132,7 @@ bindsym $mod+Shift+z split h, layout tabbed, focus left, move right, focus right ...@@ -132,6 +132,7 @@ bindsym $mod+Shift+z split h, layout tabbed, focus left, move right, focus right
bindsym $mod+f fullscreen toggle bindsym $mod+f fullscreen toggle
# several 16:9 resolutions binded for quick switching # several 16:9 resolutions binded for quick switching
bindsym $mod+Shift+bracketleft exec xrandr -s 1024x576
bindsym $mod+bracketleft exec xrandr -s 1280x720 bindsym $mod+bracketleft exec xrandr -s 1280x720
bindsym $mod+bracketright exec xrandr -s 1920x1080 bindsym $mod+bracketright exec xrandr -s 1920x1080
......
...@@ -23,7 +23,7 @@ order += "ethernet _first_" ...@@ -23,7 +23,7 @@ order += "ethernet _first_"
order += "cpu_usage" order += "cpu_usage"
#order += "disk /" #order += "disk /"
order += "diskdata" order += "diskdata"
# order += "battery all" #order += "battery all"
order += "battery_level" order += "battery_level"
# order += "load" # order += "load"
order += "timer" order += "timer"
...@@ -101,12 +101,13 @@ battery all { ...@@ -101,12 +101,13 @@ battery all {
} }
battery_level { battery_level {
cache_timeout = 10 cache_timeout = 30
hide_when_full = "True" measurement_mode = "acpi"
hide_when_full = "True"
hide_seconds = "True" hide_seconds = "True"
blocks = "" blocks = ""
color_charging = "#00ff00" color_charging = "#00ff00"
format = " {icon} {percent}% {time_remaining} " format = " {icon} {percent}% ({time_remaining}) "
} }
tztime local { tztime local {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment