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

.config/dunst/dunstrc

@@ -149,8 +149,7 @@
     max_icon_size = 72
 
     # Paths to default icons.
-    icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+    icon_path = /usr/share/icons/Xenlism-Wildfire/Status/:/usr/share/icons/Xenlism-Wildfire/Devices/:/usr/share/icons/Adwaita/scalable/status:/usr/share/icons/Adwaita/scalable/devices
-
     frame_width = 4
     frame_color = "#404552"
 

.config/fontconfig/fonts.conf

@@ -1,56 +1,37 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-
-    <match>
-        <test name="family"><string>Noto Sans</string></test>
-        <edit name="family" mode="assign" binding="strong">
-            <string>NotoSans Nerd Font</string>
-        </edit>
-    </match>
-    <match>
-        <test name="family"><string>Noto Serif</string></test>
-        <edit name="family" mode="assign" binding="strong">
-            <string>NotoSerif Nerd Font</string>
-        </edit>
-    </match>
-    <match>
-        <test name="family"><string>Source Code Pro</string></test>
-        <edit name="family" mode="assign" binding="strong">
-            <string>SauceCodePro Nerd Font</string>
-        </edit>
-    </match>
-
     <match>
         <test qual="any" name="family"><string>sans-serif</string></test>
-        <edit name="family" mode="prepend" binding="same">
+        <edit name="family" mode="prepend" binding="strong">
-            <string>NotoSans Nerd Font</string>
             <string>Noto Sans</string>
             <string>Noto Color Emoji</string>
+            <string>FontAwesome 5 Pro Light</string>
         </edit>
     </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>
         <test qual="any" name="family"><string>serif</string></test>
-        <edit name="family" mode="prepend" binding="same">
+        <edit name="family" mode="prepend" binding="strong">
-            <string>NotoSerif Nerd Font</string>
             <string>Noto Serif</string>
             <string>Noto Color Emoji</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="same">
+        <edit name="family" mode="prepend" binding="strong">
-            <string>SauceCodePro Nerd Font Mono</string>
             <string>Source Code Pro</string>
             <string>Noto Color Emoji</string>
+            <string>FontAwesome 5 Pro Light</string>
         </edit>
     </match>
+
     <match target="font">
-        <test qual="all" name="family" compare="eq"><string>SauceCodePro Nerd Font Mono</string></test>
+        <test qual="all" name="family" compare="eq"><string>Noto Sans</string></test>
+        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
+    </match>
+    <match target="font">
+        <test qual="all" name="family" compare="eq"><string>Source Code Pro</string></test>
         <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>

.config/git/config

@@ -5,7 +5,9 @@
 [core]
 	autocrlf = input
 	excludesfile = $HOME/.config/git/gitignore
-	pager = diff-so-fancy | less
+	pager = /usr/share/git/diff-highlight/diff-highlight | $PAGER
+[interactive]
+	diffFilter = /usr/share/git/diff-highlight/diff-highlight
 [commit]
 	gpgsign = true
 [push]
@@ -35,8 +37,6 @@
 	suppresscc = self
 [diff]
 	algorithm = patience
-[interactive]
-	diffFilter = diff-so-fancy --patch-mode
 [color]
 	ui = true
 [color "diff"]
@@ -51,7 +51,5 @@
 	oldHighlight = red 88
 	newNormal = green
 	newHighlight = green 22
-[diff-so-fancy]
-	changeHunkIndicators = false
 
 # vim: noet

.config/gopass/config.yml

@@ -8,7 +8,7 @@ root:
   concurrency: 1
   editrecipients: false
   nocolor: false
-  noconfirm: false
+  noconfirm: true
   nopager: false
   notifications: false
   path: gpgcli-gitcli-fs+file:///home/frebib/.local/share/pass
@@ -26,11 +26,10 @@ mounts:
     concurrency: 1
     editrecipients: false
     nocolor: false
-    noconfirm: false
+    noconfirm: true
     nopager: false
     notifications: false
     path: gpgcli-gitcli-fs+file:///home/frebib/.local/share/pass-spritsail
     recipient_hash: {}
     safecontent: false
     usesymbols: false
-version: 1.8.0

