systemd: parameterise autocutsel service

Enable three invocations, one for each kind of clipboard
With this, they should all now stay in sync (I hope)

.config/X11/xprofile

@@ -1,11 +1,15 @@
-#!/bin/sh
+#!/bin/sh -u
 
 # Graphical-specific environment variables
-export TERMINAL="termite"
-export BROWSER="chromium"
+export TERMINAL="alacritty"
+export BROWSER="firefox"
+
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
 export QT_QPA_PLATFORMTHEME=gtk2
 export QT_STYLE_OVERRIDE=gtk2
+# https://www.reddit.com/r/linux/comments/72mfv8/psa_for_firefox_users_set_moz_use_xinput21_to/
+export MOZ_USE_XINPUT2=1 # enable pixel-accurate scrolling in firefox
 export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
 
 
@@ -15,4 +19,6 @@ xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2)
 
 setxkbmap -option caps:none
 xset r rate 200 18
+
+test -f "$XDG_CONFIG_HOME"/X11/xmodmap && \
     xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap

.config/X11/xresources

@@ -69,7 +69,7 @@ urxvt.boldItalicFont:       xft:Source Code Pro:style=bold,italic:size=9
 urxvt.iso14755:             false
 urxvt.iso14755_52:          false
 urxvt.perl-ext-common:      default,vtwheel,font-size
-urxvt.url-launcher:         /usr/bin/chromium
+urxvt.url-launcher:         /usr/bin/firefox
 urxvt.matcher.button:       1
 
 urxvt.keysym.C-Up:          font-size:increase

.config/alacritty/alacritty.yml

@@ -81,7 +81,7 @@ window:
 scrolling:
   # Maximum number of lines in the scrollback buffer.
   # Specifying '0' will disable scrolling.
-  history: 10000
+  history: 100000
 
   # Number of lines the viewport will move for every line scrolled when
   # scrollback is enabled (history > 0).
@@ -286,7 +286,7 @@ colors:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.85
+background_opacity: 0.80
 
 selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
@@ -602,9 +602,9 @@ key_bindings:
   - { key: Insert,   mods: Shift,         action: PasteSelection   }
   - { key: Key0,     mods: Control,       action: ResetFontSize    }
   - { key: Equals,   mods: Control,       action: ResetFontSize    }
