systemd: remove dependency on system bluetooth service

systemd user units cannot depend on systemd units as the systemd daemons
are independent processes and have no notion of each-others' services.

Signed-off-by: Joe Groocock <me@frebib.net>

.config/X11/xprofile

@@ -1,18 +0,0 @@
-#!/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

.config/imgur-screenshot/settings.conf

@@ -1,20 +0,0 @@
-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"

.config/mailnag/mailnag.cfg

@@ -1,29 +0,0 @@
-[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

.config/systemd/user/autocutsel-primary.service

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

.config/systemd/user/autocutsel.service

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

.config/systemd/user/basic.target.wants/profile.service

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

.config/systemd/user/profile.service

@@ -1,10 +0,0 @@
-[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

.config/systemd/user/xautolock.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=XBindKeys
-
-[Service]
-ExecStart=/usr/bin/xautolock -time 1 -locker 'dm-tool switch-to-greeter' -detectsleep -resetsaver -secure
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=graphical-session.target

.config/systemd/user/xprofile.service

@@ -1,13 +0,0 @@
-[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

.config/zsh/.gitignore

@@ -1,4 +0,0 @@
-/antigen/
-/log/
-/histfile
-/.zcompdump*

.gitignore

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

.profile

@@ -1,56 +0,0 @@
-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

Element/.gitignore

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!config.json

Element/config.json

@@ -0,0 +1,88 @@
+{
+    "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": false,
+    "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"
+    }
+}

README.md

@@ -4,7 +4,8 @@
 To get started, clone this repo and link the relevant files/directories
 
 ```shell
-git clone https://github.com/frebib/dotfiles.git ~/.config/dotfiles
-ln -sfv .config/dotfiles/.config/* .config/
-ln -sfv .config/dotfiles/.profile .zprofile
+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/
 ```

X11/xprofile

@@ -0,0 +1,23 @@
+#!/bin/sh -u
+
+# Graphical-specific environment variables
+export TERMINAL="alacritty"
+export BROWSER="firefox"
+
+export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/settings.ini"
+export QT_QPA_PLATFORMTHEME=qt5ct
+# https://www.reddit.com/r/linux/comments/72mfv8/psa_for_firefox_users_set_moz_use_xinput21_to/
+export MOZ_USE_XINPUT2=1 # enable pixel-accurate scrolling in firefox
+export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open
+
+
+# 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
+
+test -f "$XDG_CONFIG_HOME"/X11/xmodmap && \
+    xmodmap "$XDG_CONFIG_HOME"/X11/xmodmap

X11/xresources

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

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: 0
-  #  lines: 0
+  dimensions:
+    columns: 120
+    lines: 40
 
   # Window position (changes require restart)
   #
@@ -65,6 +65,9 @@ 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
@@ -81,7 +84,7 @@ window:
 scrolling:
   # Maximum number of lines in the scrollback buffer.
   # Specifying '0' will disable scrolling.
-  history: 10000
+  history: 100000
 
   # Number of lines the viewport will move for every line scrolled when
   # scrollback is enabled (history > 0).
@@ -207,7 +210,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: '#eaeaea'
+    text: CellForeground
     background: '#5294e2'
 
   # Normal colors
@@ -286,16 +289,13 @@ colors:
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.85
+background_opacity: 0.80
 
 selection:
   #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t"
 
   # When set to `true`, selected text will be copied to the primary clipboard.
-  save_to_clipboard: false
-
-# Allow terminal applications to change Alacritty's window title.
-dynamic_title: true
+  save_to_clipboard: true
 
 cursor:
   # Cursor style
@@ -602,9 +602,9 @@ key_bindings:
   - { key: Insert,   mods: Shift,         action: PasteSelection   }
   - { key: Key0,     mods: Control,       action: ResetFontSize    }
   - { key: Equals,   mods: Control,       action: ResetFontSize    }
-  - { key: Add,      mods: Control,       action: IncreaseFontSize }
-  - { key: Subtract, mods: Control,       action: DecreaseFontSize }
-  - { key: Minus,    mods: Control,       action: DecreaseFontSize }
+  - { key: Add,      mods: Control|Shift, action: IncreaseFontSize }
+  - { key: Subtract, mods: Control|Shift, action: DecreaseFontSize }
+  - { key: Minus,    mods: Control|Shift, action: DecreaseFontSize }
 
   # (Windows only)
   #- { key: Return,   mods: Alt,           action: ToggleFullscreen }

aliases

@@ -1,3 +1,9 @@
+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 aliases | head -n1)";;
+esac
+
 # Global aliases for ZSH
 if alias -g 2>/dev/null; then
     alias -g ...=../..
@@ -60,6 +66,7 @@ alias open=xdg-open
 alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -ir'
+alias scp='scp -r'
 alias dd='dd status=progress'
 alias ssh="ssh -tt"
 alias wget="wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file"
@@ -116,6 +123,7 @@ alias chx='chmod +x'
 
 # Git Aliases
 alias g=git
+alias ginit='git init'
 alias gignore='$EDITOR .gitignore'
 alias gitc='$EDITOR $XDG_CONFIG_HOME/git/config'
 alias ggignore='$EDITOR $XDG_CONFIG_HOME/git/gitignore'
@@ -128,17 +136,17 @@ alias gau="git add -u"
 alias gaN="git add -N"
 alias gaa="ga -A"
 alias grm="git rm"
-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 gc="git commit -s"
+alias gcm="git commit -s -em"
+alias gca="git commit -s --amend --date=\"$(date -R)\""
+alias gcn="git commit -s --no-edit"
+alias gcan="gca -s --no-edit"
+alias gcam="gca -s -m"
 alias gst="git status"
 
 alias gm="git merge"
 alias gma="git merge --abort"
+
 alias grb="git rebase"
 alias grba="grb --abort"
 alias grbc="grb --continue"
@@ -146,6 +154,8 @@ alias grbsk="grb --skip"
 alias grbsh="grb --show-current"
 alias grbom="git rebase origin/master"
 
+alias gcp="git cherry-pick"
+
 alias gf="git fetch"
 alias gp="git push"
 alias gpf="gp --force"
@@ -170,7 +180,7 @@ alias gbr="git branch"
 alias gtg="git tag"
 alias gbl="git blame"
 alias gr="git remote"
-alias grv="git remote -v"
+alias grv="git revert"
 alias gra="gr add"
 alias grr="gr rm"
 alias grao="gra origin"
@@ -277,30 +287,33 @@ 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 $@"; }
 
 # General Aliases
 alias ssha='eval `ssh-agent` ; ssh-add'
-alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
+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 $DOTFILES"
+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; systemctl --user restart polybar@i3bar"
+alias polybarc="$EDITOR $XDG_CONFIG_HOME/polybar/config; systemctl --user reload 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

dunst/dunstrc

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

environment.d/10-profile.conf

@@ -0,0 +1,34 @@
+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"
+
+# Override paths for non-compliant programs
+# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
+
+ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
+CARGO_HOME="$XDG_DATA_HOME/cargo"
+GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+GOPATH="$XDG_DATA_HOME/go"
+NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile"
+RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+TERMINFO="$XDG_DATA_HOME/terminfo"
+TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
+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}:/sbin:/usr/sbin:${XDG_CONFIG_HOME}/scripts:${GOPATH}/bin"
+
+# vim: ft=sh

