Merge remote-tracking branch 'origin/master' into surface

This reverts commit d7097cf749.

.config/X11/xprofile

@@ -12,6 +12,7 @@ export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
 # Load Xorg resources and set the DPI
 xrdb -merge $XDG_CONFIG_HOME/X11/xresources
 xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
+xrandr --output eDP1 --primary
 
 setxkbmap -option caps:none
 xset r rate 200 18
@@ -22,3 +23,6 @@ if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; the
     autocutsel -fork
     autocutsel -selection PRIMARY -fork
 fi
+
+~/.local/share/surface-scripts/pend &
+~/.local/share/surface-scripts/rotationd &

.config/X11/xresources

@@ -29,7 +29,7 @@
 *.color15:      #eceff1
 
 
-Xft.dpi:        96
+Xft.dpi:        140
 Xft.antialias:  true
 Xft.rgba:       rgb
 Xft.hinting:    true
@@ -59,11 +59,11 @@ xterm.metaSendsEscape:      true
 
 urxvt.termName:             xterm-256color
 
-urxvt.font:                 xft:Source Code Pro:style=regular:size=9
+urxvt.font:                 xft:Source Code Pro:style=regular:size=9.8
-urxvt.imFont:               xft:Source Code Pro:style=regular:size=9
+urxvt.imFont:               xft:Source Code Pro:style=regular:size=9.8
 urxvt.boldFont:             xft:Source Code Pro:style=bold:size=9
-urxvt.italicFont:           xft:Source Code Pro:style=italic:size=9
+urxvt.italicFont:           xft:Source Code Pro:style=italic:size=9.8
-urxvt.boldItalicFont:       xft:Source Code Pro:style=bold,italic:size=9
+urxvt.boldItalicFont:       xft:Source Code Pro:style=bold,italic:size=9.8
 
 
 urxvt.iso14755:             false

.config/chrome-flags.conf

@@ -0,0 +1 @@
+--force-device-scale-factor=1.2

.config/compton.conf

@@ -31,7 +31,7 @@ alpha-step = 0.02;				# XRender backend: Step size for alpha pictures. Increasin
 
 # Blurring
 blur-method = "dual_kawase";
-blur-strength = 5;
+blur-strength = 6;
 blur-background = true;		    # Blur background of transparent windows.
 blur-background-exclude  = [ "class_g = 'Peek'", "class_g = 'Onboard'", "class_g = 'slop'", "class_g = 'Polybar'" ];
 blur-background-frame = true;	# Blur background of opaque windows with transparent

.config/dunst/dunstrc

@@ -1,5 +1,5 @@
 [global]
-    font = sans 9.5
+    font = sans 9
     
     # Allow a small subset of html markup:
     #   <b>bold</b>
@@ -65,7 +65,7 @@
     # screen width minus the width defined in within the geometry option.
 
     # 53 = 30 + 23 (bar-height)
-    geometry = "360x5-30+30"
+    geometry = "560x5-30+30"
     
     # Shrink window if it's smaller than the width.  Will be ignored if
     # width is 0.
@@ -146,7 +146,7 @@
     icon_position = left
 
     # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 44
+    max_icon_size = 72
 
     # Paths to default icons.
     icon_path = /usr/share/icons/Xenlism-Wildfire/Status/:/usr/share/icons/Xenlism-Wildfire/Devices/:/usr/share/icons/Adwaita/32x32/status:/usr/share/icons/Adwaita/32x32/devices

.config/i3/config

@@ -31,6 +31,7 @@ bindsym $mod+w split v
 # enter fullscreen mode for the focused container
 bindsym $mod+Shift+f fullscreen toggle global
 bindsym $mod+f fullscreen toggle
+popup_during_fullscreen leave_fullscreen
 
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+p layout stacking
@@ -45,21 +46,7 @@ bindsym $mod+e sticky toggle
 bindsym $mod+a focus parent
 bindsym $mod+o focus child
 
-#  Screen configs  #
+set $10 "10:"
-set    $bl  "DP-5"
-set    $tl  "DP-1"
-set    $br  "HDMI-0"
-set    $tr  "DP-3"
-
-# Workspace -> Screen
-workspace 1 output $bl
-workspace 2 output $br
-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
@@ -71,7 +58,7 @@ bindsym $mod+6 workspace 6
 bindsym $mod+7 workspace 7
 bindsym $mod+8 workspace 8
 bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
+bindsym $mod+0 workspace $10
 
 # move workspaces across screens
 bindsym $mod+$alt+d move workspace to output left
@@ -89,7 +76,7 @@ bindsym $mod+Shift+6 move container to workspace 6
 bindsym $mod+Shift+7 move container to workspace 7
 bindsym $mod+Shift+8 move container to workspace 8
 bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
+bindsym $mod+Shift+0 move container to workspace $10
 
 # opens logout/shutdown menu
 bindsym $mod+Shift+Escape exec --no-startup-id ~/.config/i3/powermenu.sh