-  - { key: Add,      mods: Control,       action: IncreaseFontSize }
-  - { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
+  - { key: Add,      mods: Control|Shift, action: IncreaseFontSize }
+  - { key: Subtract, mods: Control|Shift, action: DecreaseFontSize }
+  - { key: Minus,    mods: Control|Shift, action: DecreaseFontSize }
 
   # (Windows only)
   #- { key: Return,   mods: Alt,           action: ToggleFullscreen }

.config/dunst/dunstrc

@@ -140,7 +140,7 @@
     dmenu = /usr/bin/rofi -dmenu -i -p '' -config ~/.config/dunst/dunst-xresources
 
     # Browser for opening urls in context menu.
-    browser = /usr/bin/chromium
+    browser = /usr/bin/firefox
 
     # Align icons left/right/off
     icon_position = left

.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

@@ -113,10 +113,9 @@ exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lak
 for_window [class="Pinentry"] floating enable
 for_window [class="Pavucontrol"] floating enable
 for_window [class="Blueman-manager"] floating enable
+for_window [class="floating-term" instance="termite"] floating enable
+for_window [class="Alacritty" instance="floating-term"] floating enable
 for_window [window_role="floating-term"] floating enable
-for_window [window_role="pop-up"] floating enable
-for_window [window_role="i3blocks-update-term"] floating enable
-for_window [window_role="i3blocks-clock-term"] floating enable
 for_window [title="^rofi$"] floating enable
 
 new_window none
@@ -126,29 +125,31 @@ gaps inner 20
 gaps outer 4
 
 focus_follows_mouse yes
+popup_during_fullscreen smart
 
 # keybindings
 bindsym $mod+Shift+j            reload
-bindsym $mod+c                  exec systemd-run --user --scope --slice=chromium.slice --no-block -- chromium
-bindsym $mod+b                  exec systemd-run --user --scope --slice=firefox.slice --no-block -- firefox
-bindsym $mod+v                  exec "i3-sensible-terminal -e \\"$SHELL -c vim;$SHELL\\"
-bindsym $mod+Ctrl+v             exec "i3-sensible-terminal -r floating-term -e \\"$SHELL -c vim;$SHELL\\"
-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+c                  exec notify-send "Try again" "You meant \\\$mod+b"
+bindsym $mod+b                  exec systemd-run-i3 -c -s firefox firefox
+bindsym $mod+v                  exec systemd-run-i3 i3-sensible-terminal -e sh -c "($SHELL -c $EDITOR || :) && $SHELL"
+bindsym $mod+Ctrl+v             exec systemd-run-i3 i3-sensible-terminal --class floating-term -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL"
+bindsym $mod+Return             exec systemd-run-i3 i3-sensible-terminal
+bindsym $mod+Ctrl+Return        exec systemd-run-i3 i3-sensible-terminal --class floating-term
+bindsym $mod+Shift+Return       exec systemd-run-i3 i3-sensible-terminal --working-directory "$(xcwd)"
+bindsym $mod+Ctrl+Shift+Return  exec systemd-run-i3 i3-sensible-terminal --class floating-term --working-directory "$(xcwd)"
 bindsym $mod+l                  exec dm-tool switch-to-greeter
-bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
+bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window -run-command 'systemd-run-i3 -n {cmd}'"
 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+e            exec rofi-emoji
-bindsym $mod+Shift+i            exec rofi-fontawesome
-bindsym --release Print         exec screenshot
-bindsym --release $mod+Print    exec imgur-screenshot
-bindsym $mod+$alt+space         exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
-bindsym $mod+numbersign         exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
-bindsym $mod+r                  exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
-bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"$LINK\\""
-bindsym --release $mod+i        exec sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
+bindsym $mod+Shift+e            exec systemd-run-i3 -n rofi-emoji
+bindsym $mod+Shift+i            exec systemd-run-i3 -n rofi-fontawesome
+bindsym --release Print         exec systemd-run-i3 -n screenshot
+bindsym --release $mod+Print    exec systemd-run-i3 -n imgur-screenshot
+bindsym $mod+x                  exec systemd-run-i3 -n i3-sensible-terminal --class floating-term --hold -e /bin/echo "$(xprop -id $(xdotool getactivewindow))"
+bindsym $mod+$alt+space         exec systemd-run-i3 -n ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
+bindsym $mod+numbersign         exec systemd-run-i3 -n i3-sensible-terminal --hold -e sh -c 'xclip -o | gpg --decrypt 2>&1'
+bindsym $mod+r                  exec systemd-run-i3 -n bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'
+bindsym $mod+g                  exec systemd-run-i3 -n notify-send -c transfer "$(gist -PRpc)"
+bindsym --release $mod+i        exec systemd-run-i3 -n sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
 
 # Media player controls
 bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause
@@ -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/i3/powermenu.sh

@@ -1,10 +1,11 @@
 #!/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 10 -lines 7 -location 3 -tokenize false -matching normal | cut -d' ' -f2- | xargs)"
 
 case $option in
     lock) dm-tool switch-to-greeter;;
-    logout) i3-msg exit;;
+    logout) systemctl --user exit;;
     sleep) systemctl suspend;;
     hibernate) systemctl hibernate;;
     power\ off) systemctl poweroff;;
@@ -12,7 +13,5 @@ case $option in
     windows)
         windows=`efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4`
         sudo efibootmgr -n $windows
-        sudo hibereboot;;
+        reboot;;
 esac
-
-exit 0

.config/mimeapps.list

@@ -30,11 +30,11 @@ text/plain=vim.desktop
 text/x-makefile=vim.desktop
 
 # Chromium for web/html
-text/html=chromium.desktop
-x-scheme-handler/about=chromium.desktop
-x-scheme-handler/http=chromium.desktop
-x-scheme-handler/https=chromium.desktop
-x-scheme-handler/unknown=chromium.desktop
+text/html=firefox.desktop
+x-scheme-handler/about=firefox.desktop
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+x-scheme-handler/unknown=firefox.desktop
 
 # Various desktop applications
 inode/directory=nautilus.desktop

.config/picom.conf

@@ -1,6 +1,6 @@
 # Logging
-log-level = "debug";
-log-file = "/home/frebib/.local/share/picom.log";
+log-level = "info";
+#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,17 +68,17 @@ 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 --class floating-term -e sh -c "yay; kill -USR1 %pid%; sleep 1"
 
 [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 --class floating-term -d 125 40 --hold -e sh -c "curl wttr.in"
 
 [module/gateway]
 type = custom/script
-exec = for v in 4 6; do ip -$v r show default | xargs -l1 sh -c 'fping --retry=1 --quiet --iface "$4" "$2"'; done && echo  || echo '%{F#f41f1c}%{F-}'
+exec = for v in 4 6; do ip -$v r show default | xargs -rL1 sh -c 'fping --retry=1 --quiet --iface "$4" "$2"'; done && echo  || echo '%{F#f41f1c}%{F-}'
 interval = 2
 format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
@@ -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 --class floating-term -d 66 35 -qq --hold -e sh -c "cal -y $(date +%Y)":}%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/autocutsel-primary.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=autocutsel -selection primary
-PartOf=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/autocutsel -selection PRIMARY
-
-[Install]
-WantedBy=graphical-session.target
-