fontconfig/fonts.conf

@@ -25,6 +25,12 @@
             <string>FontAwesome 5 Pro Light</string>
         </edit>
     </match>
+    <alias>
+        <family>SF Mono</family>
+        <accept>
+            <family>monospace</family>
+        </accept>
+    </alias>
 
     <match target="font">
         <test qual="all" name="family" compare="eq"><string>Noto Sans</string></test>

git/config

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

gtk-2.0/settings.ini

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

i3/config

@@ -113,42 +113,47 @@ exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lak
 for_window [class="Pinentry"] floating enable
 for_window [class="Pavucontrol"] floating enable
 for_window [class="Blueman-manager"] floating enable
+for_window [class="floating-term" instance="termite"] floating enable
+for_window [class="Alacritty" instance="floating-term"] floating enable
+for_window [class="^jetbrains-.+$" title="win0"] floating enable
 for_window [window_role="floating-term"] floating enable
-for_window [window_role="pop-up"] floating enable
-for_window [window_role="i3blocks-update-term"] floating enable
-for_window [window_role="i3blocks-clock-term"] floating enable
 for_window [title="^rofi$"] floating enable
 
 new_window none
 new_float none
 
-gaps inner 20
+gaps inner 24
 gaps outer 4
 
 focus_follows_mouse yes
