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
zsh: less enable mouse support
2024-06-14 12:57:23 +00:00 · 2020-03-21 23:35:09 +00:00 · 2020-03-21 23:33:18 +00:00 · 2020-03-21 23:32:34 +00:00 · 2020-03-21 23:30:12 +00:00 · 2020-03-21 23:29:40 +00:00
129 changed files with 1191 additions and 1407 deletions
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
--- a/.config/X11/xprofile
+++ b/.config/X11/xprofile
@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Graphical-specific environment variables
+export TERMINAL="termite"
+export BROWSER="chromium"
+export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+export QT_QPA_PLATFORMTHEME=gtk2
+export QT_STYLE_OVERRIDE=gtk2
+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)
+
+setxkbmap -option caps:none
+xset r rate 200 18
+xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap
--- a/.config/X11/xresources
+++ b/.config/X11/xresources
@ -0,0 +1,89 @@
+! Colour order:
+!   black
+!   red
+!   green
+!   yellow
+!   blue
+!   magenta
+!   cyan
+!   white/gray
+
+! Normal colours
+*.color0:       #333638
+*.color1:       #f41f1c
+*.color2:       #8bc34a
+*.color3:       #ffc107
+*.color4:       #0266f4
+*.color5:       #cc17cc
+*.color6:       #10aeba
+*.color7:       #8b9396
+
+! Bright colours
+*.color8:       #475760
+*.color9:       #e53727
+*.color10:      #9ccc65
+*.color11:      #ffa000
+*.color12:      #81b3f9
+*.color13:      #a56ecc
+*.color14:      #5ddae2
+*.color15:      #eceff1
+
+
+Xft.dpi:        96
+Xft.antialias:  true
+Xft.rgba:       rgb
+Xft.hinting:    true
+Xft.hintstyle:  hintfull
+Xft.lcdfilter:  lcddefault
+
+Xcursor.theme: Breeze_Obsidian
+
+!!======================!!
+!! RXVT-unicode setting !!
+!!======================!!
+
+urxvt.depth:                32
+urxvt.internalBorder:       16
+urxvt.blurRadius:           25
+urxvt.saveLines:            10000
+urxvt.preeditType:          Root
+
+urxvt.scrollBar:            false
+urxvt.jumpScroll:           false
+urxvt.scrollTtyOutput:      false
+urxvt.scrollWithBuffer:     true
+urxvt.scrollTtyKeypress:    true
+
+urxvt.altSendsEscape:       true
+xterm.metaSendsEscape:      true
+
+urxvt.termName:             xterm-256color
+
+urxvt.font:                 xft:Source Code Pro:style=regular:size=9
+urxvt.imFont:               xft:Source Code Pro:style=regular:size=9
+urxvt.boldFont:             xft:Source Code Pro:style=bold:size=9
+urxvt.italicFont:           xft:Source Code Pro:style=italic:size=9
+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.matcher.button:       1
+
+urxvt.keysym.C-Up:          font-size:increase
+urxvt.keysym.C-Down:        font-size:decrease
+urxvt.keysym.C-equal:       font-size:reset
+urxvt.keysym.C-slash:       font-size:show
+
+! special
+*.foreground:               #ECEFF1
+*.background:               #002B36
+*.cursorColor:              #5294E2
+*.highlightColor:           #5294E2
+urxvt.background:           [95]#383C4A
+urxvt.scrollColor:          #767B87
+urxvt.dynamicColors:        on
+urxvt.highlightSelection:   true
+urxvt.colorMode:            on
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@ -17,9 +17,9 @@ window:
  #
  # Specified in number of columns/lines, not pixels.
  # If both are `0`, this setting is ignored.
-  dimensions:
-    columns: 120
-    lines: 40
+  #dimensions:
+  #  columns: 0
+  #  lines: 0

  # Window position (changes require restart)
  #
@ -51,12 +51,6 @@ window:
  #     - buttonless: Title bar, transparent background, but no title bar buttons
  decorations: full

-  # Background opacity
-  #
-  # 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.
-  opacity: 0.8
-
  # Startup Mode (changes require restart)
  #
  # Values for `startup_mode`:
@ -71,9 +65,6 @@ window:
  # Window title
  #title: Alacritty

-  # Allow terminal applications to change Alacritty's window title.
-  dynamic_title: true
-
  # Window class (Linux/BSD only):
  #class:
    # Application instance name
@ -90,7 +81,7 @@ window:
 scrolling:
  # Maximum number of lines in the scrollback buffer.
  # Specifying '0' will disable scrolling.
-  history: 100000
+  history: 10000

  # Number of lines the viewport will move for every line scrolled when
  # scrollback is enabled (history > 0).
@ -216,7 +207,7 @@ colors:
  # background is unset, selection color will be the inverse of the cell colors.
  # If only text is unset the cell text color will remain the same.
  selection:
-    text: CellForeground
+  #  text: '#eaeaea'
    background: '#5294e2'

  # Normal colors
@ -265,13 +256,6 @@ colors:
  #
  #indexed_colors: []

-  # Transparent cell backgrounds
-  #
-  # Whether or not `window.opacity` applies to all cell backgrounds or only to
-  # the default background. When set to `true` all cells will be transparent
-  # regardless of their background color.
-  transparent_background_colors: false
-
 # Visual Bell
 #
 # Any time the BEL code is received, Alacritty "rings" the visual bell. Once
@ -298,11 +282,20 @@ colors:
 #  duration: 0
 #  color: '#ffffff'

+# Background opacity
+#
+# 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
+
 selection:
  #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"

  # When set to `true`, selected text will be copied to the primary clipboard.
-  save_to_clipboard: true
+  save_to_clipboard: false
+
+# Allow terminal applications to change Alacritty's window title.
+dynamic_title: true

 cursor:
  # Cursor style
@ -373,6 +366,28 @@ mouse:
  # If this is `true`, the cursor is temporarily hidden when typing.
  hide_when_typing: false

+  url:
+    # URL launcher
+    #
+    # This program is executed when clicking on a text which is recognized as a URL.
+    # The URL is always added to the command as the last parameter.
+    #
+    # When set to `None`, URL launching will be disabled completely.
+    #
+    # Default:
+    #   - (macOS) open
+    #   - (Linux/BSD) xdg-open
+    #   - (Windows) explorer
+    launcher:
+      program: xdg-open
+      args: []
+
+    # URL modifiers
+    #
+    # These are the modifiers that need to be held down for opening URLs when clicking
+    # on them. The available modifiers are documented in the key binding section.
+    #modifiers: None
+
 # Mouse bindings
 #
 # Mouse bindings are specified as a list of objects, much like the key
@ -584,16 +599,31 @@ key_bindings:
  # (Windows, Linux, and BSD only)
  - { key: V,        mods: Control|Shift, action: Paste            }
  - { key: C,        mods: Control|Shift, action: Copy             }
-  - { key: F,              mods: Control|Shift,           action: SearchForward    }
-  - { key: B,              mods: Control|Shift,           action: SearchBackward   }
-  - { key: C,              mods: Control|Shift, mode: Vi, action: ClearSelection   }
  - { key: Insert,   mods: Shift,         action: PasteSelection   }
  - { key: Key0,     mods: Control,       action: ResetFontSize    }
-  - { key: Equals,         mods: Control,                 action: IncreaseFontSize }
-  - { key: Plus,           mods: Control,                 action: IncreaseFontSize }
-  - { key: NumpadAdd,      mods: Control,                 action: IncreaseFontSize }
+  - { 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: NumpadSubtract, mods: Control,                 action: DecreaseFontSize }
+
+  # (Windows only)
+  #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
+
+  # (macOS only)
+  #- { key: K,      mods: Command, mode: ~Vi, chars: "\x0c"            }
+  #- { key: Key0,   mods: Command,            action: ResetFontSize    }
+  #- { key: Equals, mods: Command,            action: IncreaseFontSize }
+  #- { key: Add,    mods: Command,            action: IncreaseFontSize }
+  #- { key: Minus,  mods: Command,            action: DecreaseFontSize }
+  #- { key: K,      mods: Command,            action: ClearHistory     }
+  #- { key: V,      mods: Command,            action: Paste            }
+  #- { key: C,      mods: Command,            action: Copy             }
+  #- { key: H,      mods: Command,            action: Hide             }
+  #- { key: M,      mods: Command,            action: Minimize         }
+  #- { key: Q,      mods: Command,            action: Quit             }
+  #- { key: W,      mods: Command,            action: Quit             }
+  #- { key: N,      mods: Command,            action: SpawnNewInstance }
+  #- { key: F,      mods: Command|Control,    action: ToggleFullscreen }

 debug:
  # Display the time it takes to redraw each frame.
@ -611,7 +641,7 @@ debug:
  #   - Info
  #   - Debug
  #   - Trace
-  log_level: Warn
+  log_level: Info

  # Print all received window events.
  #print_events: false
--- a/.config/chromium-flags.conf
+++ b/.config/chromium-flags.conf
--- a/.config/dunst/dunst-xresources
+++ b/.config/dunst/dunst-xresources
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@ -51,16 +51,21 @@
    # Ignore newlines '\n' in notifications.
    ignore_newline = no

-    # dynamic width from 0 to 400
-    # width = (0, 400)
-    # constant width of 400
-    width = (320, 360)
+    # The geometry of the window:
+    #   [{width}]x{height}[+/-{x}+/-{y}]
+    # The geometry of the message window.
+    # The height is measured in number of notifications everything else
+    # in pixels.  If the width is omitted but the height is given
+    # ("-geometry x2"), the message window expands over the whole screen
+    # (dmenu-like).  If width is 0, the window expands to the longest
+    # message displayed.  A positive x is measured from the left, a
+    # negative from the right side of the screen.  Y is measured from
+    # the top and down respectevly.
+    # The width can be negative.  In this case the actual width is the
+    # screen width minus the width defined in within the geometry option.

-    # Position the notification in the top right corner
-    origin = top-right
-
-    # Offset from the origin
-    offset = 30x30
+    # 53 = 30 + 23 (bar-height)
+    geometry = "360x5-30+30"

    # Shrink window if it's smaller than the width.  Will be ignored if
    # width is 0.
@ -69,7 +74,7 @@
    # The transparency of the window.  Range: [0; 100].
    # This option will only work if a compositing windowmanager is
    # present (e.g. xcompmgr, compiz, etc.).
-    transparency = 20
+    transparency = 15

    # Don't remove messages, if the user is idle (no mouse or keyboard input)
    # for longer than idle_threshold seconds.
@ -135,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/firefox
+    browser = /usr/bin/chromium

    # Align icons left/right/off
    icon_position = left
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@ -6,53 +6,33 @@
        <edit name="family" mode="prepend" binding="strong">
            <string>Noto Sans</string>
            <string>Noto Color Emoji</string>
-            <string>FontAwesome 6 Pro Light</string>
+            <string>FontAwesome 5 Pro Light</string>
        </edit>
-
-        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
-        <edit mode="assign" name="hinting"><bool>false</bool></edit>
    </match>
-
    <match>
        <test qual="any" name="family"><string>serif</string></test>
        <edit name="family" mode="prepend" binding="strong">
            <string>Noto Serif</string>
            <string>Noto Color Emoji</string>
-            <string>FontAwesome 6 Pro Light</string>
+            <string>FontAwesome 5 Pro Light</string>
        </edit>
    </match>
-
    <match>
        <test qual="any" name="family"><string>monospace</string></test>
        <edit name="family" mode="prepend" binding="strong">
            <string>Source Code Pro</string>
            <string>Noto Color Emoji</string>
-            <string>FontAwesome 6 Pro Light</string>
+            <string>FontAwesome 5 Pro Light</string>
        </edit>
    </match>

-    <match>
+    <match target="font">
        <test qual="all" name="family" compare="eq"><string>Noto Sans</string></test>
        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
    </match>
-
-    <match>
+    <match target="font">
        <test qual="all" name="family" compare="eq"><string>Source Code Pro</string></test>
-        <edit name="antialias" mode="assign_replace"><bool>false</bool></edit>
-        <edit name="hintstyle" mode="assign_replace"><const>hintfull</const></edit>
-        <edit name="lcdfilter" mode="assign_replace"><const>lcddefault</const></edit>
-        <edit name="rgba" mode="assign_replace"><const>rgb</const></edit>
-    </match>
-
-    <alias>
-        <family>SF Mono</family>
-        <accept>
-            <family>monospace</family>
-        </accept>
-    </alias>
-
-    <match>
-        <edit name="antialias" mode="assign"><bool>true</bool></edit>
+        <edit name="hintstyle" mode="assign"><const>hintfull</const></edit>
        <edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit>
        <edit name="rgba" mode="assign"><const>rgb</const></edit>
    </match>