@@ -137,9 +124,9 @@ bindsym $mod+Return             exec i3-sensible-terminal
 bindsym $mod+Ctrl+Return        exec i3-sensible-terminal -r floating-term
 bindsym $mod+Shift+Return       exec i3-sensible-terminal -d "`xcwd`"
 bindsym $mod+Ctrl+Shift+Return  exec i3-sensible-terminal -r floating-term -d "`xcwd`"
-bindsym $mod+l                  exec dm-tool switch-to-greeter
+bindsym $mod+l                  exec ~/.config/i3/lock.sh
 bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
-bindsym $mod+Shift+p            exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
+bindsym $mod+Shift+p            exec rofi-pass
 bindsym $mod+Shift+e            exec rofi-emoji
 bindsym $mod+Shift+i            exec rofi-fontawesome
 bindsym --release Print         exec screenshot
@@ -150,11 +137,11 @@ bindsym $mod+r                  exec "bash -c 'pwgen -nc 32 1 | tee >(xargs noti
 bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"<a href=\\\\"$LINK\\\\">$LINK</a>\\""
 
 # Media player controls
-bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause
+bindsym XF86AudioPlay           exec --no-startup-id mpc toggle
-bindsym XF86AudioPause          exec --no-startup-id playerctl -a pause
+bindsym XF86AudioPause          exec --no-startup-id mpc pause
-bindsym XF86AudioStop           exec --no-startup-id playerctl -a stop
+bindsym XF86AudioStop           exec --no-startup-id mpc stop
-bindsym XF86AudioNext           exec --no-startup-id playerctl -a next
+bindsym XF86AudioNext           exec --no-startup-id mpc next
-bindsym XF86AudioPrev           exec --no-startup-id playerctl -a previous
+bindsym XF86AudioPrev           exec --no-startup-id mpc previous
 bindsym XF86AudioRaiseVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  +1000
 bindsym XF86AudioLowerVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  -1000
 bindsym XF86AudioMute           exec --no-startup-id pactl set-sink-mute   @DEFAULT_SINK@ toggle
@@ -164,22 +151,23 @@ bindsym XF86MonBrightnessDown   exec xbacklight -dec 5 && pkill -RTMIN+12 i3bloc
 # app launch shortcuts
 exec --no-startup-id ~/.config/i3/disable-standby-fs.py
 exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
-exec --no-startup-id xautolock -time 5 -locker 'dm-tool switch-to-greeter' -nocloseout -nocloseerr
+exec --no-startup-id xautolock -time 5 -locker 'dm-tool lock' -nocloseout -nocloseerr
-exec --no-startup-id xss-lock dm-tool switch-to-greeter
 
 # startup programs
 exec --no-startup-id nextcloud
+exec --no-startup-id nm-applet
 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 pullover
+exec --no-startup-id onboard
+exec --no-startup-id touchegg
 exec --no-startup-id mailnag
-exec --no-startup-id compton -b
+exec --no-startup-id compton -b --config ~/.config/compton.conf
 exec --no-startup-id chromium --no-startup-window
 exec --no-startup-id thunderbird
 
-exec i3-msg 'workspace 1; exec sleep 2 && chromium'
+exec i3-msg 'workspace 1; exec chromium'
-exec i3-msg 'workspace 2; exec i3-sensible-terminal'
 
 # vim:ft=i3

.config/i3/powermenu.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
  
-option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 10 -lines 7 -location 3 -tokenize false -matching normal | xargs)
+option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 8 -lines 7 -location 3 -tokenize false -matching normal | xargs)
 
 case $option in
-    lock) dm-tool switch-to-greeter;;
+    lock) ./lock.sh;;
     logout) i3-msg exit;;
     sleep) systemctl suspend;;
     hibernate) systemctl hibernate;;

.config/npm/npmrc

@@ -1,3 +0,0 @@
-prefix=${XDG_DATA_HOME}/npm
-cache=${XDG_CACHE_HOME}/npm
-tmp=${XDG_RUNTIME_DIR}/npm

.config/polybar/config

@@ -13,13 +13,13 @@ format-margin  = 2.5
 format-offset  = 0
 
 [bar/i3bar]
-monitor = ${env:MONITOR:HDMI-0}
+monitor = ${env:MONITOR:eDP1}
-dpi  = ${xrdb:Xft.dpi:96}
+dpi  = ${xrdb:Xft.dpi:-1}
 fixed-center = false
 enable-ipc = true
 
 width = 100%
-height = 32
+height = 44
 bottom = true
 radius = 0
 
@@ -44,9 +44,9 @@ modules-right = volume updates weather wlan eth memory cpu xbacklight battery te
 tray-position = right
 tray-detached = false
 tray-background = ${root.background}
-tray-offset-x = -4
+tray-offset-x = -6
-tray-offset-y = 0
+tray-offset-y = -2
-tray-maxsize = 16
+tray-maxsize = 24
 tray-padding = 2
 tray-scale = 1.0
 
@@ -89,7 +89,7 @@ wrapping-scroll = false
 ; Only show workspaces on the same output as the bar
 ; pin-workspaces = true
 
