Merge branch 'master' into surface-docked

This reverts commit d7097cf749.

.config/compton.conf

@@ -37,8 +37,9 @@ blur-background-frame = false;	# Blur background of opaque windows with transpar
 								# frames as well.
 blur-background-fixed = true;	# Do not let blur radius adjust based on window opacity.
 								# Exclude conditions for background blur.
+blur-kern = "5,5,0.894839,0.932912,0.945959,0.932912,0.894839,0.932912,0.972604,0.986207,0.972604,0.932912,0.945959,0.986207,0.986207,0.945959,0.932912,0.972604,0.986207,0.972604,0.932912,0.894839,0.932912,0.945959,0.932912,0.894839"
+
 # python compton-convgen.py --dump-compton gaussian 9 -f=sigma=10
-blur-kern = "9,9,0.852144,0.882497,0.904837,0.918512,0.923116,0.918512,0.904837,0.882497,0.852144,0.882497,0.913931,0.937067,0.951229,0.955997,0.951229,0.937067,0.913931,0.882497,0.904837,0.937067,0.960789,0.975310,0.980199,0.975310,0.960789,0.937067,0.904837,0.918512,0.951229,0.975310,0.990050,0.995012,0.990050,0.975310,0.951229,0.918512,0.923116,0.955997,0.980199,0.995012,0.995012,0.980199,0.955997,0.923116,0.918512,0.951229,0.975310,0.990050,0.995012,0.990050,0.975310,0.951229,0.918512,0.904837,0.937067,0.960789,0.975310,0.980199,0.975310,0.960789,0.937067,0.904837,0.882497,0.913931,0.937067,0.951229,0.955997,0.951229,0.937067,0.913931,0.882497,0.852144,0.882497,0.904837,0.918512,0.923116,0.918512,0.904837,0.882497,0.852144"
 
 # Fading
 fading = true;					# Fade windows during opacity changes.

.config/i3/blocks/config

@@ -78,9 +78,10 @@ interval=5
 
 [separator]
 
-#[battery]
+[rotation]
-#label=
+interval=once
-#interval=5
+
+[separator]
 
 [keyboard]
 label=
@@ -88,6 +89,12 @@ interval=30
 
 [separator]
 
+[battery]
+interval=30
+signal=11
+
+[separator]
+
 [clock]
 interval=5
 min_width=" 00:00"

.config/i3/blocks/rotation

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+lock="/tmp/rotlock"
+
+[[ -e $lock ]] || echo "unlocked" > "$lock"
+
+status=$(<$lock)
+
+if [ $BLOCK_BUTTON -gt 0 ]; then
+    case $status in
+        "unlocked") status="locked" ;;
+        "locked") status="unlocked";;
+    esac
+    echo $status > "$lock"
+fi
+
+case $status in
+    "locked") echo "";;
+    "unlocked") echo "";;
+esac

.config/i3/config

@@ -44,21 +44,12 @@ bindsym $mod+e sticky toggle
 bindsym $mod+a focus parent
 bindsym $mod+o focus child
 
-#  Screen configs  #
+set $surf eDP1
-set    $bl  "DP-5"
+set $hdmi HDMI1
-set    $tl  "DP-1"
-set    $br  "HDMI-0"
-set    $tr  "DP-3"
 
 # Workspace -> Screen
-workspace 1 output $bl
+workspace 1 output $hdmi
-workspace 2 output $br
+workspace 5 output $surf
-workspace 3 output $tl
-workspace 4 output $tr
-workspace 5 output $bl
-workspace 6 output $br
-workspace 7 output $tl
-workspace 8 output $tr
 
 # switch to workspace
 bindsym $mod+1 workspace 1
@@ -111,14 +102,10 @@ bar {
 
     workspace_buttons yes
     strip_workspace_numbers yes
-    tray_output primary
+    tray_output $hdmi
-    tray_padding 4
+    tray_padding 2
-    height 24
+    position top
-
+    height 20
-    output $bl
-    output $br
-    output primary
-    position bottom
 
     colors {
         separator #757575
@@ -196,8 +183,7 @@ exec --no-startup-id nextcloud
 exec --no-startup-id blueman-applet
 exec --no-startup-id redshift
 exec --no-startup-id xbindkeys
-exec --no-startup-id solaar
+exec --no-startup-id onboard
-exec --no-startup-id pullover
 exec --no-startup-id compton -b --config ~/.config/compton.conf
 exec --no-startup-id chromium --no-startup-window
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "surface-scripts"]
+	path = surface-scripts
+	url = https://github.com/frebib/surface-scripts.git

.xsession

@@ -1,3 +1,5 @@
 setxkbmap -option caps:none
 xset r rate 200 18
 xrandr --dpi 96
+
+~/.local/share/surface-scripts/pend &