+popup_during_fullscreen smart
 
 # keybindings
 bindsym $mod+Shift+j            reload
-bindsym $mod+c                  exec systemd-run --user --scope --slice=chromium.slice --no-block -- chromium
-bindsym $mod+b                  exec systemd-run --user --scope --slice=firefox.slice --no-block -- firefox
-bindsym $mod+v                  exec "i3-sensible-terminal -e \\"$SHELL -c vim;$SHELL\\"
-bindsym $mod+Ctrl+v             exec "i3-sensible-terminal -r floating-term -e \\"$SHELL -c vim;$SHELL\\"
-bindsym $mod+Return             exec i3-sensible-terminal
-bindsym $mod+Ctrl+Return        exec i3-sensible-terminal -r floating-term
-bindsym $mod+Shift+Return       exec i3-sensible-terminal -d "`xcwd`"
-bindsym $mod+Ctrl+Shift+Return  exec i3-sensible-terminal -r floating-term -d "`xcwd`"
+bindsym --release $mod+x        exec xkill
+bindsym $mod+c                  exec notify-send "Try again" "You meant \\\$mod+b"
+bindsym $mod+b                  exec systemd-run-i3 -s app -c firefox
+bindsym $mod+Return             exec systemd-run-i3 -s app -n alacritty
+bindsym $mod+Ctrl+Return        exec systemd-run-i3 -s app -n alacritty --class floating
+bindsym $mod+Shift+Return       exec systemd-run-i3 -s app -n alacritty --working-directory "$(xcwd)"
+bindsym $mod+Ctrl+Shift+Return  exec systemd-run-i3 -s app -n alacritty --class floating --working-directory "$(xcwd)"
+bindsym $mod+v                  exec systemd-run-i3 -s app -n alacritty -e sh -c "($SHELL -c $EDITOR || :) && $SHELL"
+bindsym $mod+Ctrl+v             exec systemd-run-i3 -s app -n alacritty --class floating -e sh -c "($SHELL -c $EDITOR || : ) && $SHELL"
 bindsym $mod+l                  exec dm-tool switch-to-greeter
-bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
+bindsym $mod+space              exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window -run-command 'systemd-run-i3 -s app -n  {cmd}'"
 bindsym $mod+Shift+p            exec rofi-pass --root $(grep path ~/.config/gopass/config.yml | sed -E 's|^.*fs\+file://||g' | tr '\n' ':') | sed 's/:$//g'
-bindsym $mod+Shift+e            exec rofi-emoji
+bindsym $mod+Shift+e            exec "pkill rofi; rofi -show emoji -modi emoji -normal-window"
 bindsym $mod+Shift+i            exec rofi-fontawesome
 bindsym --release Print         exec screenshot
-bindsym --release $mod+Print    exec imgur-screenshot
-bindsym $mod+$alt+space         exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
-bindsym $mod+numbersign         exec "i3-sensible-terminal -e 'sh -c xclip\ -o\ |\ gpg\ --decrypt\ 2>&1\ \;\ $SHELL'"
-bindsym $mod+r                  exec "bash -c 'pwgen -nc 32 1 | tee >(xargs notify-send Generated\ password\:) | xclip -i'"
-bindsym $mod+g                  exec "LINK=$(gist -PRpc); notify-send -c transfer \\"$LINK\\""
-bindsym --release $mod+i        exec sh -c 'sleep 0.5 && xdotool type --delay 400 "$(xclip -o -selection clipboard)"'
+bindsym --release $mod+Print    exec screenshot --clip
+bindsym --release Shift+Print   exec screenshot --active
+bindsym --release $mod+Shift+Print exec screenshot --active --clip
+bindsym $mod+Shift+x            exec systemd-run-i3 -s app -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 && pkill -RTMIN+10 i3blocks
+bindsym $mod+numbersign         exec systemd-run-i3 -s app -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 -s app -n notify-send -c transfer "$(gist -PRpc)"
+bindsym --release $mod+i        exec systemd-run-i3 -s background -n sh -c 'sleep 0.5 && xdotool getactivewindow type --delay 250 "$(xclip -o -selection clipboard)"'
 
 # Media player controls
 bindsym XF86AudioPlay           exec --no-startup-id playerctl -a play-pause