-label-mode-padding = 2
+label-mode-padding = 3
 label-mode-foreground = ${colours.text}
 label-mode-background = ${colours.background}
 
@@ -115,7 +115,7 @@ label-visible-underline = ${self.label-focused-underline}
 
 ; urgent = Workspace with urgency hint set
 label-urgent = ${self.label-focused}
-label-urgent-foreground = ${colours.critical}
+label-urgent-foreground = ${colours.warning}
 label-urgent-padding = ${self.label-focused-padding}
 
 
@@ -254,7 +254,7 @@ ramp-capacity-1-foreground = ${colours.warning}
 
 [module/temperature]
 type = internal/temperature
-thermal-zone = 2
+thermal-zone = 1
 warn-temperature = 70
 
 format = <ramp>  <label>
@@ -267,9 +267,11 @@ label-warn-foreground = ${colours.background}
 ramp-0 = 
 ramp-1 = 
 ramp-2 = 
-ramp-3 = 
+ramp-3 = 
-ramp-4 = 
+ramp-4 = 
-ramp-5 = 
+ramp-5 = 
+ramp-6 = 
+ramp-7 = 
 ramp-foreground = ${colours.icon}
 
 

.config/rofi/config

@@ -0,0 +1,26 @@
+!-----------------------------
+! Rofi config
+!-----------------------------
+
+! State:            'bg',       'fg',     'bgalt'     'hlbg',   'hlfg'
+rofi.color-window:  #F2383C4A,  #2F343F
+rofi.color-normal:  #00383C4A,  #D3DAE3,  #00383C4A,  #5294E2,  #ECEFF1
+rofi.bc:            #CC383C4A
+rofi.bw:            5
+rofi.padding:       8
+rofi.lines:         14
+rofi.width:         40
+rofi.font:          Noto Sans 18
+rofi.line-margin:   6
+rofi.sep:           |
+rofi.prompt:        >
+rofi.ssh-command:   {terminal} -e "{ssh-client} {host}"
+rofi.separator-style: solid
+rofi.kb-row-tab:    Shift+Tab
+rofi.kb-row-select: Tab
+
+rofi.matching:      glob
+rofi.tokenize:      true
+rofi.normal-window: true
+
+! vim: ft=xdefaults

.config/rofi/config.rasi

@@ -2,8 +2,8 @@ configuration {
   theme: "arc-dark";
   font: "sans 14";
   dpi: 0;
-  width: 35;
+  width: 40;
-  lines: 10;
+  lines: 12;
 
   /* show-icons: true; */
   separator-style: "solid";

.config/systemd/user/sleep-i3lock@.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Lock X session using i3lock
+
+[Service]
+User=%i
+Environment=DISPLAY=:0
+ExecStart=sh -c '~/.config/i3/lock.sh'
+
+[Install]
+WantedBy=sleep.target

.config/systemd/user/sleep-lock-lightdm.service

@@ -1,12 +0,0 @@
-[Unit]
-Description=Lock X LightDM session before sleeping
-Before=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/dm-tool switch-to-greeter
-# Ensure enough time for the session to lock before sleeping
-ExecStartPost=/usr/bin/sleep 1
-
-[Install]
-WantedBy=sleep.target

.config/systemd/user/sleep.target.wants/sleep-lock-lightdm.service

@@ -1 +0,0 @@
-../sleep-lock-lightdm.service

.config/termite/config

@@ -1,5 +1,5 @@
 [options]
-font = monospace 9
+font = monospace 9.5
 scrollback_lines = 1000000
 cursor_blink = off
 size_hints = true

.gitmodules

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

.profile

@@ -25,7 +25,6 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 export GOPATH="$XDG_DATA_HOME/go"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
-export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
 export PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
@@ -39,7 +38,7 @@ export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 
 export DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles/.profile}")"
-export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$GOPATH/bin"
+export PATH="${PATH}:/sbin:/usr/sbin:$DOTFILES/scripts:$HOME/.local/share/surface-scripts:$GOPATH/bin"
 
 exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
 
@@ -77,7 +76,6 @@ fi
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
     eval $(dbus-launch --sh-syntax --exit-with-session)
     dbus-update-activation-environment --systemd \
-        DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY \
+        DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
-        XDG_SEAT_PATH
 fi
 

aliases

@@ -266,7 +266,7 @@ alias zfs='sudo zfs'
 alias zpool='sudo zpool'
 alias z=zfs
 alias zp=zpool
-zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}' | column -t -R 2,3,4); return $?; }
+zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}'); return $?; }
 _zl() { _zfs "list $@"; }
 
 # General Aliases

scripts/linkdotfiles

@@ -23,3 +23,8 @@ echo cd `pwd`
 for file in $conffiles; do
     ln -sfv $confpath/.config/$file .
 done
+
+cd $HOME
+mkdir -p .local/share/ && cd .local/share
+echo cd `pwd`
+ln -sfv $DOTFILES/surfacetools .