--- a/.config/git/config
+++ b/.config/git/config
@ -6,8 +6,6 @@
 	autocrlf = input
 	excludesfile = /home/frebib/.config/git/gitignore
 	pager = diff-highlight | $PAGER
-[init]
-	defaultBranch = master
 [interactive]
 	diffFilter = diff-highlight
 [commit]
@ -19,16 +17,8 @@
 [pull]
 	rebase = true
 	prune = true
-[merge]
-	ff = only
 [rebase]
 	autoStash = true
-[remote "origin"]
-	fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
-[remote "upstream"]
-	fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*
-[log]
-	date = iso8601-local
 [format]
 	pretty = format:%h %Cblue%ad%Creset %ae %Cgreen%s%Creset
 [alias]
@ -37,27 +27,9 @@
 	count = !echo $(pwd) && git rev-list HEAD --count
 	unpushed = !git log --oneline @{u}..HEAD
 	leaders = !git shortlog -s -n --all --no-merges
-	defbranch = "!defbranch() { \
-		r=\"${1:-origin}\"; \
-		{ \
-			git symbolic-ref \"refs/remotes/$r/HEAD\" || { \
-				git remote set-head \"$r\" -a >&2 && \
-				git symbolic-ref \"refs/remotes/$r/HEAD\"; \
-			}; \
-		} 2>/dev/null \
-			| sed \"s@^refs/remotes/$r/@@\"; \
-	}; defbranch"
-	cleanmerged = "!cleanmerged() { \
-		r=\"${1:-origin}\"; \
-		b=\"${2:-$(git defbranch \"$r\")}\"; \
-		git branch --merged \"$r/$b\" | \
-			grep -ve \"^\\\\*\" -e \"^. $b$\" | \
-			xargs -r git branch -d; \
-	}; cleanmerged"
 [advice]
 	statusHints = false
 	pushUpdateRejected = false
-	detachedHead = false
 [sendemail]
 	from = Joe Groocock <me@frebib.net>
 	smtpserver = smtp.zoho.com
--- a/.config/git/gitignore
+++ b/.config/git/gitignore
--- a/.config/gopass/config.yml
+++ b/.config/gopass/config.yml
--- a/.config/gtk-2.0/settings.ini
+++ b/.config/gtk-2.0/settings.ini
@ -1,8 +1,11 @@
+# DO NOT EDIT! This file will be overwritten by LXAppearance.
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
+
 gtk-theme-name="Arc-Dark"
 gtk-icon-theme-name="Xenlism-Wildfire"
-gtk-font-name="sans 9"
+gtk-font-name="Noto Sans 9"
 gtk-cursor-theme-name="Breeze_Obsidian"
-gtk-cursor-theme-size=16
+gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1
--- a/.config/gtk-3.0/gtk.css
+++ b/.config/gtk-3.0/gtk.css
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@ -2,9 +2,9 @@
 gtk-theme-name=Arc-Dark
 gtk-icon-theme-name=Xenlism-Wildfire
 gtk-application-prefer-dark-theme=true
-gtk-font-name=sans 9
+gtk-font-name=Noto Sans 9
 gtk-cursor-theme-name=Breeze_Obsidian
-gtk-cursor-theme-size=16
+gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=1
--- a/.config/i3/config
+++ b/.config/i3/config
@ -107,20 +107,22 @@ client.unfocused        $inactive-bg-color  $inactive-bg-color $inactive-text-co
 client.focused_inactive $inactive-bg-color  $inactive-bg-color $inactive-text-color $bg-color
 client.urgent           $urgent-bg-color    $urgent-bg-color   $text-color          $bg-color

+exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
+
 # Window rules
 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 [class="^jetbrains-.+$" title="win0"] floating enable
 for_window [window_role="floating-term"] floating enable
-for_window [class="^Rofi$"] 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
 new_float none

-gaps inner 24
+gaps inner 20
 gaps outer 4

 focus_follows_mouse yes
@ -128,31 +130,26 @@ popup_during_fullscreen smart

 # keybindings
 bindsym $mod+Shift+j            reload
-bindsym --release $mod+x        exec xkill
-bindsym $mod+c                  exec notify-send "Try again" "You meant \\\$mod+b"
-bindsym $mod+b                  exec systemd-run-i3 -n firefox
-bindsym $mod+Return             exec systemd-run-i3 -n alacritty
-bindsym $mod+Ctrl+Return        exec systemd-run-i3 -n alacritty --class floating
-bindsym $mod+Shift+Return       exec systemd-run-i3 -n alacritty --working-directory "$(xcwd)"
-bindsym $mod+Ctrl+Shift+Return  exec systemd-run-i3 -n alacritty --class floating --working-directory "$(xcwd)"
-bindsym $mod+v                  exec systemd-run-i3 -n alacritty -e sh -c "($SHELL -c $EDITOR || :) && $SHELL"
-bindsym $mod+Ctrl+v             exec systemd-run-i3 -n alacritty --class floating -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL"
+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+l                  exec dm-tool switch-to-greeter
-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+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+e            exec "pkill rofi; rofi -show emoji -modi emoji -normal-window"
+bindsym $mod+Shift+e            exec rofi-emoji
 bindsym $mod+Shift+i            exec rofi-fontawesome
-bindsym --release Print         exec screenshot --clip
-bindsym --release $mod+Print    exec screenshot
-bindsym --release Shift+Print   exec screenshot --active
-bindsym --release $mod+Shift+Print exec screenshot --active --clip
-bindsym $mod+Shift+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 -s background -n ~/.config/i3/cycleaudio.py
-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 bash -c 'pwgen -snc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i -r'
-bindsym $mod+g                  exec systemd-run-i3 -n bash -xc 'xclip -o | gh gist create -d Paste - 2>&1 | grep -vE "^[-✓] Creat(ing|ed) gist" | tee >(xclip -i >&2 >/dev/null) | xargs -r notify-send -c transfer'
-bindsym --release $mod+i        exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 10 -- "$(xclip -o -selection clipboard)"'
-bindsym $mod+z                  exec otp | rofi -dmenu -p otp | xargs otp
+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)"'

 # Media player controls
 bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause
@ -163,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 light -A 5
-bindsym XF86MonBrightnessDown   exec light -U 5
+bindsym XF86MonBrightnessUp     exec light -A 5 && pkill -RTMIN+12 i3blocks
+bindsym XF86MonBrightnessDown   exec light -U 5 && pkill -RTMIN+12 i3blocks

 # vim:ft=i3
--- a/.config/i3/cycleaudio.py
+++ b/.config/i3/cycleaudio.py
--- a/.config/i3/disable-standby-fs.py
+++ b/.config/i3/disable-standby-fs.py
--- a/.config/i3/powermenu.sh
+++ b/.config/i3/powermenu.sh
@ -1,11 +1,10 @@
 #!/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 | cut -d' ' -f2- | 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 | xargs)

 case $option in
    lock) dm-tool switch-to-greeter;;
-    logout) systemctl --user exit;;
+    logout) i3-msg exit;;
    sleep) systemctl suspend;;
    hibernate) systemctl hibernate;;
    power\ off) systemctl poweroff;;
@ -13,5 +12,7 @@ case $option in
    windows)
        windows=`efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4`
        sudo efibootmgr -n $windows
-        reboot;;
+        sudo hibereboot;;
 esac
+
+exit 0
--- a/.config/imgur-screenshot/imgur.ico
+++ b/.config/imgur-screenshot/imgur.ico
--- a/.config/imgur-screenshot/settings.conf
+++ b/.config/imgur-screenshot/settings.conf
@ -0,0 +1,20 @@
+imgur_icon_path="$HOME/.config/imgur-screenshot/imgur.ico"
+imgur_acct_key=""
+imgur_secret=""
+login="false"
+log_file="$HOME/.config/imgur-screenshot/imgur-screenshot.log"
+credentials_file="$HOME/.config/imgur-screenshot/credentials.conf"
+file_name_format="screenshot-%Y-%m-%d-%H%M%S.png" # when using scrot, must end with .png!
+file_dir="$HOME/pictures/screenshots"
+screenshot_select_command="maim -m 10 -us %img"
+screenshot_window_command="maim -m 10 -uw %img"
+edit_command="gimp %img"
+edit="false"
+exit_on_selection_fail="true"
+edit_on_selection_fail="false"
+exit_on_album_creation_fail="true"
+open_command="xdg-open %url"
+open="false"
+copy_url="true"
+keep_file="true"
+check_update="true"
--- a/.config/latexmk/latexmkrc
+++ b/.config/latexmk/latexmkrc
--- a/.config/mailnag/mailnag.cfg
+++ b/.config/mailnag/mailnag.cfg
@ -0,0 +1,29 @@
+[spamfilterplugin]
+filter_text = viagra
+
+[core]
+imap_idle_timeout = 10
+enabled_plugins = dbusplugin, libnotifyplugin, soundplugin
+poll_interval = 10
+credentialstore = auto
+connectivity_test = auto
+autostart = 1
+
+[soundplugin]
+soundfile = mailnag.ogg
+
+[libnotifyplugin]
+notification_mode = 2
+max_visible_mails = 10
+
+[account1]
+enabled = 1
+name = frebib.net
+user = me@frebib.net
+password = 
+server = imappro.zoho.com
+port = 993
+ssl = 1
+imap = 1
+idle = 0
+folder = INBOX, Spam
--- a/.config/mimeapps.list
+++ b/.config/mimeapps.list
@ -0,0 +1,42 @@
+[Default Applications]
+
+# eog for images
+image/bmp=eog.desktop
+image/gif=eog.desktop
+image/jpeg=eog.desktop
+image/jpg=eog.desktop
+image/pjpeg=eog.desktop
+image/png=eog.desktop
+image/svg+xml-compressed=eog.desktop
+image/svg+xml=eog.desktop
+image/tiff=eog.desktop
+image/x-bmp=eog.desktop
+image/x-gray=eog.desktop
+image/x-icb=eog.desktop
+image/x-ico=eog.desktop
+image/x-png=eog.desktop
+image/x-portable-anymap=eog.desktop
+image/x-portable-bitmap=eog.desktop
+image/x-portable-graymap=eog.desktop
+image/x-portable-pixmap=eog.desktop
+
+# evince for pdfs
+application/pdf=evince.desktop
+
+# vim for textual files
+application/x-shellscript=vim.desktop
+text/english=vim.desktop
+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
+
+# Various desktop applications
+inode/directory=nautilus.desktop
+x-scheme-handler/magnet=deluge.desktop
+x-scheme-handler/tg=telegramdesktop.desktop
--- a/.config/npm/npmrc
+++ b/.config/npm/npmrc
--- a/.config/pacaur/config
+++ b/.config/pacaur/config
--- a/.config/picom.conf
+++ b/.config/picom.conf
@ -1,32 +1,33 @@
 # Logging
-log-level = "info";
+log-level = "debug";
 #log-file = "/home/frebib/.local/share/picom.log";

 # Shadow
 shadow = true;
-shadow-radius = 30;
-shadow-offset-x = -30;
-shadow-offset-y = -26;
-shadow-opacity = 0.35;
-shadow-color = "#000000";
+shadow-radius = 24;
+shadow-offset-x = -24;
+shadow-offset-y = -24;
+shadow-opacity = 0.6;
+# shadow-red = 0.0;
+# shadow-green = 0.0;
+# shadow-blue = 0.0;
 shadow-exclude = [
 	"class_g = 'slop'",
 	"class_g = 'Conky'",
 	"class_g ?= 'Notify-osd'",
-	"class_g = 'firefox' && argb && (window_type = 'utility' || window_type = 'popup_menu')",
+	"class_g = 'Cairo-clock'",
+	"class_g = 'firefox' && argb",
 	"name = 'Notification'",
-	"name = 'cpt_frame_window'",
 	"_GTK_FRAME_EXTENTS@:c"
 ];
 # shadow-exclude = "n:e:Notification";
 # shadow-exclude-reg = "x10+0+0";
-# shadow-ignore-shaped = true;
 xinerama-shadow-crop = true;

 # Opacity
 frame-opacity = 1.0;
-active-opacity = 1.0;
-inactive-opacity = 0.5;
+# active-opacity = 0.8;
+inactive-opacity = 0.6;
 inactive-opacity-override = true;
 # inactive-dim = 0.2;
 # inactive-dim-fixed = true;