@@ -159,7 +164,7 @@ bindsym XF86AudioPrev           exec --no-startup-id playerctl -a previous
 bindsym XF86AudioRaiseVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  +1000
 bindsym XF86AudioLowerVolume    exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@  -1000
 bindsym XF86AudioMute           exec --no-startup-id pactl set-sink-mute   @DEFAULT_SINK@ toggle
-bindsym XF86MonBrightnessUp     exec xbacklight -inc 5 && pkill -RTMIN+12 i3blocks
-bindsym XF86MonBrightnessDown   exec xbacklight -dec 5 && pkill -RTMIN+12 i3blocks
+bindsym XF86MonBrightnessUp     exec light -A 5 && pkill -RTMIN+12 i3blocks
+bindsym XF86MonBrightnessDown   exec light -U 5 && pkill -RTMIN+12 i3blocks
 
 # vim:ft=i3

i3/powermenu.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
- 
-option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 10 -lines 7 -location 3 -tokenize false -matching normal | xargs)
+
+option="$(echo "  lock|  logout|  sleep|  hibernate|  power off|  reboot|  windows" | \
+    rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 10 -lines 7 -location 3 -tokenize false -matching normal | cut -d' ' -f2- | xargs)"
 
 case $option in
     lock) dm-tool switch-to-greeter;;
-    logout) i3-msg exit;;
+    logout) systemctl --user exit;;
     sleep) systemctl suspend;;
     hibernate) systemctl hibernate;;
     power\ off) systemctl poweroff;;
@@ -12,7 +13,5 @@ case $option in
     windows)
         windows=`efibootmgr | grep -Po -m1 'Boot\K(\d{4}).*Windows.*' | head -c4`
         sudo efibootmgr -n $windows
-        sudo hibereboot;;
+        reboot;;
 esac
-
-exit 0

mimeapps.list

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

parcellite/parcelliterc

