systemd: polybar wait for i3

This should ensure that the IPC socket to get i3 workspaces works on polybar startup

In reality this doesn't help because systemd marks the service as active before the socket file is created, so startup is still racy

.config/git/config

@@ -10,14 +10,15 @@
 	diffFilter = diff-highlight
 [commit]
 	gpgsign = true
+[fetch]
+	prune = true
 [push]
 	default = upstream
 [pull]
 	rebase = true
+	prune = true
 [rebase]
 	autoStash = true
-[log]
-	date = relative
 [format]
 	pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset
 [alias]
@@ -25,6 +26,7 @@
 	pushall = !git remote | xargs -L1 git push
 	count = !echo $(pwd) && git rev-list HEAD --count
 	unpushed = !git log --oneline @{u}..HEAD
+	leaders = !git shortlog -s -n --all --no-merges
 [advice]
 	statusHints = false
 	pushUpdateRejected = false

.config/gtk-2.0/settings.ini

@@ -1,7 +1,6 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-include "/home/frebib/.gtkrc-2.0.mine"
 gtk-theme-name="Arc-Dark"
 gtk-icon-theme-name="Xenlism-Wildfire"
 gtk-font-name="Noto Sans 9"

.config/i3/config

@@ -126,6 +126,7 @@ gaps inner 20
 gaps outer 4
 
 focus_follows_mouse yes
+popup_during_fullscreen smart
 
 # keybindings
 bindsym $mod+Shift+j            reload
@@ -159,7 +160,7 @@ bindsym XF86AudioPrev           exec --no-startup-id playerctl -a 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
-bindsym XF86MonBrightnessUp     exec xbacklight -inc 5 && pkill -RTMIN+12 i3blocks
-bindsym XF86MonBrightnessDown   exec xbacklight -dec 5 && pkill -RTMIN+12 i3blocks
+bindsym XF86MonBrightnessUp     exec light -A 5 && pkill -RTMIN+12 i3blocks
+bindsym XF86MonBrightnessDown   exec light -U 5 && pkill -RTMIN+12 i3blocks
 
 # vim:ft=i3

.config/picom.conf

@@ -1,6 +1,6 @@
 # Logging
 log-level = "debug";
-log-file = "/home/frebib/.local/share/picom.log";
+#log-file = "/home/frebib/.local/share/picom.log";
 
 # Shadow
 shadow = true;
@@ -16,6 +16,7 @@ shadow-exclude = [
 	"class_g = 'Conky'",
 	"class_g ?= 'Notify-osd'",
 	"class_g = 'Cairo-clock'",
+	"class_g = 'firefox' && argb",
 	"name = 'Notification'",
 	"_GTK_FRAME_EXTENTS@:c"
 ];