@ -38,7 +39,7 @@ opacity-rule = [
 blur:
 {
 	method = "dual_kawase";
-	strength = 10;
+	strength = 8;
 };
 blur-background-frame = true;
 blur-background-fixed = true;
@ -47,88 +48,55 @@ blur-background-exclude = [
 	"class_g = 'Onboard'",
 	"class_g = 'slop'",
 	"class_g = 'Polybar'",
-	"class_g = 'firefox' && argb && (window_type = 'utility' || window_type = 'popup_menu')",
+	"class_g = 'firefox' && argb",
 	"window_type = 'dock'",
 	"window_type = 'desktop'",
-	"_GTK_FRAME_EXTENTS@:c",
-	"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+	"_GTK_FRAME_EXTENTS@:c"
 ];

-# Corners
-corner-radius = 9;
-
 # Fading
 fading = true;
 fade-delta = 10;
-fade-in-step = 0.035;
-fade-out-step = 0.06;
+fade-in-step = 0.03;
+fade-out-step = 0.03;
 no-fading-openclose = false;
 no-fading-destroyed-argb = false;
 # fade-exclude = [ ];

-# Focus
-focus-exclude = [
-	"i:ai:chromium",
-	"class_g = 'firefox'",
-	"class_g = 'zoom'",
-	"class_g = 'guvcview'",
-	"class_g = 'Entangle'",
-	"class_g = 'obs'",
-	"class_g = 'parsecd'",
-	"class_g = 'discord'",
-	"class_g = 'steam_app_271590'"
-];
-
 # Other
-# https://github.com/yshui/picom/blob/next/picom.sample.conf#L203
 backend = "glx";
-vsync = true;
 mark-wmwin-focused = true;
 mark-ovredir-focused = true;
+use-ewmh-active-win = true;
 detect-rounded-corners = true;
 detect-client-opacity = true;
-use-ewmh-active-win = true;
+refresh-rate = 0;
+vsync = true;
+# sw-opti = true;
 # unredir-if-possible = true;
 # unredir-if-possible-delay = 5000;
 # unredir-if-possible-exclude = [ ];
+focus-exclude = [
+	"i:ai:chromium",
+	"class_g = 'firefox'",
+];
 detect-transient = true;
 detect-client-leader = true;
 invert-color-include = [ ];
-resize-damage = 1;
+# resize-damage = 1;

 # GLX backend
 glx-no-stencil = true;
 glx-no-rebind-pixmap = true;
-# xrender-sync-fence = true;
-# no-use-damage = false;
+xrender-sync-fence = true;
 use-damage = true;

 # Window type settings
-wintypes: {
-	tooltip = {
-		opacity = 0.75;
-		full-shadow = false;
-		blur-background = false;
-	}
-
-	dock = {
-		# Prevents polybar getting a forehead-shadow
-		shadow = false;
-	}
-
-	dnd = {
-		# Prevents dragged text in a browser getting blur/shadow
-		shadow = false;
-		blur-background = false;
-	}
-
-	popup_menu = {
-		opacity = 0.8;
-	}
-
-	dropdown_menu = {
-		opacity = 0.8;
-	}
+wintypes:
+{
+  tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
+  dock = { shadow = false; }
+  dnd = { shadow = false; }
+  popup_menu = { opacity = 0.8; }
+  dropdown_menu = { opacity = 0.8; }
 };
-
-# vim: ft=conf noet
--- a/.config/polybar/config
+++ b/.config/polybar/config
@ -1,5 +1,5 @@
 [colours]
-background = #0000
+background = transparent
 text = #eceff1
 icon = #147a82
 warning = #ffcb00
@ -10,23 +10,25 @@ urgent = #e53935
 format-foreground = ${colours.text}
 format-background = ${colours.background}
 format-spacing = 0
-format-margin  = 3
+format-margin  = 2.5
 format-offset  = 0

 screenchange-reload = true

 [bar/i3bar]
+monitor = ${env:MONITOR:HDMI-0}
 dpi  = ${xrdb:Xft.dpi:96}
 fixed-center = false
 enable-ipc = true

 width = 100%
+#offset-x = 18px
 height = 16pt
 bottom = true
 radius = 0

-font-0 = sans:pixelsize=9;2pt
-font-1 = FontAwesome6ProLight:pixelsize=10;2pt
+font-0 = sans:pixelsize=9;2
+font-1 = FontAwesome5ProLight:pixelsize=10;2

 foreground = ${colours.text}
 background = ${colours.background}
@ -37,21 +39,22 @@ padding-right = 2pt
 border-size = 0
 border-left-size = 16pt
 border-right-size = 16pt
-border-bottom-size = 10pt
+border-bottom-size = 8pt

 line-size = 0
 line-colour = #f00

 modules-left = i3
 modules-center =
-modules-right = volume updates weather wifi ethernet memory cpu cputemp backlight battery 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
 tray-background = ${colours.background}
 #tray-offset-x = -20
 #tray-offset-y = 0
-tray-maxsize = 16pt
+tray-maxsize = 16
 tray-padding = 8pt
 tray-scale = 1.0

@ -65,17 +68,17 @@ exec = $XDG_CONFIG_HOME/polybar/update.sh
 tail = true
 format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
-click-left = systemd-run --user --no-block -- i3-sensible-terminal --class floating-term -e sh -c "yay; kill -USR1 %pid%; sleep 1"
+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 = systemd-run --user --no-block -- i3-sensible-terminal --class floating-term -d 125 40 --hold -e sh -c "curl wttr.in"
+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
-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-}'
+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-}'
 interval = 2
 format-prefix = "  "
 format-prefix-foreground = ${colours.icon}
@ -131,9 +134,8 @@ label-urgent-foreground = ${colours.urgent}
 label-urgent-padding = ${self.label-focused-padding}


-[module/backlight]
-type = internal/backlight
-card = intel_backlight
+[module/xbacklight]
+type = internal/xbacklight

 label = %percentage%
 format = <label>
@ -141,6 +143,12 @@ format-prefix = "  "
 format-prefix-foreground = ${colours.icon}


+[module/backlight-acpi]
+inherit = module/xbacklight
+type = internal/backlight
+card = intel_backlight
+
+
 [module/cpu]
 type = internal/cpu
 interval = 2
@ -158,9 +166,9 @@ format-prefix-foreground = ${colours.icon}
 label = %percentage_used%%


-[module/wifi]
+[module/wlan]
 type = internal/network
-interface-type = wireless
+interface = wlp1s0
 interval = 3.0

 format-connected = <ramp-signal>  <label-connected>
@ -179,12 +187,12 @@ ramp-signal-2 = 
 ramp-signal-foreground = ${colours.icon}


-[module/ethernet]
+[module/eth]
 type = internal/network
-interface-type = wired
-interval = 10.0
+interface = eth0
+interval = 3.0

-label-connected = %local_ip% & %local_ip6%
+label-connected = %local_ip%
 format-connected-prefix = "  "
 format-connected-prefix-foreground = ${colours.icon}
 format-connected-underline = ${colours.background}
@ -200,7 +208,7 @@ label-disconnected-foreground = ${colours.critical}
 type = internal/date
 interval = 1

-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}
+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
--- a/.config/polybar/update.sh
+++ b/.config/polybar/update.sh
--- a/.config/polybar/weather.sh
+++ b/.config/polybar/weather.sh
--- a/.config/procps/toprc
+++ b/.config/procps/toprc
@ -1,5 +1,5 @@
 top's Config File (Linux processes with windows)
-Id:i, Mode_altscr=0, Mode_irixps=0, Delay_time=0.500, Curwin=0
+Id:i, Mode_altscr=0, Mode_irixps=0, Delay_time=0.100, Curwin=0
 Def	fieldscur=¥&K¨³´»½@·º¹56ÄFÅ')*+,-./0128<>?ABCGHIJLMNOPQRSTUVWXYZ[\]^_`abcdefghij
 	winflags=163638, sortindx=21, maxtasks=0, graph_cpus=1, graph_mems=1
 	summclr=1, msgsclr=1, headclr=3, taskclr=1
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
--- a/.config/rofi/arc-dark.rasi
+++ b/.config/rofi/arc-dark.rasi
@ -8,7 +8,7 @@ window {
  border:           0.3em;
  border-color:     #2f343f;
  padding:          0.8em;
-  background-color: rgba(56, 60, 74, 0.9);
+  background-color: rgba(56, 60, 74, 0.95);
  transparency:     "real";
 }