.config/gtk-3.0/gtk.css

@@ -1,5 +1,5 @@
 VteTerminal,
 TerminalScreen,
 vte-terminal {
-    padding: 6px;
+    padding: 9px;
 }

.config/i3/blocks/config

@@ -31,47 +31,30 @@ markup=none
 align=center
 color=#F3F4F5
 separator=false
-separator_block_width=12
+separator_block_width=14
-
-#[window title]
-#command=xtitle -s #| sed 's/^$/ /g'"
-#color=#A6D1FA
-#align=center
-#min_width=700
-#interval=persist
 
 [volume]
 interval=persist
 signal=10
 
-[separator]
-
 [iface]
-label=
+label=
 interval=60
 signal=15
 
-[separator]
-
 [updates]
-label=
+label=
 interval=600
 signal=5
 
-[separator]
-
 [cpu_usage]
-label=
+label=
 interval=persist
 
-[separator]
-
 [memory]
-label=
+label=
 interval=10
 
-[separator]
-
 [temperature]
 label=
 interval=10

.config/i3/blocks/memory

@@ -16,7 +16,7 @@
 
 TYPE="${BLOCK_INSTANCE:-mem}"
 
-if [ $BLOCK_BUTTON -gt 0 ]; then
+if [ ${BLOCK_BUTTON--1} -gt 0 ]; then
     i3-sensible-terminal -r floating-term --geometry 100x54 -e 'top -d 0.1'
 fi
 

.config/i3/blocks/volume

@@ -9,7 +9,7 @@ AUDIO_MED_SYMBOL=' '
 AUDIO_LOW_THRESH=0
 AUDIO_LOW_SYMBOL=' '
 
-AUDIO_MUTED_SYMBOL='X'
+AUDIO_MUTED_SYMBOL=''
 
 AUDIO_INTERVAL=5
 

.config/i3/config

@@ -6,7 +6,7 @@ set $mod Mod4
 set $alt Mod1
 floating_modifier $mod
 
-font pango:Noto Sans 9
+font pango:sans 9
 
 # kill focused window
 bindsym $mod+apostrophe kill
@@ -151,6 +151,7 @@ bindsym $mod+l       exec ~/.config/i3/lock.sh
 bindsym $mod+space   exec "pkill rofi; rofi -show run -sidebar-mode -terminal i3-sensible-terminal -normal-window"
 bindsym $mod+Shift+p exec rofi-pass
 bindsym $mod+Shift+e exec rofi-emoji
+bindsym $mod+Shift+i exec rofi-fontawesome
 bindsym --release Print        exec imgur-screenshot
 bindsym --release $mod+Print   exec imgur-screenshot -f
 bindsym $mod+$alt+space exec --no-startup-id ~/.config/i3/cycleaudio.py && pkill -RTMIN+10 i3blocks
@@ -189,6 +190,7 @@ exec --no-startup-id onboard
 exec --no-startup-id touchegg
 exec --no-startup-id compton -b --config ~/.config/compton.conf
 exec --no-startup-id chromium --no-startup-window
+exec --no-startup-id thunderbird
 
 exec i3-msg 'workspace 1; exec chromium'
 

.config/i3/powermenu.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
  
-option=$(echo "        lock|      logout|       sleep|   hibernate|   power off|      reboot|    windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 8 -lines 6 -location 3 -tokenize false -matching normal | xargs)
+option=$(echo "lock|logout|sleep|hibernate|power off|reboot|windows" | rofi -sep "|" -dmenu -i -p "" -auto-select -hide-scrollbar -monitor 0 -width 8 -lines 7 -location 3 -tokenize false -matching normal | xargs)
 
 case $option in
     lock) ./lock.sh;;

.config/latexmk/latexmkrc

@@ -0,0 +1,16 @@
+$clean_ext = "bbl run.xml eps-converted-to.pdf";
+$pdf_mode = 1;
+$pdf_previewer = 'evince';
+$latex = 'xetex -shell-escape';
+$pdflatex = 'xelatex -shell-escape';
+
+add_cus_dep('glo', 'gls', 0, 'run_makeglossaries');
+add_cus_dep('acn', 'acr', 0, 'run_makeglossaries');
+sub run_makeglossaries {
+  if ( $silent ) {
+    system "makeglossaries -q '$_[0]'";
+  }
+  else {
+    system "makeglossaries '$_[0]'";
+  };
+}