@@ -47,6 +48,7 @@ blur-background-exclude = [
 	"class_g = 'Onboard'",
 	"class_g = 'slop'",
 	"class_g = 'Polybar'",
+	"class_g = 'firefox' && argb",
 	"window_type = 'dock'",
 	"window_type = 'desktop'",
 	"_GTK_FRAME_EXTENTS@:c"
@@ -65,7 +67,7 @@ no-fading-destroyed-argb = false;
 backend = "glx";
 mark-wmwin-focused = true;
 mark-ovredir-focused = true;
-use-ewmh-active-win = false;
+use-ewmh-active-win = true;
 detect-rounded-corners = true;
 detect-client-opacity = true;
 refresh-rate = 0;
@@ -76,7 +78,7 @@ vsync = true;
 # unredir-if-possible-exclude = [ ];
 focus-exclude = [
 	"i:ai:chromium",
-	"class_g = 'Firefox'",
+	"class_g = 'firefox'",
 ];
 detect-transient = true;
 detect-client-leader = true;
@@ -87,7 +89,7 @@ invert-color-include = [ ];
 glx-no-stencil = true;
 glx-no-rebind-pixmap = true;
 xrender-sync-fence = true;
-#use-damage = true;
+use-damage = true;
 
 # Window type settings
 wintypes:

.config/polybar/config

@@ -46,8 +46,8 @@ line-colour = #f00
 
 modules-left = i3
 modules-center =
-# modules-right = volume updates weather xkeyboard wlan gateway eth memory cpu xbacklight battery temperature date
-modules-right = volume updates weather wlan gateway eth memory cpu xbacklight battery temperature date
+# modules-right = volume updates weather xkeyboard wlan gateway eth memory cpu xbacklight battery cputemp gputemp date
+modules-right = volume updates weather wlan gateway eth memory cpu xbacklight battery cputemp gputemp date
 
 tray-position = right
 tray-detached = false
@@ -68,13 +68,13 @@ exec = $XDG_CONFIG_HOME/polybar/update.sh
 tail = true
 format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
-click-left = i3-msg exec -- i3-sensible-terminal -r i3blocks-update-term -e "yay && kill -USR1 %pid% || kill --USR1 %pid%"
+click-left = systemd-run --user --no-block -- i3-sensible-terminal -r i3blocks-update-term -e "yay && kill -USR1 %pid% || kill --USR1 %pid%"
 
 [module/weather]
 type = custom/script
 exec = $XDG_CONFIG_HOME/polybar/weather.sh
 interval = 120
-click-left = i3-msg exec "i3-sensible-terminal -r floating-term -e 'sh -c \"xdotool getactivewindow windowsize 910 680 && curl wttr.in && sleep infinity\"'"
+click-left = systemd-run --user --no-block "i3-sensible-terminal -r floating-term -e 'sh -c \"xdotool getactivewindow windowsize 910 680 && curl wttr.in && sleep infinity\"'"
 
 [module/gateway]
 type = custom/script
@@ -208,7 +208,7 @@ label-disconnected-foreground = ${colours.critical}
 type = internal/date
 interval = 1
 
-label = %{A3:i3-sensible-terminal -r i3blocks-clock-term -e "sh -c \"xdotool getactivewindow windowsize 500 600; cal -y $(date +%Y); stty -echo; exec sleep infinity\"" &:}%date% %time%%{A}
+label = %{A3:systemd-run --user --no-block -- i3-sensible-terminal -r i3blocks-clock-term -e "sh -c \"xdotool getactivewindow windowsize 500 600; cal -y $(date +%Y); stty -echo; exec sleep infinity\"" &:}%date% %time%%{A}
 
 time = %H:%M
 time-alt = %a %e %b %Y %H:%M:%S
@@ -221,8 +221,8 @@ format-prefix-foreground = ${colours.icon}
 type = internal/pulseaudio
 
 label-volume = %percentage%
-format-volume = %{A3:pavucontrol:}<ramp-volume>  <label-volume>%{A}
-format-muted = %{A3:pavucontrol:}<label-muted>%{A}
+format-volume = %{A3:systemd-run --user --no-block -- pavucontrol:}<ramp-volume>  <label-volume>%{A}
+format-muted = %{A3:systemd-run --user --no-block -- pavucontrol:}<label-muted>%{A}
 
 label-volume-foreground = ${root.foreground}
 format-muted-foreground = ${colours.icon}
@@ -267,10 +267,10 @@ ramp-capacity-0-foreground = ${colours.critical}
 ramp-capacity-1-foreground = ${colours.warning}
 
 
-[module/temperature]
+[module/cputemp]
 type = internal/temperature
-thermal-zone = 2
-warn-temperature = 70
+hwmon-path = /sys/devices/platform/nct6775.656/hwmon/hwmon1/temp2_input
+base-temperature = 25
 
 format = <ramp>  <label>
 format-warn = <ramp>  <label-warn>
@@ -287,6 +287,15 @@ ramp-4 = 
 ramp-5 = 
 ramp-foreground = ${colours.icon}
 
+[module/gputemp]
+type = custom/script
+exec = nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader,nounits
+interval = 10
+
+label = %output%°C
+format-prefix = "  "
+format-prefix-foreground = ${colours.icon}
+
 
 [module/powermenu]
 type = custom/menu

.config/systemd/user/desktop.target.wants/networkmanager-applet.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/networkmanager-applet.service

.config/systemd/user/graphical-session.target.wants/xautolock.service

@@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/xautolock.service

.config/systemd/user/networkmanager-applet.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=NetworkManager Applet
+After=graphical-session.target NetworkManager.service
+Requires=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/nm-applet
+Restart=on-failure
+
+[Install]
+WantedBy=desktop.target

.config/systemd/user/polybar@.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Polybar
 Requires=graphical-session.target
-After=graphical-session.target pulseaudio.socket
+After=graphical-session.target pulseaudio.socket i3.service
 
 [Service]
 Type=simple

.config/systemd/user/xautolock.service

@@ -1,8 +1,10 @@
 [Unit]
-Description=XBindKeys
+Description=Lock desktop session after inactivity
+Requires=xorg.target
+After=xorg.target
 
 [Service]
-ExecStart=/usr/bin/xautolock -time 1 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
+ExecStart=/usr/bin/xautolock -time 5 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
 KillMode=process
 Restart=on-failure
 

.config/systemd/user/xsettingsd.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=xsettingsd - provide settings to X11 applications
+Requires=xorg.target
+After=xorg.target profile.service
+
+[Service]
+ExecStart=/bin/sh -c 'xsettingsd -c $XDG_CONFIG_HOME/xsettingsd/xsettingsd.local'
+ExecReload=/bin/kill -s HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=graphical-session.target

.config/zsh/.zshrc

@@ -1,5 +1,3 @@
-unsetopt MULTIBYTE
-
 # Config and cache directory paths
 CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
 ZSH_DIR="$CONFIG_DIR/zsh"
@@ -13,13 +11,13 @@ SAVEHIST=999999
 exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
 
 # Only set tty if running interactively
-if exists tty && tty -s 1>/dev/null 2>/dev/null; then
+if exists tty && tty -s; then
     # Resolve at shell runtime
     export GPG_TTY="$(tty)"
 fi
 
 # Configure less and add colours
-export LESS="-RI"
+export LESS="-RI --mouse"
 export PAGER="less"
 export MANPAGER="less -+N"
 # Disable histfile
@@ -104,8 +102,10 @@ bindkey '^[[A' fzf-history-widget                   # Up (fzf)
 bindkey '^[[B' fzf-history-widget                   # Down (fzf)
 bindkey '^F'   fzf-file-widget                      # Ctrl+F file search (fzf)
 
+bindkey "^F" fzf-file-widget
 bindkey "^V" edit-command-line
 bindkey -M vicmd "^V" edit-command-line
+bindkey -M vicmd "^W" backward-delete-word
 
 bindkey -M vicmd d vi-backward-char
 bindkey -M vicmd h vi-down-line-or-history
@@ -116,6 +116,8 @@ bindkey -M vicmd K vi-kill-eol
 bindkey -M vicmd j vi-find-next-char-skip
 bindkey -M vicmd l vi-repeat-search
 
+# Backspace across newlines when in vi-mode
+bindkey -v '^?' backward-delete-char
 
 ZSH_AUTOSUGGEST_USE_ASYNC=true
 ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=128

scripts/dpi

@@ -21,11 +21,9 @@ mkdir -p "$CONF_DIR"
     echo Gdk/UnscaledDPI $(( $dpi*1024/($dpi/96) ))
 } > $CONF_DIR/xsettingsd.local
 
-pid=$(xprop -name xsettingsd _NET_WM_PID 2> /dev/null | awk '{print $NF}')
-if [ -z "$pid" ]; then
-    xsettingsd -c $CONF_DIR/xsettingsd.local &
-else
-    kill -HUP $pid
-fi
-
 echo Xft.dpi: $dpi | xrdb -merge
+xrandr --dpi $dpi
+
+systemctl --user reload-or-restart xsettingsd
+systemctl --user --no-block reload i3
+systemctl --user --no-block restart polybar@i3bar dunst

scripts/gtav

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec xdg-open steam://rungameid/271590

scripts/netsplit

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PID="$(pidof GTA5.exe)"
+
+kill -s STOP $PID
+sleep 30
+kill -s CONT $PID

scripts/screenshot

@@ -9,7 +9,7 @@ FILENAME="$(date '+%s%N' | sha256sum | head -c7).png"
 DIRECTORY="$HOME/pictures/screenshots"
 
 SCP_HOST=frebib@Poseidon.nerdhouse.io
-SCP_PATH=/dave/www/frebib.net/s
+SCP_PATH=/services/www/files/frebib.net/s
 URL_PATH=https://frebib.net/s
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~