--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@ -1,6 +1,9 @@
 configuration {
+  theme: "arc-dark";
  font: "sans 14";
  dpi: 0;
+  width: 35;
+  lines: 10;

  /* show-icons: true; */
  separator-style: "solid";
@ -139,15 +142,4 @@ configuration {
 /*  me-accept-custom: "Control+MouseDPrimary";*/
 }

-@theme "arc-dark"
-
-window {
-	width: 700;
-}
-
-listview {
-	lines: 10;
-	columns: 1;
-}
-
 /* vim: ft=css sw=2 */
--- a/.config/systemd/user/autocutsel-primary.service
+++ b/.config/systemd/user/autocutsel-primary.service
@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel -selection primary
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel -selection PRIMARY
+
+[Install]
+WantedBy=graphical-session.target
+
--- a/.config/systemd/user/autocutsel.service
+++ b/.config/systemd/user/autocutsel.service
@ -0,0 +1,10 @@
+[Unit]
+Description=autocutsel
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/autocutsel
+
+[Install]
+WantedBy=graphical-session.target
+
--- a/.config/systemd/user/basic.target.wants/profile.service
+++ b/.config/systemd/user/basic.target.wants/profile.service
@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/profile.service
--- a/.config/systemd/user/blueman-applet.service
+++ b/.config/systemd/user/blueman-applet.service
@ -1,13 +1,12 @@
 [Unit]
 Description=Bluetooth Applet
-After=graphical-session.target
-Requires=graphical-session.target
-ConditionPathExists=/sys/class/bluetooth
+After=graphical-session.target bluetooth.service
+Requires=graphical-session.target bluetooth.service

 [Service]
+Type=simple
 ExecStart=/usr/bin/blueman-applet
 Restart=on-failure
-Slice=background.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/default.target
+++ b/.config/systemd/user/default.target
--- a/.config/systemd/user/default.target.wants/dunst.service
+++ b/.config/systemd/user/default.target.wants/dunst.service
--- a/.config/systemd/user/default.target.wants/redshift.service
+++ b/.config/systemd/user/default.target.wants/redshift.service
@ -0,0 +1 @@
+/usr/lib/systemd/user/redshift.service
--- a/.config/systemd/user/desktop.target.wants/blueman-applet.service
+++ b/.config/systemd/user/desktop.target.wants/blueman-applet.service
--- a/systemd/user/graphical-session.target.wants/dunst.service
+++ b/systemd/user/graphical-session.target.wants/dunst.service
--- a/.config/systemd/user/desktop.target.wants/networkmanager-applet.service
+++ b/.config/systemd/user/desktop.target.wants/networkmanager-applet.service
--- a/.config/systemd/user/desktop.target.wants/nextcloud.service
+++ b/.config/systemd/user/desktop.target.wants/nextcloud.service
--- a/.config/systemd/user/desktop.target.wants/picom.service
+++ b/.config/systemd/user/desktop.target.wants/picom.service
--- a/.config/systemd/user/desktop.target.wants/polybar@i3bar.service
+++ b/.config/systemd/user/desktop.target.wants/polybar@i3bar.service
--- a/.config/systemd/user/desktop.target.wants/solaar.service
+++ b/.config/systemd/user/desktop.target.wants/solaar.service
--- a/.config/systemd/user/desktop.target.wants/xdg-user-dirs-update.service
+++ b/.config/systemd/user/desktop.target.wants/xdg-user-dirs-update.service
--- a/.config/systemd/user/graphical-session.target.wants/autocutsel-primary.service
+++ b/.config/systemd/user/graphical-session.target.wants/autocutsel-primary.service
@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel-primary.service
--- a/.config/systemd/user/graphical-session.target.wants/autocutsel.service
+++ b/.config/systemd/user/graphical-session.target.wants/autocutsel.service
@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/autocutsel.service
--- a/.config/systemd/user/graphical-session.target.wants/i3.service
+++ b/.config/systemd/user/graphical-session.target.wants/i3.service
--- a/.config/systemd/user/graphical-session.target.wants/xautolock.service
+++ b/.config/systemd/user/graphical-session.target.wants/xautolock.service
@ -0,0 +1 @@
+/home/frebib/.config/systemd/user/xautolock.service
--- a/.config/systemd/user/i3.service
+++ b/.config/systemd/user/i3.service
@ -2,13 +2,13 @@
 Description=i3 - an improved dynamic, tiling window manager
 Requires=xorg.target
 Before=graphical-session.target
-After=xprofile.service xorg.target
+After=profile.service xprofile.service xorg.target

 [Service]
 ExecStart=/usr/bin/i3
-ExecReload=/usr/bin/i3-msg restart
+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
-Slice=session.slice

 [Install]
 WantedBy=graphical-session.target
--- a/.config/systemd/user/networkmanager-applet.service
+++ b/.config/systemd/user/networkmanager-applet.service
@ -2,13 +2,11 @@
 Description=NetworkManager Applet
 After=graphical-session.target NetworkManager.service
 Requires=graphical-session.target
-ConditionPathExists=/run/NetworkManager

 [Service]
 Type=simple
 ExecStart=/usr/bin/nm-applet
 Restart=on-failure
-Slice=background.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/nextcloud.service
+++ b/.config/systemd/user/nextcloud.service
@ -4,10 +4,11 @@ Requires=graphical-session.target
 After=graphical-session.target

 [Service]
+Type=simple
 ExecStart=/usr/bin/nextcloud --background
 ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
 Restart=on-failure
-Slice=app.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/picom.service
+++ b/.config/systemd/user/picom.service
@ -1,12 +1,12 @@
 [Unit]
 Description=A lightweight compositor for X11
 Requires=graphical-session.target
-After=dbus.service graphical-session.target xorg.target
+After=graphical-session.target xorg.target

 [Service]
-ExecStart=/usr/bin/picom --dbus
+Type=simple
+ExecStart=/usr/bin/picom --experimental-backends --dbus
 Restart=always
-Slice=session.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/polybar@.service
+++ b/.config/systemd/user/polybar@.service
@ -1,13 +1,12 @@
 [Unit]
-Description=Polybar bar %i
+Description=Polybar
 Requires=graphical-session.target
 After=graphical-session.target pulseaudio.socket i3.service

 [Service]
+Type=simple
 ExecStart=/usr/bin/polybar --reload --log=warning %i
-ExecReload=/usr/bin/polybar-msg -p $MAINPID cmd restart
 Restart=always
-Slice=session.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/profile.service
+++ b/.config/systemd/user/profile.service
@ -0,0 +1,10 @@
+[Unit]
+Description=Load profile environment into session
+Before=graphical-session-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bash -c '. $HOME/.config/dotfiles/.profile && systemctl --user import-environment'
+
+[Install]
+WantedBy=basic.target
--- a/.config/systemd/user/sleep-lock-lightdm.service
+++ b/.config/systemd/user/sleep-lock-lightdm.service
--- a/.config/systemd/user/sleep.target.wants/sleep-lock-lightdm.service
+++ b/.config/systemd/user/sleep.target.wants/sleep-lock-lightdm.service
--- a/.config/systemd/user/sockets.target.wants/pulseaudio.socket
+++ b/.config/systemd/user/sockets.target.wants/pulseaudio.socket
@ -0,0 +1 @@
+/usr/lib/systemd/user/pulseaudio.socket
--- a/.config/systemd/user/solaar.service
+++ b/.config/systemd/user/solaar.service
@ -5,10 +5,9 @@ After=graphical-session.target

 [Service]
 Type=simple
-ExecStart=/usr/bin/solaar --debug --restart-on-wake-up --window=hide
+ExecStart=/usr/bin/solaar --restart-on-wake-up -d
 KillMode=process
 Restart=on-failure
-Slice=background.slice

 [Install]
 WantedBy=desktop.target
--- a/.config/systemd/user/xautolock.service
+++ b/.config/systemd/user/xautolock.service
@ -7,7 +7,6 @@ After=xorg.target
 ExecStart=/usr/bin/xautolock -time 5 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
 KillMode=process
 Restart=on-failure
-Slice=session.slice

 [Install]
 WantedBy=graphical-session.target
--- a/.config/systemd/user/xbindkeys.service
+++ b/.config/systemd/user/xbindkeys.service
@ -1,10 +1,11 @@
 [Unit]
 Description=XBindKeys
+Requires=profile.service
+After=profile.service

 [Service]
 ExecStart=/usr/bin/xbindkeys -n -f $XDG_CONFIG_HOME/X11/xbindkeysrc
 KillMode=process
-Slice=session.slice

 [Install]
 WantedBy=graphical-session.target
--- a/.config/systemd/user/xorg.target
+++ b/.config/systemd/user/xorg.target
--- a/.config/systemd/user/xorg.target.wants/xprofile.service
+++ b/.config/systemd/user/xorg.target.wants/xprofile.service
--- a/.config/systemd/user/xprofile.service
+++ b/.config/systemd/user/xprofile.service
@ -0,0 +1,13 @@
+[Unit]
+Description=Load Xorg configuration
+PartOf=xorg.target
+Requires=profile.service
+After=xorg.target profile.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/bash -cx '. $XDG_CONFIG_HOME/X11/xprofile && systemctl --user import-environment'
+
+[Install]
+WantedBy=xorg.target
--- a/.config/systemd/user/xsettingsd.service
+++ b/.config/systemd/user/xsettingsd.service
@ -1,13 +1,12 @@
 [Unit]
 Description=xsettingsd - provide settings to X11 applications
 Requires=xorg.target
-After=xorg.target
+After=xorg.target profile.service

 [Service]
-ExecStart=xsettingsd -c ${XDG_CONFIG_HOME}/xsettingsd/xsettingsd.conf
+ExecStart=/bin/sh -c 'xsettingsd -c $XDG_CONFIG_HOME/xsettingsd/xsettingsd.local'
 ExecReload=/bin/kill -s HUP $MAINPID
 Restart=always
-Slice=session.slice

 [Install]
 WantedBy=graphical-session.target
--- a/.config/termite/config
+++ b/.config/termite/config
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
--- a/.config/vim/.gitignore
+++ b/.config/vim/.gitignore
--- a/.config/vim/ftplugin/javascript/config.vim
+++ b/.config/vim/ftplugin/javascript/config.vim
--- a/.config/vim/ftplugin/ocaml/config.vim
+++ b/.config/vim/ftplugin/ocaml/config.vim
--- a/.config/vim/ftplugin/ocaml/keybinds.vim
+++ b/.config/vim/ftplugin/ocaml/keybinds.vim
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@ -39,42 +39,43 @@ set updatetime=500  " reduce delay from 4s default

 let mapleader="\<space>"

-" ALE config
-let g:ale_completion_enabled = 1
-let g:ale_open_list = 1
-augroup CloseLoclistWindowGroup
-    autocmd!
-    autocmd QuitPre * if empty(&buftype) | lclose | endif
-augroup END
-
 " Autosave settings
 function! SaveIfExist()
    if @% != "" && filereadable(@%) && !&readonly && &modified
+        SyntasticCheck
        write
    endif
 endfunction
 set autowrite
 autocmd CursorHold,CursorHoldI,InsertLeave,FocusGained,FocusLost * call SaveIfExist()

+" Auto-resize split on window resize
+autocmd VimResized * wincmd =
+
 " Search options
 set hlsearch
 set ignorecase
 set smartcase
 set magic

-" Auto-resize split on window resize
-autocmd VimResized * wincmd =
 " More natural splits
 set splitbelow          " Horizontal split below current.
 set splitright          " Vertical split to right of current.

+" GVim settings
+set guifont=Sauce\ Code\ Pro\ 9
+set guioptions=
+
 " Whitespace highlight settings
 set list
-set listchars=space:·,tab:>-,trail:◦,extends:▶,precedes:◀
+set listchars=eol:$,space:·,tab:>-,trail:◦,extends:▶,precedes:◀
 highlight SpecialKey ctermfg=8

-set cc=+1
+if exists('+colorcolumn')
    highlight ColorColumn ctermbg=8
+    autocmd filetype c,h,cpp,hpp set colorcolumn=81
+    autocmd filetype c,h,cpp,hpp match ErrorMsg '\%>80v.\+'
+endif

 " Highlight line and column of cursor
 set cul cuc
@ -89,6 +90,8 @@ endif

 call plug#begin('$XDG_CONFIG_HOME/vim/plug')

+Plug 'Valloric/YouCompleteMe'
+Plug 'scrooloose/syntastic'
 Plug 'scrooloose/nerdtree', { 'on':  'NERTreeToggle' }
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-fugitive'
@ -105,54 +108,29 @@ Plug 'vim-airline/vim-airline-themes'
 Plug 'lervag/vimtex'
 Plug 'JamshedVesuna/vim-markdown-preview'
 Plug 'junegunn/fzf.vim'
-
-" Completion and linting
-Plug 'dense-analysis/ale'
-Plug 'Shougo/deoplete.nvim'
-Plug 'roxma/nvim-yarp'
-Plug 'roxma/vim-hug-neovim-rpc'
-
 Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }

 " Syntax Highlighting
 Plug 'chr4/nginx.vim'
 Plug 'PotatoesMaster/i3-vim-syntax'
 Plug 'puppetlabs/puppet-syntax-vim'
-Plug 'saltstack/salt-vim'
 Plug 'arrufat/vala.vim'
-Plug 'Glench/Vim-Jinja2-Syntax'
-Plug 'pearofducks/ansible-vim'
-Plug 'jvirtanen/vim-hcl'
-Plug 'hashivim/vim-terraform'

 call plug#end()

 " Change to dvorak-mapped keys
 let g:use_dvorak = 1

-" Deoplete config
-call deoplete#custom#option({
-\ 'camel_case': v:true,
-\ })
-call deoplete#enable()
-
-" Vim-Airline config
-let g:Powerline_symbols = 'fancy'
-let g:airline_powerline_fonts = 1
-let g:airline_theme='solarized'
-let g:airline#extensions#tabline#enabled = 1
-" ALE integration
-let g:airline#extensions#ale#enabled = 1
-
-" vim-markdown plugin
-let vim_markdown_preview_toggle=0
-let vim_markdown_preview_browser='Chromium'
-let vim_markdown_preview_use_xdg_open=1
-let vim_markdown_preview_github=1
-
-" LaTeX config
+" YouCompleteMe config
+let g:ycm_confirm_extra_conf = 0
+if !exists('g:ycm_semantic_triggers')
+    let g:ycm_semantic_triggers = {}
+endif
+let g:ycm_semantic_triggers.tex = g:vimtex#re#youcompleteme
+"let g:vimtex_view_method='zathura'
 let g:tex_flavor='xelatex'
 let g:vimtex_indent_enabled = 0     " auto-indentation is wrong and annoying
+let g:syntastic_tex_checkers = ['chktex']
 autocmd FileType tex silent VimtexCompile
 autocmd FileType tex setlocal spell
 augroup vimtex
@ -162,6 +140,35 @@ augroup vimtex
    autocmd BufWritePost tex silent VimtexCompile
 augroup END

+
+" Vim-Airline config
+let g:Powerline_symbols = 'fancy'
+let g:airline_powerline_fonts = 1
+let g:airline_theme='solarized'
+let g:airline#extensions#tabline#enabled = 1
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+" vim-markdown plugin
+let vim_markdown_preview_toggle=0
+let vim_markdown_preview_browser='Chromium'
+let vim_markdown_preview_use_xdg_open=1
+let vim_markdown_preview_github=1
+
+" Syntastic configuration
+let g:syntastic_enable_highlighting = 1
+let g:syntastic_enable_signs=1
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+
 " Tagbar configuration
 let g:tagbar_width = 50
 let g:tagbar_compact = 1
@ -300,12 +307,5 @@ cmap w!! w !sudo tee > /dev/null %
 " Unmap ex-mode
 map Q <nop>