@@ -0,0 +1,41 @@
+[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

picom.conf

@@ -1,6 +1,6 @@
 # Logging
-log-level = "debug";
-log-file = "/home/frebib/.local/share/picom.log";
+log-level = "info";
+#log-file = "/home/frebib/.local/share/picom.log";
 
 # Shadow
 shadow = true;
@@ -16,7 +16,9 @@ shadow-exclude = [
 	"class_g = 'Conky'",
 	"class_g ?= 'Notify-osd'",
 	"class_g = 'Cairo-clock'",
+	"class_g = 'firefox' && argb",
 	"name = 'Notification'",
+	"name = 'cpt_frame_window'",
 	"_GTK_FRAME_EXTENTS@:c"
 ];
 # shadow-exclude = "n:e:Notification";
@@ -47,6 +49,7 @@ blur-background-exclude = [
 	"class_g = 'Onboard'",
 	"class_g = 'slop'",
 	"class_g = 'Polybar'",
+	"class_g = 'firefox' && argb",
 	"window_type = 'dock'",
 	"window_type = 'desktop'",
 	"_GTK_FRAME_EXTENTS@:c"
@@ -55,8 +58,8 @@ blur-background-exclude = [
 # Fading
 fading = true;
 fade-delta = 10;
-fade-in-step = 0.03;
-fade-out-step = 0.03;
+fade-in-step = 0.04
+fade-out-step = 0.06;
 no-fading-openclose = false;
 no-fading-destroyed-argb = false;
 # fade-exclude = [ ];
@@ -65,7 +68,7 @@ no-fading-destroyed-argb = false;
 backend = "glx";
 mark-wmwin-focused = true;
 mark-ovredir-focused = true;
-use-ewmh-active-win = false;
+use-ewmh-active-win = true;
 detect-rounded-corners = true;
 detect-client-opacity = true;
 refresh-rate = 0;
@@ -76,7 +79,8 @@ vsync = true;
 # unredir-if-possible-exclude = [ ];
 focus-exclude = [
 	"i:ai:chromium",
-	"class_g = 'Firefox'",
+	"class_g = 'firefox'",
+	"class_g = 'zoom'"
 ];
 detect-transient = true;
 detect-client-leader = true;
@@ -87,7 +91,7 @@ invert-color-include = [ ];
 glx-no-stencil = true;
 glx-no-rebind-pixmap = true;
 xrender-sync-fence = true;
-#use-damage = true;
+use-damage = true;
 
 # Window type settings
 wintypes:

polybar/config

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

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.100, Curwin=0
+Id:i, Mode_altscr=0, Mode_irixps=0, Delay_time=0.500, 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

qt5ct/qt5ct.conf

@@ -0,0 +1,27 @@
+[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)

scripts/dpi

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

scripts/gtav

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

scripts/netsplit

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

scripts/rofi-emoji

@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-#
-#   Use rofi to pick emoji because that's what this
-#   century is about apparently...
-#
-#   Requirements:
-#     rofi, xclip, xdotool, curl, xmllint
-#
-#   Usage:
-#     1. Download all emoji
-#        $ rofi-emoji --download
-#
-#     2. Run it!
-#        $ rofi-emoji
-#
-#   Notes:
-#     * You'll need a emoji font like "Noto Emoji" or "EmojiOne".
-#     * Confirming an item will automatically paste it WITHOUT
-#       writing it to your clipboard.
-#     * Ctrl+C will copy it to your clipboard WITHOUT pasting it.
-#
-
-# Where to save the emojis file.
-EMOJI_FILE="${XDG_CACHE_DIR:-$HOME/.cache}/emojis.txt"
-
-# Urls of emoji to download.
-URLS=(
-    'https://emojipedia.org/people/'
-    'https://emojipedia.org/nature/'
-    'https://emojipedia.org/food-drink/'
-    'https://emojipedia.org/activity/'
-    'https://emojipedia.org/travel-places/'
-    'https://emojipedia.org/objects/'
-    'https://emojipedia.org/symbols/'
-    'https://emojipedia.org/flags/'
-    'https://emojipedia.org/modifiers/'
-)
-
-
-function download() {
-    notify "$(basename "$0")" 'Downloading all emoji for your pleasure'
-
-    echo -n > "$EMOJI_FILE"
-
-    for url in "${URLS[@]}"; do
-        echo "Downloading: $url"
-
-        # Download the list of emoji and remove all the junk around it
-        emojis=$(curl -s "$url" | \
-                 xmllint --html \
-                         --xpath '//ul[@class="emoji-list"]' - 2>/dev/null)
-
-        # Get rid of starting/closing ul tags
-        emojis=$(echo "$emojis" | head -n -1 | tail -n +1)
-
-        # Extract the emoji and its description
-        emojis=$(echo "$emojis" | \
-                 sed -rn 's/.*<span class="emoji">(.*)<\/span> (.*)<\/a><\/li>/\1 \2/p')
-
-        echo "$emojis" >> "$EMOJI_FILE"
-    done
-
-    notify "$(basename "$0")" "We're all set!"
-}
-
-function toclip() {
-    xclip -i -selection primary
-    xclip -o -selection primary | xclip -i -selection clipboard
-}
-
-function repeat() {
-    local rplc str="$1" count="$2"
-    rplc="$(printf "%${count}s")"
-    echo "${rplc// /"$str"}"
-}
-
-function notify() {
-   if which notify-send 1>/dev/null 2>/dev/null; then
-        notify-send "$1" "$2"
-    fi
-}
-
-function display() {
-    emoji=$(cat "$EMOJI_FILE" | grep -v '#' | grep -v '^[[:space:]]*$')
-    update="⏫ Update emoji cache"
-    emoji=$(printf "$emoji\n$update")
-    line=$(echo "$emoji" | rofi -dmenu -i -p emoji -normal-window -kb-custom-1 Ctrl+c -kb-row-tab '' -kb-row-select Tab $@)
-    exit_code=$?
-
-    if [ "${line[@]}" == "$update" ]; then
-        download
-        display
-        return
-    fi
-
-    line=($line)
-    last=${line[${#line[@]}-1]}
-
-    quantifier="${last:${#last}-1:1}"
-    echo "$quantifier" | egrep -q '^[0-9]+$' || quantifier=1
-    emojis="$(repeat "${line[0]}" "$quantifier")"
-
-    if [ $exit_code == 0 ]; then
-        xdotool type --clearmodifiers "$emojis"
-        echo -n "$emojis" | xclip -i
-    elif [ $exit_code == 10 ]; then
-        echo -n "$emojis" | xclip -i
-    fi
-}
-
-
-if [[ "$1" =~ -D|--download ]]; then
-    download
-    exit 0
-elif [[ "$1" =~ -h|--help ]]; then
-    echo "usage: $0 [-D|--download]"
-    exit 0
-fi
-
-display

scripts/rofi-fontawesome

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

scripts/screenshot

@@ -1,19 +1,41 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 NOTIFY_APPNAME="$(basename "$0")"
 NOTIFY_ICONPATH="/usr/share/icons/Xenlism-Wildfire/Apps/screenshot.svg"
 
-SCROT_CMD="maim -m 10 -us %"
 FILENAME="$(date '+%s%N' | sha256sum | head -c7).png"
 DIRECTORY="$HOME/pictures/screenshots"
 
 SCP_HOST=frebib@Poseidon.nerdhouse.io
-SCP_PATH=/dave/www/frebib.net/s
+SCP_PATH=/services/www/files/frebib.net/s
 URL_PATH=https://frebib.net/s
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+params=$(getopt -o ac -l active,clip -n screenshot -- "$@")
+eval set -- "$params"
+unset params
+
+while true; do
+    case "$1" in
+        '-a'|'--active')
+            active=1
+            shift
+            continue;;
+        '-c'|'--clip')
+            clip=1
+            shift
+            continue;;
+		'--')
+			shift
+			break;;
+		*)
+			echo 'getopt error' >&2
+			exit 1;;
+	esac
+done
+
 send_notification() {
     title="$1"
     body="$2"
@@ -29,18 +51,47 @@ send_notification() {
 
 # Make the screenshot directory
 mkdir -p "$DIRECTORY"
+out_path="$DIRECTORY/$FILENAME"
+
+if [ "$active" = '1' ]; then
+    args+=(-i "$(xdotool getactivewindow)")
+else
+    # Take screenshot geometry
+    read -r winid geom < <(slop -f "%i %g") || :
+    if [ -z "$geom" -o -z "$winid" ]; then
+        send_notification "Screenshot error" "Failed to capture screenshot area" > /dev/null
+        exit 1
+    fi
+    args=(-g "$geom")
+
+    # If selection is the root window
+    if xwininfo -id "$winid" | grep -qw root; then
+        isroot=1
+        args+=(-i "$winid")
+    fi
+fi
 
 # Take the screenshot and save it
-out_path="$DIRECTORY/$FILENAME"
-if ! error=$(eval ${SCROT_CMD//\%/$out_path} 2>&1); then
+if ! error=$(maim -m 10 -u -f png ${args[@]} "$out_path" 2>&1); then
     send_notification "Screenshot error" "Failed to take a screenshot:<br><br>$error" >/dev/null
     exit 1
 fi
 
-notif_id=$(send_notification "Screenshot uploading" "$FILENAME<br><br>The image is available in the clipboard immediately" || true)
+# If the screenshot is a complete window, add a shadow
+if [ "$isroot" != "1" ]; then
+    # but don't worry if it fails
+    convert "$out_path" \( +clone -background black -alpha set -channel Alpha -evaluate set 60% -shadow 100x16+0+0 \) +swap -background none -layers merge +repage "$out_path" || :
+fi
 
-# Add image to clipboard
-xclip -i "$out_path" -selection clipboard -t image/png
+if [ "$clip" = '1' ]; then
+    # Add image to clipboard
+    xclip -i "$out_path" -selection clipboard -t image/png
+    send_notification "Screenshot captured" "$FILENAME<br><br>The image is available in the clipboard" >/dev/null
+
+    exit 0
+fi
+
+notif_id=$(send_notification "Screenshot uploading" "$FILENAME" || true)
 
 # 'Upload' the screenshot
 if ! error=$(scp -C $out_path $SCP_HOST:$SCP_PATH 2>&1); then

scripts/systemd-run-i3

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

systemd/user/blueman-applet.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Bluetooth Applet
-After=graphical-session.target bluetooth.service
-Requires=graphical-session.target bluetooth.service
+After=graphical-session.target
+Requires=graphical-session.target
 
 [Service]
 Type=simple

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

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

systemd/user/desktop.target.wants/wallpaper.service

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

systemd/user/graphical-session.target.wants/parcellite.service

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

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

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

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

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

systemd/user/i3.service

@@ -2,12 +2,11 @@
 Description=i3 - an improved dynamic, tiling window manager
 Requires=xorg.target
 Before=graphical-session.target
-After=profile.service xprofile.service xorg.target
+After=xprofile.service xorg.target
 
 [Service]
 ExecStart=/usr/bin/i3
-ExecReload=/bin/sh -c 'i3-msg restart; systemctl is-active --user -q picom && systemctl --user restart picom'
-ExecStop=/bin/systemctl --user stop desktop.target
+ExecReload=/usr/bin/i3-msg reload
 Restart=always
 
 [Install]

systemd/user/networkmanager-applet.service

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

systemd/user/parcellite.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Lightweight GTK+ clipboard manager
+PartOf=graphical-session.target
+Requires=xorg.target
+After=xorg.target
+
+[Service]
+ExecStart=/usr/bin/parcellite -n
+
+[Install]
+WantedBy=graphical-session.target

systemd/user/picom.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=A lightweight compositor for X11
 Requires=graphical-session.target
-After=graphical-session.target xorg.target
+After=dbus.service graphical-session.target xorg.target
 
 [Service]
 Type=simple

systemd/user/polybar@.service

@@ -1,11 +1,12 @@
 [Unit]
 Description=Polybar
 Requires=graphical-session.target
-After=graphical-session.target pulseaudio.socket
+After=graphical-session.target pulseaudio.socket i3.service
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/polybar --reload --log=warning %i
+ExecReload=/usr/bin/polybar-msg cmd restart -p $MAINPID
 Restart=always
 
 [Install]

systemd/user/solaar.service

@@ -5,7 +5,7 @@ After=graphical-session.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/solaar --restart-on-wake-up -d
+ExecStart=/usr/bin/solaar --debug --restart-on-wake-up --window=hide
 KillMode=process
 Restart=on-failure
 

systemd/user/wallpaper.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Apply wallpaper on screen-change event
+Requires=graphical-session.target
+After=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/bin/sh -c "xev -root -event randr 2>&1 | while awk -v RS='\n\n' '{exit;}'; do echo 'Applying wallpaper'; feh --no-fehbg --no-xinerama --bg-fill ~/.config/lakesidesunrise.jpg; done"
+Restart=always
+
+[Install]
+WantedBy=desktop.target

systemd/user/xautolock.service

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

systemd/user/xbindkeys.service

@@ -1,7 +1,5 @@
 [Unit]
 Description=XBindKeys
-Requires=profile.service
-After=profile.service
 
 [Service]
 ExecStart=/usr/bin/xbindkeys -n -f $XDG_CONFIG_HOME/X11/xbindkeysrc

systemd/user/xprofile.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Load Xorg configuration
+PartOf=xorg.target
+After=xorg.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/sh -c '. $XDG_CONFIG_HOME/X11/xprofile; systemctl --user import-environment'
+
+[Install]
+WantedBy=xorg.target

systemd/user/xsettingsd.service

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