.config/systemd/user/autocutsel.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=autocutsel
-PartOf=graphical-session.target
-
-[Service]
-ExecStart=/usr/bin/autocutsel
-
-[Install]
-WantedBy=graphical-session.target
-

.config/systemd/user/autocutsel@.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=autocutsel selection %i
+PartOf=graphical-session.target
+Requires=xorg.target
+After=xorg.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel -selection %i
+
+[Install]
+WantedBy=graphical-session.target
+

.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/autocutsel@CLIPBOARD.service

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

.config/systemd/user/graphical-session.target.wants/autocutsel@PRIMARY.service

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

.config/systemd/user/graphical-session.target.wants/autocutsel@SECONDARY.service

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

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

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

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

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

.config/systemd/user/i3.service

@@ -7,7 +7,6 @@ After=profile.service xprofile.service xorg.target
 [Service]
 ExecStart=/usr/bin/i3
 ExecReload=/bin/sh -c 'i3-msg restart; systemctl is-active --user -q picom && systemctl --user restart picom'
-ExecStop=/bin/systemctl --user stop desktop.target
 Restart=always
 
 [Install]

.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/xprofile.service

@@ -7,7 +7,7 @@ After=xorg.target profile.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/bash -cx '. $XDG_CONFIG_HOME/X11/xprofile && systemctl --user import-environment'
+ExecStart=/usr/bin/bash -c '. $XDG_CONFIG_HOME/X11/xprofile; systemctl --user import-environment'
 
 [Install]
 WantedBy=xorg.target

.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,15 +11,16 @@ 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 --wheel-lines=3"
 export PAGER="less"
 export MANPAGER="less -+N"
+export SYSTEMD_PAGER="less $LESS"
 # Disable histfile
 export LESSHISTFILE=-
 
@@ -104,8 +103,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 +117,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

.gitignore

@@ -1,6 +1,7 @@
 bookmarks
 .config/secrets
 
+.config/gopass/gopass-logo-small.png
 .config/gtk-2.0/gtkfilechooser.ini
 .config/imgur-screenshot/credentials.conf
 .config/mailnag/mailnag.dat

.profile

@@ -24,7 +24,6 @@ export VISUAL="vim"
 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"

aliases

@@ -60,6 +60,7 @@ alias open=xdg-open
 alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -ir'
+alias scp='scp -r'
 alias dd='dd status=progress'
 alias ssh="ssh -tt"
 alias wget="wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file"
@@ -116,6 +117,7 @@ alias chx='chmod +x'
 
 # Git Aliases
 alias g=git
+alias ginit='git init'
 alias gignore='$EDITOR .gitignore'
 alias gitc='$EDITOR $XDG_CONFIG_HOME/git/config'
 alias ggignore='$EDITOR $XDG_CONFIG_HOME/git/gitignore'

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/rofi-fontawesome

@@ -57,9 +57,8 @@ function notify() {
 }
 
 function display() {
-    fontawesome=$(cat "$FONTAWESOME_FILE" | grep -v '#' | grep -v '^[[:space:]]*$')
-    update=""$'\t'"Update Font Awesome cache"
-    fontawesome=$(printf "$fontawesome\n$update")
+    update=$'\tUpdate Font Awesome cache'
+    fontawesome=$(grep -v '#\|^[[:space:]]*$' "$FONTAWESOME_FILE"; printf "$update\n")
     line=$(echo "$fontawesome" | rofi -dmenu -i -p fontawesome -normal-window -kb-custom-1 Ctrl+c -kb-row-tab '' -kb-row-select Tab $@)
     exit_code=$?
 
@@ -69,7 +68,6 @@ function display() {
         return
     fi
 
-    #IFS=$'\t'
     line=($line)
     last=${line[${#line[@]}-1]}
 

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
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

scripts/systemd-run-i3

@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+args=()
+while getopts "u:s:e:d:cnw" opt
+do case "$opt" in
+    u) args+=("--unit=$OPTARG");;
+    s) args+=("--slice=$OPTARG");;
+    e) args+=("--setenv=$OPTARG");;
+    d) args+=("--working-directory=$OPTARG");;
+    c) args+=("--scope");;
+    n) args+=("--no-block");;
+    w) args+=("--wait");;
+    *) shift;;
+    esac
+done
+shift $((OPTIND-1))
+
+rand=$(tr -dc 'a-f0-9' < /dev/urandom | head -c 16)
+
+exec systemd-run --user --collect ${args[@]} --unit="$1-$rand" -- "$@"