-
-autocmd FileType c setlocal noet
-autocmd filetype c,h,cpp,hpp set colorcolumn=81
-autocmd filetype c,h,cpp,hpp match ErrorMsg '\%>80v.\+'
-
-autocmd FileType jinja setlocal sts=2 sw=2 et
-autocmd FileType markdown setlocal sts=2 sw=2 et
-autocmd FileType yaml setlocal sts=2 sw=2 et indentkeys-=<:>
-autocmd FileType gitcommit setlocal tw=72 et sw=4
+autocmd FileType markdown setlocal ts=2 sts=2 sw=2 et
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 et
--- a/.config/zsh/.gitignore
+++ b/.config/zsh/.gitignore
@ -0,0 +1,4 @@
+/antigen/
+/log/
+/histfile
+/.zcompdump*
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@ -0,0 +1,176 @@
+# Config and cache directory paths
+CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
+ZSH_DIR="$CONFIG_DIR/zsh"
+LOG_DIR="$ZSH_DIR/log"
+mkdir -p "$LOG_DIR"
+
+HISTFILE="$ZSH_DIR/histfile"
+HISTSIZE=999999
+SAVEHIST=999999
+
+exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
+
+# Only set tty if running interactively
+if exists tty && tty -s; then
+    # Resolve at shell runtime
+    export GPG_TTY="$(tty)"
+fi
+
+# Configure less and add colours
+export LESS="-RI --mouse"
+export PAGER="less"
+export MANPAGER="less -+N"
+# Disable histfile
+export LESSHISTFILE=-
+
+if exists tput; then
+    export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green
+    export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan
+    export LESS_TERMCAP_me=$(tput sgr0)
+    export LESS_TERMCAP_so=$(tput bold; tput setaf 4) # blue
+    export LESS_TERMCAP_se=$(tput rmso; tput sgr0)
+    export LESS_TERMCAP_us=$(tput smul; tput bold; tput setaf 7) # white
+    export LESS_TERMCAP_ue=$(tput rmul; tput sgr0)
+    export LESS_TERMCAP_mr=$(tput rev)
+    export LESS_TERMCAP_mh=$(tput dim)
+    export LESS_TERMCAP_ZN=$(tput ssubm)
+    export LESS_TERMCAP_ZV=$(tput rsubm)
+    export LESS_TERMCAP_ZO=$(tput ssupm)
+    export LESS_TERMCAP_ZW=$(tput rsupm)
+fi
+
+# Set some useful ZSH/Bash options
+setopt sharehistory histignorealldups histignorespace histreduceblanks
+setopt pathdirs autocd autopushd extendedglob nullglob alwaystoend interactivecomments dvorak
+
+# Completion initialisation
+autoload -U compinit ; compinit
+autoload -U bashcompinit ; bashcompinit
+
+# gopass completion
+if exists gopass; then
+    source <(gopass completion bash)
+fi
+
+zstyle ':completion:*:sudo|_::' environ PATH="/sbin:/usr/sbin:$PATH" HOME="/root"
+zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*'
+zstyle ':completion:*' rehash true
+zstyle ':completion:*' menu select
+zstyle ':completion:*' list-colors "${(@s.:.)LS_COLORS}"
+zstyle ':compinstall'  filename "${ZDOTDIR:-~}/.zshrc"
+
+# Pre-load vi-mode edit-command-line before antigen plugins are loaded
+autoload -z edit-command-line
+zle -N edit-command-line
+
+export WORDCHARS='*?_[]~=&;!#$%^(){}'
+x-bash-backward-kill-word(){ WORDCHARS='' zle kill-word; }
+zle -N x-bash-backward-kill-word
+
+# Load antigen & plugins
+ADOTDIR="$ZSH_DIR/antigen" # Antigen directory
+ANTIGEN_LOG="$LOG_DIR/antigen-$(date +"%Y_%m_%d_%I_%M_%p").log"
+antigen_src="$ADOTDIR/antigen.zsh"
+if [ ! -f "$antigen_src" ]; then
+    git clone https://github.com/zsh-users/antigen.git "$ADOTDIR"
+fi
+source "$antigen_src"
+
+antigen bundle zsh-users/zsh-completions
+antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle zsh-users/zsh-syntax-highlighting@feature/redrawhook
+antigen bundle mafredri/zsh-async
+
+antigen apply
+
+# Vim mode!
+bindkey -v
+export KEYTIMEOUT=25
+
+# Set some key-binds
+bindkey "^[[1;3C" forward-word
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;3D" backward-word
+bindkey "^[[1;5D" backward-word
+bindkey "^[[7~" beginning-of-line
+bindkey "^[[8~" end-of-line
+bindkey "^[[3~" delete-char
+bindkey "^[[3;3~" delete-word
+bindkey '^[^[[3~' x-bash-backward-kill-word
+bindkey '^[^[[3^' x-bash-backward-kill-word
+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
+bindkey -M vicmd t vi-up-line-or-history
+bindkey -M vicmd n vi-forward-char
+bindkey -M vicmd k vi-delete
+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
+ZSH_AUTOSUGGEST_CLEAR_WIDGETS=("${(@)ZSH_AUTOSUGGEST_CLEAR_WIDGETS:#(up|down)-line-or-history}")
+
+default='fg=12'
+prog='fg=blue'
+ZSH_HIGHLIGHT_STYLES=()
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets root line)
+ZSH_HIGHLIGHT_STYLES[root]='bg=red'
+ZSH_HIGHLIGHT_STYLES[default]=$default
+ZSH_HIGHLIGHT_STYLES[arg0]=$prog
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[alias]=$prog
+ZSH_HIGHLIGHT_STYLES[suffix-alias]='fg=green'
+ZSH_HIGHLIGHT_STYLES[builtin]='fg=4'
+ZSH_HIGHLIGHT_STYLES[function]=$prog
+ZSH_HIGHLIGHT_STYLES[command]=$prog
+ZSH_HIGHLIGHT_STYLES[precommand]='fg=4'
+ZSH_HIGHLIGHT_STYLES[commandseparator]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='fg=green'
+ZSH_HIGHLIGHT_STYLES[path]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[path_separator]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='fg=208'
+ZSH_HIGHLIGHT_STYLES[globbing]='fg=red'
+ZSH_HIGHLIGHT_STYLES[comment]='fg=7'
+ZSH_HIGHLIGHT_STYLES[history-expansion]=$default
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=$default
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=$default
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='fg=magenta'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]='fg=yellow'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]='fg=cyan'
+ZSH_HIGHLIGHT_STYLES[assign]='fg=green'
+ZSH_HIGHLIGHT_STYLES[redirection]='fg=cyan,bold'
+
+source "$DOTFILES/aliases"
+
+# Source secret keys and values into environment
+if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
+    set -o allexport
+    source $XDG_CONFIG_HOME/secrets
+    set +o allexport
+fi
+
+# Load some manual plugins
+source "$ZSH_DIR/plugins/sudo.zsh"
+source "$ZSH_DIR/plugins/fish-theme.zsh"
+source "$ZSH_DIR/plugins/git-rprompt.zsh"
+[ -f '/usr/share/fzf/key-bindings.zsh' ] && source /usr/share/fzf/key-bindings.zsh
+[ -f '/usr/share/doc/pkgfile/command-not-found.zsh' ] && source /usr/share/doc/pkgfile/command-not-found.zsh
+[ -r '/usr/share/z/z.sh' ] && source /usr/share/z/z.sh
--- a/.config/zsh/plugins/fish-theme.zsh
+++ b/.config/zsh/plugins/fish-theme.zsh
@ -0,0 +1,14 @@
+# ZSH Theme emulating the Fish shell's default prompt.
+
+_fishy_collapsed_wd() {
+    pwd | sed -E 's|^'$HOME'|~|;s|(.*)/|\1%|;s|((^\|/)\.?[^/%]{1})[^/%]*|\1|g;s|(.*)%|\1/|'
+}
+
+# Required for dynamic prompt
+setopt prompt_subst
+
+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
+PROMPT="%n@%m %F{$user_color}\$(_fishy_collapsed_wd)%f%(!.#.>) "
+PROMPT2='%F{red}\ %f'
+
+RPROMPT='%F{red}%(?.. %?)%f'
--- a/.config/zsh/plugins/git-rprompt.zsh
+++ b/.config/zsh/plugins/git-rprompt.zsh
--- a/.config/zsh/plugins/sudo.zsh
+++ b/.config/zsh/plugins/sudo.zsh
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +1,12 @@
 bookmarks
 .config/secrets

-.config/gopass/gopass-logo-small.png
 .config/gtk-2.0/gtkfilechooser.ini
 .config/imgur-screenshot/credentials.conf
 .config/mailnag/mailnag.dat
 .config/zsh/.zshrc.zwc

 *.log
+.xournal/recent-files
 .vim/bundle
 .vim/swapfiles