.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";
 }
 

.config/termite/config

@@ -1,5 +1,5 @@
 [options]
-font = Source Code Pro 9.8
+font = monospace 9.8
 scrollback_lines = 1000000
 cursor_blink = off
 size_hints = true

.config/user-dirs.dirs

@@ -5,7 +5,7 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME/documents"
+XDG_DESKTOP_DIR="$HOME"
 XDG_DOCUMENTS_DIR="$HOME/documents"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
 XDG_MUSIC_DIR="$HOME/music"

.config/vim/vimrc

@@ -119,12 +119,18 @@ if !exists('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='latex'
+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
-autocmd FileType tex TagbarOpen
+augroup vimtex
+    autocmd!
+    autocmd BufWritePost tex call vimtex#toc#refresh()
+    autocmd BufWritePost tex call vimtex#labels#refresh()
+    autocmd BufWritePost tex silent VimtexCompile
+augroup END
+
 
 " Vim-Airline config
 let g:Powerline_symbols = 'fancy'

.config/zsh/.zshrc

@@ -3,12 +3,8 @@ unsetopt MULTIBYTE
 # Config and cache directory paths
 CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
 ZSH_DIR="$CONFIG_DIR/zsh"
-ZSH_CACHE_DIR="$CONFIG_DIR/oh-my-zsh/cache"
-ADOTDIR="$ZSH_DIR/antigen" # Antigen directory
 LOG_DIR="$ZSH_DIR/log"
-ANTIGEN_LOG="$LOG_DIR/antigen-$(date +"%Y_%m_%d_%I_%M_%p").log"
+mkdir -p "$LOG_DIR"
-
-mkdir -p "$ZSH_CACHE_DIR" "$ZSH_DIR" "$LOG_DIR"
 
 HISTFILE="$ZSH_DIR/histfile"
 HISTSIZE=999999
@@ -24,7 +20,7 @@ fi
 
 # Set some useful ZSH/Bash options
 setopt sharehistory histignorealldups histignorespace histreduceblanks
-setopt pathdirs autocd autopushd extendedglob nullglob alwaystoend dvorak
+setopt pathdirs autocd autopushd extendedglob nullglob alwaystoend interactivecomments dvorak
 
 # Completion initialisation
 autoload -U compinit ; compinit
@@ -40,10 +36,19 @@ zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower
 zstyle ':completion:*' rehash true
 zstyle ':completion:*' menu select
 zstyle ':completion:*' list-colors "${(@s.:.)LS_COLORS}"
-zstyle ':compinstall'  filename "$HOME/.zshrc"
+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"
@@ -52,15 +57,17 @@ source "$antigen_src"
 
 antigen bundle zsh-users/zsh-completions
 antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle Tarrasch/zsh-syntax-highlighting
 antigen bundle zsh-users/zsh-history-substring-search
+antigen bundle zsh-users/zsh-syntax-highlighting
 antigen bundle mafredri/zsh-async
 
 antigen apply
 
+# Vim mode!
+bindkey -v
+export KEYTIMEOUT=25
 
 # Set some key-binds
-bindkey -e
 bindkey "^[[1;3C" forward-word
 bindkey "^[[1;5C" forward-word
 bindkey "^[[1;3D" backward-word
@@ -69,19 +76,13 @@ bindkey "^[[7~" beginning-of-line
 bindkey "^[[8~" end-of-line
 bindkey "^[[3~" delete-char
 bindkey "^[[3;3~" delete-word
-
-export WORDCHARS='*?_[]~=&;!#$%^(){}'
-x-bash-backward-kill-word(){
-    WORDCHARS='' zle kill-word
-}
-zle -N x-bash-backward-kill-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 '^[[1;3A' history-substring-search-up       # Alt+Up (hsh)
 bindkey '^[[1;3B' history-substring-search-down     # Alt+Down (hsh)
-
+bindkey -M vicmd v edit-command-line
 
 ZSH_AUTOSUGGEST_CLEAR_WIDGETS=("${(@)ZSH_AUTOSUGGEST_CLEAR_WIDGETS:#(up|down)-line-or-history}")
 ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(history-substring-search-up history-substring-search-down)
@@ -91,6 +92,7 @@ HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=true
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='underline'
 
 typeset -A ZSH_HIGHLIGHT_STYLES
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets root line)
 ZSH_HIGHLIGHT_STYLES[default]='fg=12'
 ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold'
 ZSH_HIGHLIGHT_STYLES[reserved-word]='fg=yellow'

