Merge branch 'development'

blurlock/blurlock

+#!/bin/bash
+# /usr/bin/blurlock
+
+# take screenshot
+# import -window root /tmp/screenshot.png
+
+# blur it
+#convert /tmp/screenshot.png -blur 0x5 /tmp/screenshotblur.png
+#rm /tmp/screenshot.png
+
+# lock the screen
+i3lock -i /usr/share/backgrounds/grey-split-manjaro.png
+
+exit 0

blurlock/blurlock.orig

+#!/bin/bash
+# /usr/bin/blurlock
+
+# take screenshot
+import -window root /tmp/screenshot.png
+
+# blur it
+convert /tmp/screenshot.png -blur 0x5 /tmp/screenshotblur.png
+rm /tmp/screenshot.png
+
+# lock the screen
+i3lock -i /tmp/screenshotblur.png
+
+exit 0
\ No newline at end of file

i3/config

@@ -53,13 +53,17 @@ bindsym $mod+Ctrl+m exec terminal -e 'alsamixer'
 
 ################################################################################################
 
+# Increase/decrease sink volume 1
+bindsym $mod+F2 exec pactl set-sink-volume 1 -5%; exec notify-send 'sink 1 volume decreased'
+bindsym $mod+F3 exec pactl set-sink-volume 1 +5%; exec notify-send 'sink 1 volume increased'
+
 # Screen brightness controls
 bindsym $mod+F6 exec "xbacklight -inc 5; notify-send \\"brightness up [$(xbacklight)%]\\""
 bindsym $mod+F5 exec "xbacklight -dec 5; notify-send \\"brightness down [$(xbacklight)%]\\""
 
 # Start Applications
 bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
-bindsym $mod+F2 exec --no-startup-id pavucontrol
+#bindsym $mod+F2 exec --no-startup-id pavucontrol
 #bindsym $mod+F5 exec terminal -e 'mocp'
 bindsym $mod+F10 exec blueman-manager
 bindsym $mod+t exec --no-startup-id pkill compton
@@ -73,6 +77,7 @@ bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
 
 bindsym $mod+j exec google-chrome-stable
 bindsym $mod+k exec KeeWeb
+bindsym $mod+Shift+k splith; exec KeeWeb
 bindsym $mod+l exec pcmanfm
 bindsym $mod+Shift+l exec gksu pcmanfm
 bindsym $mod+semicolon exec --no-startup-id terminal -e 'ranger'
@@ -103,7 +108,7 @@ bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_
 # split orientation
 bindsym $mod+h split h;exec notify-send 'tile horizontally'
 bindsym $mod+v split v;exec notify-send 'tile vertically'
-bindsym $mod+q split toggle
+bindsym $mod+q split h; layout tabbed
 
 # toggle fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
@@ -116,7 +121,6 @@ bindsym $mod+e layout toggle split
 bindsym $mod+Shift+s split toggle; layout stacking;exec notify-send 'sub-stacking layout'
 bindsym $mod+Shift+w split toggle; layout tabbed; exec notify-send 'sub-tabbed layout'
 
-
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
 
@@ -294,6 +298,10 @@ bindsym $mod+Mod1+Shift+Down resize grow height 10 px or 10 ppt
 bindsym $mod+Mod1+Shift+Up resize shrink height 10 px or 10 ppt
 bindsym $mod+Mod1+Shift+Right resize grow width 10 px or 10 ppt
 
+# "netflix" mode
+bindsym $mod+Mod1+n floating enable;sticky enable;resize set 656 370;border none
+bindsym $mod+Mod1+m floating enable;sticky enable;resize set 799 71;border none
+
 # Autostart applications
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id nitrogen --restore; sleep 1; compton -b
@@ -379,16 +387,18 @@ bar {
 bindsym $mod+m bar mode toggle
 
 # Theme colors
-set $bgcolor #6a6868
-set $txtcolor #F9FAF9
+set $bgicolor #4a4a4a
+set $bgucolor #6a6868
+set $txtacolor #F9FAF9
+set $txtucolor #bdbbbb
 set $indcolor #00ff00
 
 # class                   border  backgr. text    indic.   child_border
-  client.focused          $acolour $acolour $txtcolor $indcolor
-  client.focused_inactive $acolour #4a4a4a $txtcolor $indcolor
-  client.unfocused        $acolour $bgcolor #bdbbbb $indcolor
-  client.urgent           #CB4B16 #FDF6E3 $txtcolor $indcolor
-  client.placeholder      #000000 #0c0c0c #F9FAF9 #000000
+  client.focused          $acolour $acolour $txtacolor $indcolor
+  client.focused_inactive $acolour $bgicolor $txtucolor $indcolor
+  client.unfocused        $acolour $bgucolor $txtucolor $indcolor
+  client.urgent           #CB4B16 #FDF6E3 $txtacolor $indcolor
+  client.placeholder      #000000 #0c0c0c $txtacolor #000000
   client.background       #2B2C2B
 
 #############################

i3exit/i3exit

-#!/bin/sh
-# /usr/bin/i3exit
-
-# with openrc use loginctl
-[[ $(cat /proc/1/comm) == "systemd" ]] && logind=systemctl || logind=loginctl
-
-case "$1" in
-    lock)
-        dm-tool lock
-        ;;
-    logout)
-        i3-msg exit
-        ;;
-    switch_user)
-    	dm-tool switch-to-greeter
-    	;;
-    suspend)
-        dm-tool lock && sleep 2 && $logind suspend
-        ;;
-    hibernate)
-    	dm-tool lock && sleep 2 &&  $logind hibernate
-        ;;
-    reboot)
-        $logind reboot
-        ;;
-    shutdown)
-        $logind poweroff
-    	;;
-    *)
-        echo "== ! i3exit: missing or invalid argument ! =="
-        echo "Try again with: lock | logout | switch_user | suspend | hibernate | reboot | shutdown"
-        exit 2
-esac
-
-exit 0

i3status/.i3status.conf.py3status

@@ -51,10 +51,9 @@ load {
 }
 
 disk "/" {
-        # format = " hdd %avail "
-	# prefix_type = decimal        
+	prefix_type = decimal
 	# format = " ⛁ %used / %total (%percentage_used)"
-	format = " ⛁ %percentage_used "
+	format = " ⛁ %percentage_used (%used/%total) "
 }
 
 whatismyip {