--- a/.profile
+++ b/.profile
@ -0,0 +1,56 @@
+export LC_ALL=en_GB.UTF-8
+export LANG=en_GB.UTF-8
+export LC_NUMERIC=en_GB
+
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
+export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+export XDG_LOCAL_HOME="$HOME/.local"
+
+mkdir -p "$XDG_CONFIG_HOME" "$XDG_CACHE_HOME" "$XDG_DATA_HOME" "$XDG_LOCAL_HOME"
+
+case "$(basename "$(readlink -f /proc/$$/exe)")" in
+    zsh)  thisfile="$(readlink -f "${(%):-%N}")";;
+    bash) thisfile="$(readlink -f "${BASH_SOURCE[0]}")";;
+    *)   thisfile="$(find /proc/$$/fd/ | xargs -n1 -r readlink -f | grep profile | head -n1)";;
+esac
+
+export EDITOR="vim"
+export VISUAL="vim"
+
+# Override paths for non-compliant programs
+# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
+
+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"
+export TERMINFO="$XDG_DATA_HOME/terminfo"
+export TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
+export VIMDIR="$XDG_CONFIG_HOME/vim"
+export VIMRC="$VIMDIR/vimrc"
+export VIMINIT=":so $VIMRC"
+export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
+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"
+
+exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
+    eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
+
+# Execute this after updating dbus/systemd environment
+# Source secret keys and values into environment
+if [ -f "$XDG_CONFIG_HOME/secrets" ]; then
+    set -o allexport
+    source $XDG_CONFIG_HOME/secrets
+    set +o allexport
+fi
--- a/X11/xbindkeysrc
+++ b/X11/xbindkeysrc
--- a/.xournal/config
+++ b/.xournal/config
@ -0,0 +1,171 @@
+# Xournal configuration file.
+# This file is generated automatically upon saving preferences.
+# Use caution when editing this file manually.
+#
+
+[general]
+# the display resolution, in pixels per inch
+display_dpi=96.00
+# the initial zoom level, in percent
+initial_zoom=169.98
+# maximize the window at startup (true/false)
+window_maximize=false
+# start in full screen mode (true/false)
+window_fullscreen=false
+# the window width in pixels (when not maximized)
+window_width=2120
+# the window height in pixels
+window_height=1374
+# scrollbar step increment (in pixels)
+scrollbar_speed=30
+# the step increment in the zoom dialog box
+zoom_dialog_increment=1
+# the multiplicative factor for zoom in/out
+zoom_step_factor=1.500
+# continuous view (false = one page, true = continuous, horiz = horizontal)
+view_continuous=true
+# use XInput extensions (true/false)
+use_xinput=true
+# discard Core Pointer events in XInput mode (true/false)
+discard_corepointer=false
+# ignore events from other devices while drawing (true/false)
+ignore_other_devices=true
+# do not worry if device reports button isn't pressed while drawing (true/false)
+ignore_btn_reported_up=true
+# always map eraser tip to eraser (true/false)
+use_erasertip=true
+# always map touchscreen device to hand tool (true/false) (requires separate pen and touch devices)
+touchscreen_as_hand_tool=true
+# disable touchscreen device when pen is in proximity (true/false) (requires separate pen and touch devices)
+pen_disables_touch=true
+# name of touchscreen device for touchscreen_as_hand_tool
+touchscreen_device_name=NTRG0001:01 1B96:1B05
+# buttons 2 and 3 switch mappings instead of drawing (useful for some tablets) (true/false)
+buttons_switch_mappings=false
+# automatically load filename.pdf.xoj instead of filename.pdf (true/false)
+autoload_pdf_xoj=false
+# enable periodic autosaves (true/false)
+autosave_enabled=true
+# delay for periodic autosaves (in seconds)
+autosave_delay=5
+# default path for open/save (leave blank for current directory)
+default_path=
+# use pressure sensitivity to control pen stroke width (true/false)
+pressure_sensitivity=true
+# minimum width multiplier
+width_minimum_multiplier=0.00
+# maximum width multiplier
+width_maximum_multiplier=1.25
+# interface components from top to bottom
+# valid values: drawarea menu main_toolbar pen_toolbar statusbar
+interface_order=menu main_toolbar pen_toolbar drawarea statusbar
+# interface components in fullscreen mode, from top to bottom
+interface_fullscreen=main_toolbar pen_toolbar drawarea
+# interface has left-handed scrollbar (true/false)
+interface_lefthanded=false
+# hide some unwanted menu or toolbar items (true/false)
+shorten_menus=false
+# interface items to hide (customize at your own risk!)
+# see source file xo-interface.c for a list of item names
+shorten_menu_items=optionsProgressiveBG optionsLeftHanded optionsButtonSwitchMapping
+# highlighter opacity (0 to 1, default 0.5)
+# warning: opacity level is not saved in xoj files!
+highlighter_opacity=0.50
+# auto-save preferences on exit (true/false)
+autosave_prefs=true
+# force PDF rendering through cairo (slower but nicer) (true/false)
+poppler_force_cairo=false
+# prefer xournal's own PDF code for exporting PDFs (true/false)
+exportpdf_prefer_legacy=false
+# export successive layers on separate pages in PDFs (true/false)
+exportpdf_layers=false
+# when attempting to open a non-existent file, treat it as a new file (true/false)
+autocreate_new_xoj=false
+
+[paper]
+# the default page width, in points (1/72 in)
+width=595.27
+# the default page height, in points (1/72 in)
+height=841.89
+# the default paper color
+color=white
+# the default paper style (plain, lined, ruled, or graph)
+style=lined
+# apply paper style changes to all pages (true/false)
+apply_all=false
+# preferred unit (cm, in, px, pt)
+default_unit=cm
+# include paper ruling when printing or exporting to PDF (true/false)
+print_ruling=true
+# when creating a new page, duplicate a PDF or image background instead of using default paper (true/false)
+new_page_duplicates_bg=true
+# just-in-time update of page backgrounds (true/false)
+progressive_bg=true
+# bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)
+gs_bitmap_dpi=144
+# bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)
+pdftoppm_printing_dpi=150
+
+[tools]
+# selected tool at startup (pen, eraser, highlighter, selectregion, selectrect, vertspace, hand, image)
+startup_tool=pen
+# Use the pencil from cursor theme instead of a color dot (true/false)
+pen_cursor=false
+# default pen color
+pen_color=black
+# default pen thickness (fine = 1, medium = 2, thick = 3)
+pen_thickness=2
+# default pen is in ruler mode (true/false)
+pen_ruler=false
+# default pen is in shape recognizer mode (true/false)
+pen_recognizer=false
+# default eraser thickness (fine = 1, medium = 2, thick = 3)
+eraser_thickness=2
+# default eraser mode (standard = 0, whiteout = 1, strokes = 2)
+eraser_mode=2
+# default highlighter color
+highlighter_color=yellow
+# default highlighter thickness (fine = 1, medium = 2, thick = 3)
+highlighter_thickness=2
+# default highlighter is in ruler mode (true/false)
+highlighter_ruler=false
+# default highlighter is in shape recognizer mode (true/false)
+highlighter_recognizer=false
+# button 2 tool (pen, eraser, highlighter, text, selectregion, selectrect, vertspace, hand, image)
+btn2_tool=eraser
+# button 2 brush linked to primary brush (true/false) (overrides all other settings)
+btn2_linked=true
+# button 2 brush color (for pen or highlighter only)
+btn2_color=white
+# button 2 brush thickness (pen, eraser, or highlighter only)
+btn2_thickness=2
+# button 2 ruler mode (true/false) (for pen or highlighter only)
+btn2_ruler=false
+# button 2 shape recognizer mode (true/false) (pen or highlighter only)
+btn2_recognizer=false
+# button 2 eraser mode (eraser only)
+btn2_erasermode=2
+# button 3 tool (pen, eraser, highlighter, text, selectregion, selectrect, vertspace, hand, image)
+btn3_tool=selectregion
+# button 3 brush linked to primary brush (true/false) (overrides all other settings)
+btn3_linked=true
+# button 3 brush color (for pen or highlighter only)
+btn3_color=white
+# button 3 brush thickness (pen, eraser, or highlighter only)
+btn3_thickness=0
+# button 3 ruler mode (true/false) (for pen or highlighter only)
+btn3_ruler=false
+# button 3 shape recognizer mode (true/false) (pen or highlighter only)
+btn3_recognizer=false
+# button 3 eraser mode (eraser only)
+btn3_erasermode=2
+# thickness of the various pens (in points, 1 pt = 1/72 in)
+pen_thicknesses=0.42;0.85;1.41;2.26;5.67
+# thickness of the various erasers (in points, 1 pt = 1/72 in)
+eraser_thicknesses=2.83;8.50;19.84
+# thickness of the various highlighters (in points, 1 pt = 1/72 in)
+highlighter_thicknesses=2.83;8.50;19.84
+# name of the default font
+default_font=Sans
+# default font size
+default_font_size=12.0
--- a/Element/.gitignore
+++ b/Element/.gitignore
@ -1,3 +0,0 @@
-*
-!.gitignore
-!config.json
--- a/Element/config.json
+++ b/Element/config.json
@ -1,88 +0,0 @@
-{
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://chat.nerdhouse.io/",
-            "server_name": "chat.nerdhouse.io"
-        },
-        "m.identity_server": {
-            "base_url": "https://chat.nerdhouse.io/"
-        }
-    },
-    "disable_custom_urls": false,
-    "disable_guests": false,
-    "disable_login_language_selector": false,
-    "disable_3pid_login": false,
-    "brand": "NerdChat",
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ],
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "defaultCountryCode": "GB",
-    "showLabsSettings": true,
-    "features": {
-        "feature_font_scaling": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_irc_ui": "labs"
-    },
-    "default_federate": true,
-    "default_theme": "dark",
-    "roomDirectory": {
-        "servers": [
-            "matrix.org"
-        ]
-    },
-    "welcomeUserId": "@riot-bot:matrix.org",
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "whitelistedHSUrls": ["https://matrix.org"],
-        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
-        "siteId": 1
-    },
-    "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-    },
-    "settingDefaults": {
-        "breadcrumbs": true,
-        "custom_themes": [
-            {
-                "name": "Arc Dark",
-                "is_dark": true,
-                "fonts": {
-                    "general": "sans",
-                    "monospace": "monospace"
-                },
-                "colors": {
-                    "accent-color": "#5294e2",
-                    "primary-color": "#d3dae3",
-                    "warning-color": "#bf616a",
-
-                    "sidebar-color": "#313742",
-                    "roomlist-background-color": "#383c4a",
-                    "roomlist-text-color": "#afb8c5",
-                    "roomlist-text-secondary-color": "#7c818c",
-                    "roomlist-highlights-color": "#404552",
-                    "roomlist-separator-color": "#2F343F",
-
-                    "timeline-background-color": "#404552",
-                    "timeline-text-color": "#afb8c5",
-                    "timeline-text-secondary-color": "#7c818c",
-                    "timeline-highlights-color": "#404552",
-                    "reaction-row-button-selected-bg-color": "#bf616a"
-                }
-            }
-        ]
-    },
-    "jitsi": {
-        "preferredDomain": "jitsi.riot.im"
-    }
-}
--- a/README.md
+++ b/README.md
@ -4,8 +4,7 @@
 To get started, clone this repo and link the relevant files/directories

 ```shell
-git clone https://github.com/frebib/dotfiles.git ~/.config
-ln -sfv .config/zsh/.zshenv ~
-# if it is not already "enabled", make sure the systemd-environment.d generator is active
-sudo ln -sfv /lib/systemd/user-environment-generators/30-systemd-environment-d-generator /lib/systemd/user-generators/
+git clone https://github.com/frebib/dotfiles.git ~/.config/dotfiles
+ln -sfv .config/dotfiles/.config/* .config/
+ln -sfv .config/dotfiles/.profile .zprofile
 ```
--- a/X11/xprofile
+++ b/X11/xprofile
@ -1,26 +0,0 @@
-#!/bin/sh -u
-
-# Graphical-specific environment variables
-export TERMINAL="alacritty"
-export BROWSER="firefox"
-
-export GTK_THEME="$(grep gtk-theme-name "${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini" | sed 's/.*\s*=\s*//')"
-export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
-export QT_QPA_PLATFORMTHEME=qt5ct
-export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
-
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
-
-# 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
-
-
-# Load Xorg resources and set the DPI
-xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
-"$XDG_CONFIG_HOME/scripts/dpi" "$(xrdb -query | grep -i xft.dpi | cut -d: -f2 | xargs)"
-
-setxkbmap -option caps:none
-xset r rate 200 18
-
-test -f "$XDG_CONFIG_HOME"/X11/xmodmap && \
-    xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap
--- a/X11/xresources
+++ b/X11/xresources
@ -1,40 +0,0 @@
-! Colour order:
-!   black
-!   red
-!   green
-!   yellow
-!   blue
-!   magenta
-!   cyan
-!   white/gray
-
-! Normal colours
-*.color0:       #333638
-*.color1:       #f41f1c
-*.color2:       #8bc34a
-*.color3:       #ffc107
-*.color4:       #0266f4
-*.color5:       #cc17cc
-*.color6:       #10aeba
-*.color7:       #8b9396
-
-! Bright colours
-*.color8:       #475760
-*.color9:       #e53727
-*.color10:      #9ccc65
-*.color11:      #ffa000
-*.color12:      #81b3f9
-*.color13:      #a56ecc
-*.color14:      #5ddae2
-*.color15:      #eceff1
-
-
-Xft.dpi:        96
-Xft.antialias:  true
-Xft.rgba:       rgb
-Xft.hinting:    true
-Xft.hintstyle:  hintfull
-Xft.lcdfilter:  lcddefault
-
-Xcursor.size: 16
-Xcursor.theme: Breeze_Obsidian
--- a/229
+++ b/229
@ -1,41 +1,52 @@
-case "$(basename "$(readlink -f /proc/$$/exe)")" in
-    zsh)  thisfile="$(readlink -f "${(%):-%N}")";;
-    bash) thisfile="$(readlink -f "${BASH_SOURCE[0]}")";;
-    *)   thisfile="$(find /proc/$$/fd/ -print0 | xargs -0 -n1 -r readlink -f | grep aliases | head -n1)";;
-esac
-
 # Global aliases for ZSH
 if alias -g 2>/dev/null; then
    alias -g ...=../..
    alias -g ....=../../..
    alias -g .....=../../../..
    alias -g ......=../../../../..
+    alias -g H='| head'
+    alias -g T='| tail'
+    alias -g G='| grep'
+    alias -g L="| less"
+    alias -g C="| wc -l"
+    alias -g S="| sort"
+    alias -g U="| uniq"
+    alias -g count="| wc -l"
    alias -g NO="1> /dev/null"
    alias -g NE="2> /dev/null"
    alias -g NUL="&> /dev/null"
    alias -g BG="&;disown"
+    alias -g COL="| column -t"
+    alias -g CLIP="| xclip -i -selection primary -f | xclip -i -selection clipboard"
 fi

 # File default aliases
 if alias -s 2>/dev/null; then
    alias -s pdf="open"
+    alias -s zip="unzip -l"
+    alias -s rar="unrar l"
+    alias -s tar="tar tf"
+    alias -s gz="tar tf"
    alias -s jar="java -jar"
    alias -s git="git clone --recursive"
 fi

+alias ..la="cd ..;la"
+alias ..ll="cd..;ll"
+alias ..l="..ll"
+
 alias l=ll
 alias ls='ls --color=auto'
-alias ll='ls -lFh  --group-directories-first'
-alias la='ls -lAFh --group-directories-first'
-alias lt='ls -lFh  --sort=time'
-alias lat='ls -lAFh --sort=time'
+alias ll="ls -lFh  --group-directories-first"
+alias la="ls -lAFh --group-directories-first"
+alias lt='ls -lAFh --sort=time'
 alias lsz='ls -lAFh --sort=size'
 alias al=la # No, I don't need the Mono Assembly Linker

-alias md='mkdir -p'
-alias rd='rmdir -p'
+alias md="mkdir -p"
+alias rd="rmdir -p"
 alias -- -='cd -'
-cdt() { cd "$(mktemp -d -t "${1:-tmp}.XXXXXXXX")"; }
+alias cdt='cd `mktemp -d`'

 alias svi=sudoedit
 alias svim=sudoedit
@ -46,26 +57,26 @@ alias sudo='sudo '
 alias open=xdg-open

 # Command rewrites
-alias rm='rm -iv'
+alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -ir'
-alias scp='scp -r'
 alias dd='dd status=progress'
-alias wget='wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file'
+alias ssh="ssh -tt"
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file"
 alias vi=vim
 alias grip='grip --user=frebib --pass=$GRIP_API_KEY'
 alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
 alias acmesh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log'
-alias alpine-sdk="docker run -ti --rm \
+alias alpine-sdk='docker run -ti --rm \
    -e USER \
-    -e UID=\"\$(id -u)\" \
+    -e UID="$(id -u)" \
    -e PWD \
    -e HOME \
-    -w \$PWD \
-    -v \$PWD:\$PWD \
-    -v ~/.abuild:\$HOME/.abuild \
+    -w $PWD \
+    -v $PWD:$PWD \
+    -v ~/.abuild:$HOME/.abuild \
    -v ~/.abuild/distfiles:/var/cache/distfiles \
-    frebib/alpine-sdk:edge"
+    frebib/alpine-sdk:edge'
 alias abuild='alpine-sdk abuild'
 alias abuild-sign='alpine-sdk abuild-sign'
 alias apk='alpine-sdk apk'
@ -89,9 +100,9 @@ vim --version 2>/dev/null | command grep -q +clientserver && \
    alias vim="vim --servername vim -p"

 # Function aliases
-env() { command env "$@" | stripansi | sort; }
-mcd(){ mkdir -p -- "$@" && cd -- "$@"; }
-randstr() { tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w "$1" | head -n 1; }
+env() { command env $@ | stripansi | sort; }
+mcd(){ mkdir -p -- $@ && cd -- $@; }
+randstr() { tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w $1 | head -n 1; }

 # System aliases
 alias sc="systemctl"