.config/zsh/plugins/fish-theme.zsh

@@ -1,12 +1,7 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-  echo $(pwd | perl -pe '
+    pwd | sed -E 's|^'$HOME'|~|;s|(.*)/|\1%|;s|((^\|/)\.?[^/%]{1})[^/%]*|\1|g;s|(.*)%|\1/|'
-   BEGIN {
-      binmode STDIN,  ":encoding(UTF-8)";
-      binmode STDOUT, ":encoding(UTF-8)";
-   }; s|^$ENV{HOME}|~|g; s|/([^/.])[^/]*(?=/)|/$1|g; s|/\.([^/])[^/]*(?=/)|/.$1|g
-')
 }
 
 git_prompt_info() {

.config/zsh/plugins/sudo.zsh

@@ -4,14 +4,11 @@ sudo-command-line() {
     [[ -z $BUFFER ]] && zle up-history
     if [[ $BUFFER == sudo\ * ]]; then
         LBUFFER="${LBUFFER#sudo }"
-    elif [[ $BUFFER == $EDITOR\ * ]] || [[ $BUFFER == vi\ * ]]; then
+    elif [[ $BUFFER == $EDITOR\ * ]] || [[ $BUFFER == vi\ * ]] || [[ $BUFFER == vim\ * ]]; then
-        LBUFFER="${LBUFFER#$EDITOR }"
+        LBUFFER="s$LBUFFER"
-        LBUFFER="${LBUFFER#vi }"
+    elif [[ $BUFFER == sudoedit\ * ]] || [[ $BUFFER == svi\ * ]]|| [[ $BUFFER == svim\ * ]]; then
-        LBUFFER="svi $LBUFFER"
-    elif [[ $BUFFER == sudoedit\ * ]] || [[ $BUFFER == svi\ * ]]; then
         LBUFFER="${LBUFFER#sudoedit }"
-        LBUFFER="${LBUFFER#svi }"
+        LBUFFER="${LBUFFER#s}"
-        LBUFFER="$EDITOR $LBUFFER"
     else
         LBUFFER="sudo $LBUFFER"
     fi

.profile

@@ -38,6 +38,8 @@ export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/settings.ini
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 # Pass
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+# Python
+export PYTHONHISTFILE="$XDG_DATA_HOME/python/histfile"
 
 # Go configuration
 export GOPATH="$XDG_DATA_HOME/go"
@@ -78,6 +80,7 @@ fi
 # Start a dbus session daemon for programs that require it
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then
     eval $(dbus-launch --sh-syntax --exit-with-session)
-    dbus-update-activation-environment --systemd DISPLAY
+    dbus-update-activation-environment --systemd \
+        DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
 fi
 

aliases

@@ -1,5 +1,3 @@
-#!/usr/bin/zsh
-
 # Common Aliases
 alias -g ...=../..
 alias -g ....=../../..
@@ -11,6 +9,7 @@ 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 -lAFh --sort=time'
@@ -40,6 +39,7 @@ alias -g CLIP="| xclip -i -selection primary -f | xclip -i -selection clipboard"
 calc() { bc -l <<< "$@"; }
 
 alias svi=sudoedit
+alias svim=sudoedit
 # This will enable us to use aliases in sudo.
 # (If alias finishes with a space or tab, the shell will check if the next command is also aliased.)
 # Source: https://github.com/mayah/home/blob/master/.zsh/zshrc.d/alias.zsh
@@ -47,7 +47,6 @@ alias sudo='sudo -E '
 alias open=xdg-open
 
 # Command rewrites
-alias ls='ls --color=always'
 alias rm='rm -i'
 alias mv='mv -i'
 alias cp='cp -ir'
@@ -58,6 +57,7 @@ alias make="make -j$(nproc)"
 alias dd='dd status=progress'
 alias env='env | sort | sed -r "s/\x1B\[(([0-9]+)(;[0-9]+)*)?[m,K,H,f,J]//g"'
 alias ssh="ssh -tt"
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget/hsts-file"
 vim --version 2>/dev/null | command grep -q +clientserver && \
     alias vim="vim --servername vim -p"
 alias vi=vim
@@ -65,7 +65,7 @@ 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'
 exists gopass && alias pass='gopass'
-alias abuild='docker run -ti --rm \
+alias alpine-sdk='docker run -ti --rm \
     -e USER \
     -e UID="$(id -u)" \
     -e PWD \
@@ -73,7 +73,13 @@ alias abuild='docker run -ti --rm \
     -w $PWD \
     -v $PWD:$PWD \
     -v ~/.abuild:$HOME/.abuild \
-    frebib/alpine-sdk:edge abuild'
+    -v ~/.abuild/distfiles:/var/cache/distfiles \
+    frebib/alpine-sdk:edge'
+alias abuild='alpine-sdk abuild'
+alias abuild-sign='alpine-sdk abuild-sign'
+alias apk='alpine-sdk apk'
+alias hddtemps='find /sys/block/ -name sd\* | sed "s|sys/block|dev|g" | sudo xargs hddtemp | sort -t: -k3'
+alias stripansi='sed -r "s/\x1B\[(([0-9]+)(;[0-9]+)*)?[m,K,H,f,J]//g"'
 
 # System aliases
 alias s="sudo systemctl"
@@ -181,10 +187,12 @@ 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'
-alias dsh='_CMD=dsh _dsh exec'
+alias dsh='_CMD=dsh _dsh 2 exec'
-alias drsh='_CMD=drsh _dsh run --rm --entrypoint='
+alias drsh='_CMD=drsh _dsh 4 run --rm --entrypoint='
 _dsh() {
-    if [ $# -lt 2 ]; then
+    minargs=$1
+    shift
+    if [ $# -lt $minargs ]; then
         echo "Usage: ${_CMD:-$0} [user@]container [program [args]]" >&2
         return 64
     fi
@@ -218,18 +226,20 @@ _dsh() {
     fi
 
     if [ -z "$prog" ]; then
-        set -o pipefail
+        shell_args=()
-        local rm=
         if [ "$dowhat" = 'run' ]; then
-            rm='--rm --entrypoint='
+            shell_args=(--rm --entrypoint=)
         fi
         for shell in bash sh; do
-            if shell_path="$(eval "docker $dowhat $rm $host which $shell" <&- | sed 's|[\r\n]||g')"; then
+            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"
                 break
+            elif [ $retval -ge 125 ]; then
+                return
             fi
         done
-        set +o pipefail
         if [ -z "$prog" ]; then
             echo "Warning: No shell found in path.. trying /bin/sh" >&2
             prog=/bin/sh
@@ -273,6 +283,4 @@ alias nf=neofetch
 randstr() { tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w $1 | head -n 1; }
 alias rot13="tr '[A-Za-z]' '[N-ZA-Mn-za-m]'"
 
-alias lab="ssh -tt tw '~/ctl' 2>/dev/null"
-
 # vim: ft=sh

scripts/4screens

@@ -11,4 +11,4 @@ xrandr --output $BOTTOM_LEFT --primary --mode 1920x1080 --pos 0x1080 --rotate no
        --output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \
        --output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal
 
-[ -e ~/.fehbg ] && ~/.fehbg
+feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg

scripts/dock-displays

@@ -16,6 +16,4 @@ xrandr --newmode $MODELINE 2>/dev/null || true
 xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true
 xrandr --output  $OUTPUT --mode $MODENAME
 
-if [ -f ~/.fehbg -a -x ~/.fehbg ]; then
+feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg
-    ~/.fehbg
-fi

scripts/rofi-emoji

@@ -84,7 +84,7 @@ 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 -kb-custom-1 Ctrl+c -kb-row-tab '' -kb-row-select Tab $@)
+    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

scripts/rofi-fontawesome

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