@ -104,94 +115,62 @@ alias kl='killall -s 9'
 alias chx='chmod +x'

 # Git Aliases
-alias git='TZ=UTC git'
 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'
-
-alias gco="git checkout"
-alias gcom="git checkout \"\$(git defbranch)\""
-alias gsw="git switch"
-alias gswm="git switch \"\$(git defbranch)\""
-alias gbr="git branch"
-alias gtg="git tag"
-alias gbl="git blame"
-alias gt="git tag"
-alias gst="git status"
-alias grl="git reflog"
-alias gfp="git format-patch"
 alias gcl="git clone --recursive"
-
+alias gco="git checkout"
+alias gcom="git checkout master"
 alias ga="git add"
 alias gap="git add -p"
 alias gau="git add -u"
 alias gaN="git add -N"
 alias gaa="ga -A"
 alias grm="git rm"
-alias gmv="git mv"
-
-alias gc="git commit -sv"
-alias gcm="git commit -sv -em"
-alias gca="git commit -sv --amend --date=\"\$(date -R)\""
-alias gcn="git commit -sv --no-edit"
+alias gc="git commit"
+alias gcm="gc -m"
+gcmst() { git stash -u -k && git commit -m "$1" && git stash pop; }
+alias gca="git commit --amend --date=\"$(date -R)\""
+alias gcn="git commit --no-edit"
 alias gcan="gca --no-edit"
 alias gcam="gca -m"
+alias gst="git status"

 alias gm="git merge"
 alias gma="git merge --abort"
-alias gmc="git merge --continue"
-
 alias grb="git rebase"
-alias grbi="grb -i"
 alias grba="grb --abort"
 alias grbc="grb --continue"
 alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
-alias grbom="git rebase \"origin/\$(git defbranch origin)\""
-gfrb() { ref="${1:-origin/$(git defbranch origin)}"; remote="${ref%%/*}"; git fetch "$remote" && git rebase "$ref" "${@:2}"; }
-gfrbi() { ref="${1:-origin/$(git defbranch origin)}"; remote="${ref%%/*}"; git fetch "$remote" && git rebase -i "$ref" "${@:2}"; }
-
-alias gam="git am"
-alias gama="git am --abort"
-alias gamc="git am --continue"
-alias gamsk="git am --skip"
-
-alias gcp="git cherry-pick"
-alias gcpa="git cherry-pick --abort"
-alias gcpc="git cherry-pick --continue"
-alias gcpsk="git cherry-pick --skip"
-
-alias grv="git revert"
-alias grva="git revert --abort"
-alias grvc="git revert --continue"
-alias grvsk="git revert --skip"
+alias grbom="git rebase origin/master"

 alias gf="git fetch"
 alias gp="git push"
 alias gpf="gp --force"
 alias gpsu="git push --set-upstream"
 alias gpoH="git push origin HEAD"
-alias gpsuom="git push --set-upstream origin \"\$(git defbranch)\""
+alias gpsuom="git push --set-upstream origin master"
 alias gpall="git remote | xargs -L1 git push"
 alias gl="git pull --rebase"
 alias glp="gl && gp"
-alias gd="git diff --patch-with-stat --no-prefix"
-alias gdni="gd --no-index --no-prefix"
-alias gds="gd --staged --no-prefix"
-alias gsh="git show --format=fuller --patch-with-stat --no-prefix"
-alias glg="git log --color --format=fuller --stat --no-merges --graph"
-alias glgp="git log --color --format=fuller --patch-with-stat --no-merges --graph"
+alias gd="git diff --patch-with-stat"
+alias gdni="gd --no-index"
+alias gds="gd --staged"
+alias gsh="git show --format=fuller --patch-with-stat"
+alias glg="git log --color --format=fuller --stat"
+alias glgp="git log --color --format=fuller --patch-with-stat"
 alias glog="git log --color --oneline --decorate --graph"

 alias grst="git reset"
 alias gundo="git reset --keep @~1"
 alias gclean="git clean"
-alias gclm="git cleanmerged"
-alias gbrl="git for-each-ref --sort=committerdate refs/heads/ --format=\"%(refname:short)\" | fzf -x --ansi --multi --preview-window=right:70% --preview=\"git log --format=fuller --stat --color=always {} | head -n\$((\$(tput lines)*10))\""
-
+alias gbr="git branch"
+alias gtg="git tag"
+alias gbl="git blame"
 alias gr="git remote"
+alias grv="git remote -v"
 alias gra="gr add"
 alias grr="gr rm"
 alias grao="gra origin"
@ -201,14 +180,14 @@ alias gsta='git stash'
 alias gstd='gsta drop'
 alias gstl='gsta list --stat --color'
 alias gstp='gsta pop'
-alias gstv="gsta show --patch-with-stat stash@{0}"
+alias gstv="gsta show -p stash@{0}"

 # Docker aliases
 alias d=docker
 alias dps="docker ps --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
-alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.opencontainers.image.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
+alias dpsa="docker ps -a --format='table {{.ID}}\t{{.Image}}\t{{.Label \"org.label-schema.version\"}}\t{{.Networks}}\t{{.RunningFor}}\t{{.Status}}\t{{.Names}}' | sed '1s/version/VERSION/'"
 alias dnets="docker network ls -q | xargs docker inspect | jq '.[] | select(.Name != \"host\" and .Name != \"none\") | [.] | map(.Name + \"\t\" + (.IPAM.Config | map(.Subnet) | join(\"\t\")))[]' -r | sort -V -k2,3 | column -t"
-daddrs() { docker inspect "${1:-bridge}" | jq '.[0].Containers | map(.Name + "\t" + .IPv4Address + "\t" + .IPv6Address)[]' -r | sort -V -k2,3 | column -t; }
+daddrs() { docker inspect ${1:-bridge} | jq '.[0].Containers | map(.Name + "\t" + .IPv4Address + "\t" + .IPv6Address)[]' -r | sort -V -k2,3 | column -t; }
 alias din='docker inspect'
 alias drm='docker rm'
 alias drmi='docker rmi'
@ -217,32 +196,30 @@ alias dbl='docker build --pull'
 alias dbl.='docker build --pull .'
 alias drun='docker run -ti'
 alias dkl='docker kill'
-alias drmf='docker rm -f'
+dklrm() { docker kill $@ ; docker rm $@; }
 alias dst='docker stop'
 alias drst='docker restart'
 alias dnet='docker network'
 alias dvol='docker volume'
-alias dc='docker compose'
-alias dlg='docker logs --tail=1000 -f'
+alias dlg='docker logs -f'
 alias dalpine='docker run -ti --rm spritsail/alpine /bin/sh'
 alias drm-stopped='docker container prune'
 alias drmi-untag='docker image prune'
 alias dprune='docker system prune -f'
-dsh() { do_dsh 2 exec "$@"; return $?; }
-_dsh() { __docker_complete_running_containers "$@"; }
-drsh() { do_dsh 4 run --rm --entrypoint= "$@"; return $?; }
-_drsh() { __docker_container_subcommand "$@"; }
+dsh() { do_dsh 2 exec $@; return $?; }
+_dsh() { __docker_complete_running_containers $@; }
+drsh() { do_dsh 4 run --rm --entrypoint= $@; return $?; }
+_drsh() { __docker_container_subcommand $@; }
 do_dsh() {
    local minargs=$1
    shift
-    if [ $# -lt "$minargs" ]; then
-        # shellcheck disable=SC2154
+    if [ $# -lt $minargs ]; then
        echo "Usage: ${funcstack[2]} [user@]container [program [args]]" >&2
        return 64
    fi

    local dowhat="$1"
-    local docker_args=("$dowhat" -ti)
+    local docker_args=()
    shift

    while [ "${1:0:1}" = '-' ]; do
@ -254,84 +231,76 @@ do_dsh() {
        shift
    done

-    local user
-    user="$(echo "$1" | cut -d@ -f1 -s)"
-
-    declare -a prog
-    prog=("${@:2:$#}")
+    local user="$(echo "$1" | cut -d'@' -f1 -s)"
+    local prog="${@:2:$#}"
+    local usercmd=""
    if [ -z "$user" ]; then
        host="$1"
    else
-        host="$(cut -d@ -f2 -s <<< "$1")"
-        docker_args+=("--user=$user")
+        host=`echo $1 | cut -d'@' -f2 -s`
+        usercmd="--user=$user"
    fi

-    if [ "$dowhat" = exec ] && [ -z "$(docker ps -q -f name="$host" <&-)" ]; then
+    if [ "$dowhat" = 'exec' -a -z "$(docker ps -q -f name="$host")" <&- ]; then
        echo "No such container $host" >&2
        return 5
    fi
-    if [ "$dowhat" = run ]; then
-        docker image pull "$host"
-    fi

-    if [ ${#prog[@]} = 0 ]; then
-        shell_args=("$dowhat")
+    if [ -z "$prog" ]; then
+        shell_args=()
        if [ "$dowhat" = 'run' ]; then
-            shell_args+=(--rm --entrypoint=)
+            shell_args=(--rm --entrypoint=)
        fi
        for shell in bash sh; do
-            shell_path="$(set -o pipefail; docker "${shell_args[@]}" "$host" which "$shell" <&- | sed 's|[\r\n]||g')"
+            shell_path="$(set -o pipefail; docker $dowhat ${shell_args[@]} "$host" which "$shell" <&- | sed 's|[\r\n]||g')"
            retval=$?
            if [ $retval -eq 0 ]; then
-                prog=("$shell_path")
+                prog="$shell_path"
                break
            elif [ $retval -ge 125 ]; then
                return
            fi
        done
-        if [ ${#prog[@]} = 0 ]; then
+        if [ -z "$prog" ]; then
            echo "Warning: No shell found in path.. trying /bin/sh" >&2
-            prog=(/bin/sh)
+            prog=/bin/sh
        fi
    fi

-    docker "${docker_args[@]}" "$host" "${prog[@]}"
+    docker $dowhat ${docker_args[@]} -ti $usercmd $host $(xargs <<< $prog)
 }

+alias dc='docker-compose'
 alias dm='docker-machine'
-dmc() { eval "$(docker-machine env "$1")"; }
+dmc() { eval $(docker-machine env $1); }

 # ZFS aliases
 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() { _zfs "list $*"; }
+zl() { (set -o pipefail; command zfs list $@ | grep -Ev 'docker/[0-9a-f]{64}' | column -t -R 2,3,4); return $?; }
+_zl() { _zfs "list $@"; }

 # General Aliases
-alias ssha="eval \"\$(ssh-agent)\"; ssh-add"
-# shellcheck disable=SC2139
-alias aliases="\$EDITOR $thisfile ; exec zsh"
-alias vimrc="\$EDITOR \$VIMRC"
-alias zshrc="\$EDITOR \${ZDOTDIR:-\$HOME}/.zshrc ; exec zsh"
-alias gitrc="\$EDITOR \$XDG_CONFIG_HOME/git/config"
-alias xinitrc="\$EDITOR \$XDG_CONFIG_HOME/X11/xinitrc"
-alias xresources="\$EDITOR \$XDG_CONFIG_HOME/X11/xresources ; xrdb merge \$XDG_CONFIG_HOME/X11/xresources"
-alias sshc="\$EDITOR ~/.ssh/config"
-alias dotfiles="cd \$XDG_CONFIG_HOME"
-alias i3c="\$EDITOR \$XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
-alias polybarc="\$EDITOR \$XDG_CONFIG_HOME/polybar/config.ini; systemctl --user reload polybar@i3bar"
+alias ssha='eval `ssh-agent` ; ssh-add'
+alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
+alias vimrc="$EDITOR $VIMRC"
+alias zshrc="$EDITOR ${ZDOTDIR:-$HOME}/.zshrc ; exec zsh"
+alias gitrc="$EDITOR $XDG_CONFIG_HOME/git/config"
+alias xinitrc="$EDITOR $XDG_CONFIG_HOME/X11/xinitrc"
+alias xresources="$EDITOR $XDG_CONFIG_HOME/X11/xresources ; xrdb merge $XDG_CONFIG_HOME/X11/xresources"
+alias sshc="$EDITOR ~/.ssh/config"
+alias dotfiles="cd $DOTFILES"
+alias i3c="$EDITOR $XDG_CONFIG_HOME/i3/config; systemctl --user reload i3"
+alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; systemctl --user restart polybar@i3bar"

+alias sf=screenfetch
+alias nf=neofetch
 alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'"

 # Networking aliases
 alias ipa="ip a"
 alias addrs="ip a | grep inet | grep -ve fe80 -e '127\\.0\\.0\\.1/8' -e '::1/128' | sort -n | sed 's/^\\s*//'"

-# alertmanager
-alias alert='amtool alert'
-alias silence='amtool silence'
-alias expire='amtool silence expire'
-unsilence() { { for inst in "$@"; do amtool silence query instance=$inst | grep -Po '^([0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12})' | tee /dev/stderr | xargs -r amtool silence expire & done; wait; } | cat }
-
 # vim: ft=sh
--- a/environment.d/10-profile.conf
+++ b/environment.d/10-profile.conf
@ -1,14 +0,0 @@
-LC_ALL="en_GB.UTF-8"
-LANG="en_GB.UTF-8"
-LC_NUMERIC="en_GB"
-
-XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
-XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
-
-EDITOR="vim"
-VISUAL="vim"
-
-PATH="${PATH}:/sbin:/usr/sbin:${HOME}/.local/bin:${XDG_CONFIG_HOME}/scripts"
-
-# vim: ft=sh
--- a/environment.d/20-xdg-overrides.conf
+++ b/environment.d/20-xdg-overrides.conf
@ -1,27 +0,0 @@
-# Override paths for non-compliant programs
-# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
-
-ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl"
-CARGO_HOME="$XDG_DATA_HOME/cargo"
-GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
-GEM_HOME="$XDG_DATA_HOME/gem"
-GEM_SPEC_CACHE="$XDG_CACHE_HOME/gem"
-GOPATH="$XDG_DATA_HOME/go"
-ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
-NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
-PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
-RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-TERMINFO="$XDG_DATA_HOME/terminfo"
-TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
-TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
-VIMDIR="$XDG_CONFIG_HOME/vim"
-VIMRC="$VIMDIR/vimrc"
-VIMINIT=":so $VIMRC"
-WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
-XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-
-PATH="${PATH}:${GOPATH}/bin:${GEM_HOME}/bin"
-
-# vim: ft=sh
--- a/fsh/fish.ini
+++ b/fsh/fish.ini
@ -1,82 +0,0 @@
-[base]
-default          = 12
-unknown-token    = red,bold
-commandseparator = cyan
-redirection      = cyan,bold
-here-string-tri  = yellow
-here-string-text = 18
-here-string-var  = cyan,bg:18
-exec-descriptor  = yellow,bold
-comment          = 7
-correct-subtle   = 12
-incorrect-subtle = red
-subtle-separator = green
-subtle-bg        = bg:18
-secondary        =
-recursive-base   =
-
-[command-point]
-reserved-word  = yellow
-subcommand     = yellow
-alias          = blue
-suffix-alias   = green
-global-alias   = blue,bold
-builtin        = blue
-function       = blue
-command        = blue
-precommand     = blue
-hashed-command = green
-single-sq-bracket = green
-double-sq-bracket = green
-double-paren   = yellow
-
-[paths]
-path          = cyan
-pathseparator = cyan
-path-to-dir   = magenta,underline
-globbing      = red
-globbing-ext  = 13
-
-[brackets]
-paired-bracket = bg:blue
-bracket-level-1 = green,bold
-bracket-level-2 = yellow,bold
-bracket-level-3 = cyan,bold
-
-[arguments]
-single-hyphen-option   = 12
-double-hyphen-option   = 12
-back-quoted-argument   = none
-single-quoted-argument = yellow
-double-quoted-argument = yellow
-dollar-quoted-argument = yellow
-
-[in-string]
-; backslash in $'...'
-back-dollar-quoted-argument           = cyan
-; backslash or $... in "..."
-back-or-dollar-double-quoted-argument = cyan
-
-[other]
-variable             = 113
-assign               = green
-assign-array-bracket = green
-history-expansion    = blue,bold
-
-[math]
-mathvar = blue,bold
-mathnum = magenta
-matherr = red
-
-[for-loop]
-forvar = none
-fornum = magenta
-; operator
-foroper = yellow
-; separator
-forsep = yellow,bold
-
-[case]
-case-input       = green
-case-parentheses = yellow
-case-condition   = bg:blue
--- a/gtk-4.0/settings.ini
+++ b/gtk-4.0/settings.ini
@ -1 +0,0 @@
-../gtk-3.0/settings.ini
--- a/ideavim/ideavimrc
+++ b/ideavim/ideavimrc
@ -1,55 +0,0 @@
-noremap d h
-noremap h j
-noremap t k
-noremap n l
-noremap D H
-noremap H J
-noremap T K
-noremap N L
-
-noremap gh gj
-noremap gt gk
-
-" I work with tabs every now and then. No, I don't have a mnemonic, so
-" stfu.
-noremap gj gt
-noremap gJ gT
-
-" Window movement, equally important
-noremap <C-w>d <C-w>h
-noremap <C-w>h <C-w>j
-noremap <C-w>t <C-w>k
-noremap <C-w>n <C-w>l
-
-nnoremap <C-w><C-d> <C-w><C-h>
-nnoremap <C-w><C-h> <C-w><C-j>
-nnoremap <C-w><C-t> <C-w><C-k>
-nnoremap <C-w><C-n> <C-w><C-l>
-
-nnoremap <C-d> <C-w>h
-nnoremap <C-h> <C-w>j
-nnoremap <C-t> <C-w>k
-nnoremap <C-n> <C-w>l
-
-" Account for tag jumping
-nnoremap <C-j> <C-t>
-
-" Remappings for the D key
-noremap k d
-noremap K D
-
-" Remappings for the T key
-noremap j t
-"noremap J T
-
-" Remapping for the L key
-noremap l n
-noremap L N
-
-" General purpose help; the originals remain for convenience
-noremap - 0
-noremap _ $
-
-" Fold-related keybindings
-noremap zh zj
-noremap zt zk
--- a/mimeapps.list
+++ b/mimeapps.list
@ -1,42 +0,0 @@
-[Default Applications]
-
-# eog for images
-image/bmp=org.gnome.eog.desktop
-image/gif=org.gnome.eog.desktop
-image/jpeg=org.gnome.eog.desktop
-image/jpg=org.gnome.eog.desktop
-image/pjpeg=org.gnome.eog.desktop
-image/png=org.gnome.eog.desktop
-image/svg+xml-compressed=org.gnome.eog.desktop
-image/svg+xml=org.gnome.eog.desktop
-image/tiff=org.gnome.eog.desktop
-image/x-bmp=org.gnome.eog.desktop
-image/x-gray=org.gnome.eog.desktop
-image/x-icb=org.gnome.eog.desktop
-image/x-ico=org.gnome.eog.desktop
-image/x-png=org.gnome.eog.desktop
-image/x-portable-anymap=org.gnome.eog.desktop
-image/x-portable-bitmap=org.gnome.eog.desktop
-image/x-portable-graymap=org.gnome.eog.desktop
-image/x-portable-pixmap=org.gnome.eog.desktop
-
-# evince for pdfs
-application/pdf=org.gnome.Evince.desktop
-
-# vim for textual files
-application/x-shellscript=vim.desktop
-text/english=vim.desktop
-text/plain=vim.desktop
-text/x-makefile=vim.desktop
-
-# Firefox for web/html
-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
-x-scheme-handler/magnet=deluge.desktop
-x-scheme-handler/tg=telegramdesktop.desktop
--- a/parcellite/parcelliterc
+++ b/parcellite/parcelliterc
@ -1,41 +0,0 @@
-[rc]
-RCVersion=1
-use_copy=true
-use_primary=true
-synchronize=true
-save_history=true
-history_pos=false
-history_x=1
-history_y=1
-history_limit=25
-data_size=0
-item_size=5
-automatic_paste=true
-auto_key=false
-auto_mouse=true
-key_input=true
-restore_empty=true
-rc_edit=false
-type_search=false
-case_search=false
-ignore_whiteonly=false
-trim_wspace_begend=false
-trim_newline=false
-hyperlinks_only=false
-confirm_clear=true
-current_on_top=true
-single_line=true
-reverse_history=false
-item_length=50
-persistent_history=false
-persistent_separate=false
-persistent_on_top=false
-persistent_delim=\\n
-nonprint_disp=false
-ellipsize=2
-multi_user=false
-icon_name=parcellite
-menu_key=<Ctrl><Alt>P
-history_key=<Ctrl><Alt>H
-phistory_key=<Ctrl><Alt>X
-actions_key=<Ctrl><Alt>A
--- a/python/startup
+++ b/python/startup
@ -1,24 +0,0 @@
-#!/usr/bin/env python
-
-import atexit
-import os
-import readline
-
-xdg_cache_home = os.environ['XDG_CACHE_HOME']
-
-if xdg_cache_home is None or xdg_cache_home == "":
-    xdg_cache_home = os.path.join(os.path.expanduser("~"), ".cache")
-
-python_cache_dir = os.path.join(xdg_cache_home, "python")
-if not os.path.isdir(python_cache_dir):
-    os.mkdir(python_cache_dir)
-
-histfile = os.path.join(python_cache_dir, "history")
-
-try:
-    readline.read_history_file(histfile)
-    readline.set_history_length(10000)
-except FileNotFoundError:
-    pass
-
-atexit.register(readline.write_history_file, histfile)
--- a/qt5ct/qt5ct.conf
+++ b/qt5ct/qt5ct.conf
@ -1,27 +0,0 @@
-[Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/airy.conf
-custom_palette=false
-standard_dialogs=gtk2
-style=gtk2
-
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x12\0M\0o\0n\0o\0s\0p\0\x61\0\x63\0\x65@\"\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\x14\0S\0\x61\0n\0s\0 \0S\0\x65\0r\0i\0\x66@\"\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
-[Interface]
-activate_item_on_single_click=1
-buttonbox_layout=3
-cursor_flash_time=1000
-dialog_buttons_have_icons=1
-double_click_interval=400
-gui_effects=@Invalid()
-keyboard_scheme=2
-menus_have_icons=true
-show_shortcuts_in_context_menus=true
-stylesheets=@Invalid()
-toolbutton_style=4
-underline_shortcut=1
-wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\a\x98\0\0\x6\xfd\0\0\v5\0\0\b8\0\0\a\x98\0\0\x6\xfd\0\0\v5\0\0\b8\0\0\0\x1\0\0\0\0\a\x80\0\0\a\x98\0\0\x6\xfd\0\0\v5\0\0\b8)
--- a/scripts/4screens
+++ b/scripts/4screens
@ -10,3 +10,5 @@ xrandr --output $BOTTOM_LEFT --primary --mode 1920x1080 --pos 0x1080 --rotate no
       --output $TOP_LEFT --mode 1920x1080 --pos 0x0 --rotate inverted \
       --output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \
       --output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal
+
+feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joe Groocock	d7f1c18c8c	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	2020-03-21 23:35:09 +00:00
Joe Groocock	97fa8c3b4f	zsh: less enable mouse support Usually this works most of the time, but in some invocations mouse does not work without this, e.g. systemctl status	2020-03-21 23:33:18 +00:00
Joe Groocock	5a996a8c37	zsh: enable multibyte (unicode) support I don't know why I had this disabled. Probably copy-paste when I had no idea what it meant or did	2020-03-21 23:32:34 +00:00
Joe Groocock	1ed3a27613	picom: use ewmh active-window and render damage	2020-03-21 23:30:12 +00:00
Joe Groocock	d0b6e9d090	picom: disable logging to file	2020-03-21 23:29:40 +00:00
Joe Groocock	9a4696bc7f	picom: update Firefox class to 'firefox'	2020-03-21 23:29:15 +00:00
Joe Groocock	a3a3a8e378	zsh: fix backspacing across newlines in vi-mode	2020-03-21 23:26:07 +00:00
Joe Groocock	5c234d48eb	zsh: add Ctrl+W (emacs delete word) in Vi mode Yes, I see the irony in this one, it's just too convenient to pass up	2020-03-21 23:25:48 +00:00
Joe Groocock	36dc74044c	zsh: add Ctrl+F for fuzzy file search	2020-03-21 23:25:02 +00:00
Joe Groocock	760a81a76b	zsh: `tty -s` prints nothing Remove redirection of stdout/stderr as they're pointless	2020-03-21 23:24:34 +00:00
Joe Groocock	77ef7ef239	polybar: prefer 'systemd-run --no-block' over 'i3-msg exec'	2020-03-21 23:22:27 +00:00
Joe Groocock	c690573191	i3: use light instead of xbacklight	2020-03-21 23:20:38 +00:00
Joe Groocock	505a8d255d	systemd: add & enable xsettingsd service Update `dpi` script to interact with systemd units	2020-03-21 23:20:05 +00:00
				`@ -0,0 +1 @@`
				`/home/frebib/.config/systemd/user/profile.service`
				`@ -0,0 +1 @@`
				`/home/frebib/.config/systemd/user/autocutsel-primary.service`
				`@ -0,0 +1 @@`
				`/home/frebib/.config/systemd/user/xautolock.service`