Update dotfiles

Fix XCompose
2022-01-19 12:31:07 +02:00 · 2022-01-19 12:31:07 +02:00 · c06beb6731
parent c0791cc9fc
commit c06beb6731
14 changed files with 59 additions and 201 deletions
--- a/.bash_profile
+++ b/.bash_profile
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Print date on login
 printf '\e[1m\e[91m%(%A, %B %d, %Y)T \e[90m- \e[36m%(%Z %z)T\e[m\n\n'

@ -15,13 +13,13 @@ export FZF_DEFAULT_OPTS='--ansi'
 # }}}

 # Set the default pager
-export PAGER='nvimpager -p'
+export PAGER='nvimpager'

 # Set the default editor
-export EDITOR=nvim
+export EDITOR='nvim'

 # Set the default browser
-export BROWSER=firefox
+export BROWSER='firefox'

 # Set the XDG directories {{{
 export XDG_CONFIG_HOME="$HOME/.config"
@ -37,24 +35,15 @@ export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash"
 export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/__pycache__"
 export PYTHONSTARTUP="$XDG_CONFIG_HOME/pythonrc.py"
 export PYTHON_EGG_CACHE="$XDG_CACHE_HOME/python-eggs"
-export IPYTHONDIR="$XDG_CONFIG_HOME/jupyter"
 export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter"
+export IPYTHONDIR="$XDG_CONFIG_HOME/jupyter"
+export PYLINTHOME="$XDG_CACHE_HOME/pylint"
 # }}}

 # Set the paths used by go {{{
 export GOPATH="$HOME/.local/go"
 # }}}

-# Set the paths used by ruby {{{
-export GEM_HOME="$HOME/.local/ruby"
-export GEM_SPEC_CACHE="$GEM_HOME/specs"
-export GEM_PATH="$GEM_HOME:/usr/lib/ruby/gems/2.7.0"
-export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME/bundle"
-export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle"
-export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME/bundle"
-export TRAVIS_CONFIG_PATH="$XDG_CONFIG_HOME/travis"
-# }}}
-
 # Set the paths used by R {{{
 export R_LIBS_USER="$HOME/.local/R"
 export R_PROFILE="$XDG_CONFIG_HOME/Rprofile"
@ -64,7 +53,7 @@ export R_HISTFILE="$XDG_CACHE_HOME/.R_history"
 # Set the paths used by perl5 {{{
 export PERL5LIB="$HOME/.local/perl/lib/perl5"
 export PERL_CPANM_OPT="-l $HOME/.local/perl"
-export PERL_CPANM_HOME="$HOME/.local/perl/.cpanm"
+export PERL_CPANM_HOME="$HOME/.local/perl/cpanm"
 # }}}

 # Set the paths used by rust {{{
@ -89,10 +78,6 @@ export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
 export KONAN_DATA_DIR="$XDG_DATA_HOME/konan"
 # }}}

-# Set the paths used by sqlite {{{
-export SQLITE_HISTORY="$XDG_CACHE_HOME/.sqlite_history"
-# }}}
-
 # Set the paths used by xorg {{{
 export XCOMPOSEFILE="$XDG_CONFIG_HOME/X11/XCompose"
 export XCOMPOSECACHE="$XDG_CACHE_HOME/X11/XCompose"
@ -134,27 +119,23 @@ export PATH="$HOME/.local/bin:\
 /usr/bin/vendor_perl:\
 /usr/bin/core_perl:\
 $HOME/.local/perl/bin:\
-$GOPATH/bin:\
-$GEM_HOME/bin"
+$GOPATH/bin"
 # }}}

-# Use a 256color terminal if one exists {{{
-for t in {konsole,xterm,gnome}-256color; do
-  [ -f /usr/share/terminfo/${t:0:1}/$t ] && export TERM=$t && break
-  [ $t == gnome-256color ] && export TERM=xterm
-done
-unset t
+# Use a 256color terminal if possible {{{
+# shellcheck disable=SC2015
+test -f '/usr/share/terminfo/k/konsole-256color' \
+  && export TERM="${_##*/}" || export TERM='xterm'
 # }}}

 # Specify inputrc
 test -f "$XDG_CONFIG_HOME/inputrc" && export INPUTRC="$_"

 # Source fzf keybinds
-test -f /usr/share/fzf/key-bindings.bash && . "$_"
+test -f '/usr/share/fzf/key-bindings.bash' && . "$_"

-# Source github & gitlab tokens {{{
-test -f "$XDG_DATA_HOME/tokens" && . "$_"
-# }}}
+# Source tokens for CLI tools
+test -f "$XDG_DATA_HOME/tokens.sh" && . "$_"

 # Source bashrc
 test -f "$XDG_DATA_HOME/bash/bashrc.sh" && . "$_"
@ -165,4 +146,4 @@ test -f "$XDG_DATA_HOME/bash/aliases.sh" && . "$_"
 # Source functions
 test -f "$XDG_DATA_HOME/bash/functions.sh" && . "$_"

-# vim:fdm=marker:fdl=1:
+# vim:fdm=marker:fdl=1:ft=sh:
--- a/.config/X11/XCompose
+++ b/.config/X11/XCompose
@ -2,14 +2,13 @@
 # {keys...} : "{glyph}" {unicode number} # {unicode name}

 # Dashes & spaces {{{
-<Multi_key> <underscore> <asciicircum>   : "¯" U00AF # MACRON
 <Multi_key> <asciicircum> <underscore>   : "¯" U00AF # MACRON
 <Multi_key> <minus> <minus> <period>     : "–" U2013 # EN DASH
 <Multi_key> <minus> <minus> <minus>      : "—" U2014 # EM DASH
 <Multi_key> <minus> <minus> <space>      : "" U00AD # SOFT HYPHEN
 <Multi_key> <space> <space>              : " " U00A0 # NO-BREAK SPACE
 <Multi_key> <minus> <underscore> <minus> : "⍽" U237D # SHOULDERED OPEN BOX
-<Multi_key> <asciitilde> <asciitilde>    : "〜" U301C # WAVE DASH
+<Multi_key> <minus> <asciitilde>         : "〜" U301C # WAVE DASH
 <Multi_key> <asciicircum> <asciitilde>   : "〰" U3030 # WAVY DASH
 <Multi_key> <j> <minus>                  : "ー" U3007 # KATAKANA-HIRAGANA PROLONGED SOUND MARK
 <Multi_key> <j> <asciitilde>             : "～" UFF5E # FULLWIDTH TILDE
@ -18,7 +17,7 @@
 # Dots {{{
 <Multi_key> <period> <period>      : "…" U2026 # HORIZONTAL ELLIPSIS
 <Multi_key> <period> <bar>         : "⋮" U22EE # VERTICAL ELLIPSIS
-<Multi_key> <period> <bar>         : "⋮" U22EE # VERTICAL ELLIPSIS
+<Multi_key> <bar> <period>         : "⋮" U22EE # VERTICAL ELLIPSIS
 <Multi_key> <slash> <period>       : "⋰" U22F0 # UP RIGHT DIAGONAL ELLIPSIS
 <Multi_key> <period> <slash>       : "⋰" U22F0 # UP RIGHT DIAGONAL ELLIPSIS
 <Multi_key> <backslash> <period>   : "⋱" U22F1 # DOWN RIGHT DIAGONAL ELLIPSIS
@ -55,40 +54,18 @@
 # Currencies {{{
 <Multi_key> <C> <equal> : "€" U20AC # EURO SIGN
 <Multi_key> <equal> <C> : "€" U20AC # EURO SIGN
-<Multi_key> <c> <equal> : "€" U20AC # EURO SIGN
-<Multi_key> <equal> <c> : "€" U20AC # EURO SIGN
 <Multi_key> <E> <equal> : "€" U20AC # EURO SIGN
 <Multi_key> <equal> <E> : "€" U20AC # EURO SIGN
-<Multi_key> <e> <equal> : "€" U20AC # EURO SIGN
-<Multi_key> <equal> <e> : "€" U20AC # EURO SIGN
-<Multi_key> <C> <bar>   : "¢" U00A2 # CENT SIGN
-<Multi_key> <bar> <C>   : "¢" U00A2 # CENT SIGN
 <Multi_key> <c> <bar>   : "¢" U00A2 # CENT SIGN
 <Multi_key> <bar> <c>   : "¢" U00A2 # CENT SIGN
-<Multi_key> <c> <slash> : "¢" U00A2 # CENT SIGN
-<Multi_key> <slash> <c> : "¢" U00A2 # CENT SIGN
 <Multi_key> <L> <minus> : "£" U00A3 # POUND SIGN
 <Multi_key> <minus> <L> : "£" U00A3 # POUND SIGN
-<Multi_key> <l> <minus> : "£" U00A3 # POUND SIGN
-<Multi_key> <minus> <l> : "£" U00A3 # POUND SIGN
 <Multi_key> <Y> <equal> : "¥" U00A5 # YEN SIGN
 <Multi_key> <equal> <Y> : "¥" U00A5 # YEN SIGN
-<Multi_key> <y> <equal> : "¥" U00A5 # YEN SIGN
-<Multi_key> <equal> <y> : "¥" U00A5 # YEN SIGN
-<Multi_key> <Y> <minus> : "¥" U00A5 # YEN SIGN
-<Multi_key> <minus> <Y> : "¥" U00A5 # YEN SIGN
-<Multi_key> <y> <minus> : "¥" U00A5 # YEN SIGN
-<Multi_key> <minus> <y> : "¥" U00A5 # YEN SIGN
 <Multi_key> <n> <n>     : "₪" U20AA # NEW SHEQEL SIGN
 <Multi_key> <N> <N>     : "₪" U20AA # NEW SHEQEL SIGN
 <Multi_key> <o> <x>     : "¤" U00A4 # CURRENCY SIGN
 <Multi_key> <x> <o>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <o> <X>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <X> <o>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <O> <X>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <X> <O>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <O> <x>     : "¤" U00A4 # CURRENCY SIGN
-<Multi_key> <x> <O>     : "¤" U00A4 # CURRENCY SIGN
 # }}}

 # Math & logic {{{
@ -194,7 +171,7 @@
 <Multi_key> <numbersign> <2>          : "𝅗𝅥" U1D15E # MUSICAL SYMBOL HALF NOTE
 <Multi_key> <numbersign> <4>          : "𝅘𝅥" U1D15F # MUSICAL SYMBOL QUARTER NOTE
 <Multi_key> <numbersign> <8>          : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-<Multi_key> <numbersign> <6>          : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
+<Multi_key> <numbersign> <1> <6>      : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
 <Multi_key> <numbersign> <3> <2>      : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
 <Multi_key> <numbersign> <6> <4>      : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
 <Multi_key> <numbersign> <1> <2> <8>  : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
@ -246,9 +223,7 @@

 # Other symbols {{{
 <Multi_key> <o> <o>                      : "°" U00B0 # DEGREE SIGN
-<Multi_key> <asterisk> <0>               : "°" U00B0 # DEGREE SIGN
 <Multi_key> <0> <asterisk>               : "°" U00B0 # DEGREE SIGN
-<Multi_key> <exclam> <bar>               : "¦" U00A6 # BROKEN BAR
 <Multi_key> <bar> <exclam>               : "¦" U00A6 # BROKEN BAR
 <Multi_key> <bar> <minus>                : "†" U2020 # DAGGER
 <Multi_key> <bar> <equal>                : "‡" U2021 # DOUBLE DAGGER
@ -288,7 +263,6 @@
 <Multi_key> <asterisk> <0>               : "☆" U2606 # WHITE STAR
 <Multi_key> <asterisk> <x>               : "❄" U2744 # SNOWFLAKE
 <Multi_key> <C> <C> <C> <P>              : "☭" U262D # HAMMER AND SICKLE
-<Multi_key> <h> <s>                      : "☭" U262D # HAMMER AND SICKLE
 <Multi_key> <H> <S>                      : "☭" U262D # HAMMER AND SICKLE
 <Multi_key> <at> <slash>                 : "✓" U2713 # CHECK MARK
 <Multi_key> <at> <at> <slash>            : "✔" U2714 # HEAVY CHECK MARK
@ -376,7 +350,7 @@
 <Multi_key> <h> <w> <i>     : "ゐ" U3090 # HIRAGANA LETTER WI
 <Multi_key> <h> <w> <e>     : "ゑ" U3091 # HIRAGANA LETTER WE
 <Multi_key> <h> <w> <o>     : "を" U3092 # HIRAGANA LETTER WO
-<Multi_key> <h> <n>         : "ん" U3093 # HIRAGANA LETTER N
+<Multi_key> <h> <n> <n>     : "ん" U3093 # HIRAGANA LETTER N
 <Multi_key> <h> <l> <y> <a> : "ゃ" U3083 # HIRAGANA LETTER SMALL YA
 <Multi_key> <h> <l> <y> <u> : "ゅ" U3085 # HIRAGANA LETTER SMALL YU
 <Multi_key> <h> <l> <y> <o> : "ょ" U3087 # HIRAGANA LETTER SMALL YO
@ -456,7 +430,7 @@
 <Multi_key> <k> <w> <i>     : "ヰ" U30F0 # KATAKANA LETTER WI
 <Multi_key> <k> <w> <e>     : "ヱ" U30F1 # KATAKANA LETTER WE
 <Multi_key> <k> <w> <o>     : "ヲ" U30F2 # KATAKANA LETTER WO
-<Multi_key> <k> <n>         : "ン" U30F3 # KATAKANA LETTER N
+<Multi_key> <k> <n> <n>     : "ン" U30F3 # KATAKANA LETTER N
 <Multi_key> <k> <l> <y> <a> : "ッ" U30C3 # KATAKANA LETTER SMALL TU
 <Multi_key> <k> <l> <y> <u> : "ュ" U30E5 # KATAKANA LETTER SMALL YU
 <Multi_key> <k> <l> <y> <o> : "ョ" U30E7 # KATAKANA LETTER SMALL YO
@ -538,155 +512,80 @@

 # Other letters {{{
 <Multi_key> <apostrophe> <A>  : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
-<Multi_key> <A> <apostrophe>  : "Á" U00C1 # LATIN CAPITAL LETTER A WITH ACUTE
 <Multi_key> <asciicircum> <A> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-<Multi_key> <A> <asciicircum> : "Â" U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 <Multi_key> <grave> <A>       : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
-<Multi_key> <A> <grave>       : "À" U00C0 # LATIN CAPITAL LETTER A WITH GRAVE
 <Multi_key> <underscore> <A>  : "Ā" U0100 # LATIN CAPITAL LETTER A WITH MACRON
-<Multi_key> <A> <underscore>  : "Ā" U0100 # LATIN CAPITAL LETTER A WITH MACRON
 <Multi_key> <quotedbl> <A>    : "Ä" U00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS
-<Multi_key> <A> <quotedbl>    : "Ä" U00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS
 <Multi_key> <comma> <C>       : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA
-<Multi_key> <C> <comma>       : "Ç" U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA
 <Multi_key> <minus> <D>       : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <D> <minus>       : "Đ" U0110 # LATIN CAPITAL LETTER D WITH STROKE
 <Multi_key> <apostrophe> <E>  : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
-<Multi_key> <E> <apostrophe>  : "É" U00C9 # LATIN CAPITAL LETTER E WITH ACUTE
 <Multi_key> <asciicircum> <E> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-<Multi_key> <E> <asciicircum> : "Ê" U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 <Multi_key> <grave> <E>       : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
-<Multi_key> <E> <grave>       : "È" U00C8 # LATIN CAPITAL LETTER E WITH GRAVE
 <Multi_key> <underscore> <E>  : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
-<Multi_key> <E> <underscore>  : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
 <Multi_key> <quotedbl> <E>    : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS
-<Multi_key> <E> <quotedbl>    : "Ë" U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS
 <Multi_key> <minus> <H>       : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
-<Multi_key> <H> <minus>       : "Ħ" U0126 # LATIN CAPITAL LETTER H WITH STROKE
 <Multi_key> <apostrophe> <I>  : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
-<Multi_key> <I> <apostrophe>  : "Í" U00CD # LATIN CAPITAL LETTER I WITH ACUTE
 <Multi_key> <asciicircum> <I> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-<Multi_key> <I> <asciicircum> : "Î" U00CE # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 <Multi_key> <grave> <I>       : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
-<Multi_key> <I> <grave>       : "Ì" U00CC # LATIN CAPITAL LETTER I WITH GRAVE
 <Multi_key> <underscore> <I>  : "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
-<Multi_key> <I> <underscore>  : "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
 <Multi_key> <minus> <I>       : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
-<Multi_key> <I> <minus>       : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE
 <Multi_key> <quotedbl> <I>    : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS
-<Multi_key> <I> <quotedbl>    : "Ï" U00CF # LATIN CAPITAL LETTER I WITH DIAERESIS
 <Multi_key> <slash> <L>       : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
-<Multi_key> <L> <slash>       : "Ł" U0141 # LATIN CAPITAL LETTER L WITH STROKE
 <Multi_key> <asciitilde> <N>  : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
-<Multi_key> <N> <asciitilde>  : "Ñ" U00D1 # LATIN CAPITAL LETTER N WITH TILDE
 <Multi_key> <apostrophe> <O>  : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
-<Multi_key> <O> <apostrophe>  : "Ó" U00D3 # LATIN CAPITAL LETTER O WITH ACUTE
 <Multi_key> <asciicircum> <O> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-<Multi_key> <O> <asciicircum> : "Ô" U00D4 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 <Multi_key> <grave> <O>       : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
-<Multi_key> <O> <grave>       : "Ò" U00D2 # LATIN CAPITAL LETTER O WITH GRAVE
 <Multi_key> <underscore> <O>  : "Ō" U014C # LATIN CAPITAL LETTER O WITH MACRON
-<Multi_key> <O> <underscore>  : "Ō" U014C # LATIN CAPITAL LETTER O WITH MACRON
 <Multi_key> <slash> <O>       : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE
-<Multi_key> <O> <slash>       : "Ø" U00D8 # LATIN CAPITAL LETTER O WITH STROKE
 <Multi_key> <asciitilde> <O>  : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
-<Multi_key> <O> <asciitilde>  : "Õ" U00D5 # LATIN CAPITAL LETTER O WITH TILDE
 <Multi_key> <quotedbl> <O>    : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
-<Multi_key> <O> <quotedbl>    : "Ö" U00D6 # LATIN CAPITAL LETTER O WITH DIAERESIS
 <Multi_key> <apostrophe> <U>  : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
-<Multi_key> <U> <apostrophe>  : "Ú" U00DA # LATIN CAPITAL LETTER U WITH ACUTE
 <Multi_key> <asciicircum> <U> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-<Multi_key> <U> <asciicircum> : "Û" U00DB # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 <Multi_key> <grave> <U>       : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
-<Multi_key> <U> <grave>       : "Ù" U00D9 # LATIN CAPITAL LETTER U WITH GRAVE
 <Multi_key> <underscore> <U>  : "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
-<Multi_key> <U> <underscore>  : "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
 <Multi_key> <quotedbl> <U>    : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
-<Multi_key> <U> <quotedbl>    : "Ü" U00DC # LATIN CAPITAL LETTER U WITH DIAERESIS
 <Multi_key> <apostrophe> <Y>  : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
-<Multi_key> <Y> <apostrophe>  : "Ý" U00DD # LATIN CAPITAL LETTER Y WITH ACUTE
 <Multi_key> <asciicircum> <Y> : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-<Multi_key> <Y> <asciicircum> : "Ŷ" U0176 # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-<Multi_key> <Y> <grave>       : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <Multi_key> <grave> <Y>       : "Ỳ" U1EF2 # LATIN CAPITAL LETTER Y WITH GRAVE
 <Multi_key> <quotedbl> <Y>    : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
-<Multi_key> <Y> <quotedbl>    : "Ÿ" U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS
 <Multi_key> <apostrophe> <a>  : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
-<Multi_key> <a> <apostrophe>  : "á" U00E1 # LATIN SMALL LETTER A WITH ACUTE
 <Multi_key> <asciicircum> <a> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
-<Multi_key> <a> <asciicircum> : "â" U00E2 # LATIN SMALL LETTER A WITH CIRCUMFLEX
 <Multi_key> <grave> <a>       : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
-<Multi_key> <a> <grave>       : "à" U00E0 # LATIN SMALL LETTER A WITH GRAVE
 <Multi_key> <underscore> <a>  : "ā" U0101 # LATIN SMALL LETTER A WITH MACRON
-<Multi_key> <a> <underscore>  : "ā" U0101 # LATIN SMALL LETTER A WITH MACRON
 <Multi_key> <asciitilde> <a>  : "ã" U00E3 # LATIN SMALL LETTER A WITH TILDE
-<Multi_key> <a> <asciitilde>  : "ã" U00E3 # LATIN SMALL LETTER A WITH TILDE
 <Multi_key> <quotedbl> <a>    : "ä" U00E4 # LATIN SMALL LETTER A WITH DIAERESIS
-<Multi_key> <a> <quotedbl>    : "ä" U00E4 # LATIN SMALL LETTER A WITH DIAERESIS
 <Multi_key> <comma> <c>       : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA
-<Multi_key> <c> <comma>       : "ç" U00E7 # LATIN SMALL LETTER C WITH CEDILLA
 <Multi_key> <minus> <d>       : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <d> <minus>       : "đ" U0111 # LATIN SMALL LETTER D WITH STROKE
 <Multi_key> <apostrophe> <e>  : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
-<Multi_key> <e> <apostrophe>  : "é" U00E9 # LATIN SMALL LETTER E WITH ACUTE
 <Multi_key> <asciicircum> <e> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
-<Multi_key> <e> <asciicircum> : "ê" U00EA # LATIN SMALL LETTER E WITH CIRCUMFLEX
 <Multi_key> <grave> <e>       : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
-<Multi_key> <e> <grave>       : "è" U00E8 # LATIN SMALL LETTER E WITH GRAVE
 <Multi_key> <underscore> <e>  : "ē" U0113 # LATIN SMALL LETTER E WITH MACRON
-<Multi_key> <e> <underscore>  : "ē" U0113 # LATIN SMALL LETTER E WITH MACRON
 <Multi_key> <quotedbl> <e>    : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS
-<Multi_key> <e> <quotedbl>    : "ë" U00EB # LATIN SMALL LETTER E WITH DIAERESIS
 <Multi_key> <minus> <h>       : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
-<Multi_key> <h> <minus>       : "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
 <Multi_key> <apostrophe> <i>  : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
-<Multi_key> <i> <apostrophe>  : "í" U00ED # LATIN SMALL LETTER I WITH ACUTE
 <Multi_key> <asciicircum> <i> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
-<Multi_key> <i> <asciicircum> : "î" U00EE # LATIN SMALL LETTER I WITH CIRCUMFLEX
 <Multi_key> <grave> <i>       : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
-<Multi_key> <i> <grave>       : "ì" U00EC # LATIN SMALL LETTER I WITH GRAVE
 <Multi_key> <underscore> <i>  : "ī" U012B # LATIN SMALL LETTER I WITH MACRON
-<Multi_key> <i> <underscore>  : "ī" U012B # LATIN SMALL LETTER I WITH MACRON
-<Multi_key> <i> <period>      : "ı" U0131 # LATIN SMALL LETTER DOTLESS I
 <Multi_key> <period> <i>      : "ı" U0131 # LATIN SMALL LETTER DOTLESS I
 <Multi_key> <quotedbl> <i>    : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS
-<Multi_key> <i> <quotedbl>    : "ï" U00EF # LATIN SMALL LETTER I WITH DIAERESIS
 <Multi_key> <slash> <l>       : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
-<Multi_key> <l> <slash>       : "ł" U0142 # LATIN SMALL LETTER L WITH STROKE
 <Multi_key> <asciitilde> <n>  : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
-<Multi_key> <n> <asciitilde>  : "ñ" U00F1 # LATIN SMALL LETTER N WITH TILDE
 <Multi_key> <apostrophe> <o>  : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
-<Multi_key> <o> <apostrophe>  : "ó" U00F3 # LATIN SMALL LETTER O WITH ACUTE
 <Multi_key> <asciicircum> <o> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
-<Multi_key> <o> <asciicircum> : "ô" U00F4 # LATIN SMALL LETTER O WITH CIRCUMFLEX
 <Multi_key> <grave> <o>       : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
-<Multi_key> <o> <grave>       : "ò" U00F2 # LATIN SMALL LETTER O WITH GRAVE
 <Multi_key> <underscore> <o>  : "ō" U014D # LATIN SMALL LETTER O WITH MACRON
-<Multi_key> <o> <underscore>  : "ō" U014D # LATIN SMALL LETTER O WITH MACRON
 <Multi_key> <slash> <o>       : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE
-<Multi_key> <o> <slash>       : "ø" U00F8 # LATIN SMALL LETTER O WITH STROKE
 <Multi_key> <asciitilde> <o>  : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
-<Multi_key> <o> <asciitilde>  : "õ" U00F5 # LATIN SMALL LETTER O WITH TILDE
 <Multi_key> <quotedbl> <o>    : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
-<Multi_key> <o> <quotedbl>    : "ö" U00F6 # LATIN SMALL LETTER O WITH DIAERESIS
 <Multi_key> <apostrophe> <u>  : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
-<Multi_key> <u> <apostrophe>  : "ú" U00FA # LATIN SMALL LETTER U WITH ACUTE
 <Multi_key> <asciicircum> <u> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
-<Multi_key> <u> <asciicircum> : "û" U00FB # LATIN SMALL LETTER U WITH CIRCUMFLEX
 <Multi_key> <grave> <u>       : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
-<Multi_key> <u> <grave>       : "ù" U00F9 # LATIN SMALL LETTER U WITH GRAVE
 <Multi_key> <underscore> <u>  : "ū" U016B # LATIN SMALL LETTER U WITH MACRON
-<Multi_key> <u> <underscore>  : "ū" U016B # LATIN SMALL LETTER U WITH MACRON
 <Multi_key> <quotedbl> <u>    : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
-<Multi_key> <u> <quotedbl>    : "ü" U00FC # LATIN SMALL LETTER U WITH DIAERESIS
 <Multi_key> <apostrophe> <y>  : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
-<Multi_key> <y> <apostrophe>  : "ý" U00FD # LATIN SMALL LETTER Y WITH ACUTE
 <Multi_key> <asciicircum> <y> : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
-<Multi_key> <y> <asciicircum> : "ŷ" U0177 # LATIN SMALL LETTER Y WITH CIRCUMFLEX
 <Multi_key> <grave> <y>       : "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
-<Multi_key> <y> <grave>       : "ỳ" U1EF3 # LATIN SMALL LETTER Y WITH GRAVE
 <Multi_key> <quotedbl> <y>    : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS
-<Multi_key> <y> <quotedbl>    : "ÿ" U00FF # LATIN SMALL LETTER Y WITH DIAERESIS
 <Multi_key> <N> <G>           : "Ŋ" U014A # LATIN CAPITAL LETTER ENG
 <Multi_key> <n> <g>           : "ŋ" U014B # LATIN SMALL LETTER ENG
 <Multi_key> <D> <H>           : "Ð" U00D0 # LATIN CAPITAL LETTER ETH
--- a/.config/git/config
+++ b/.config/git/config
@ -7,6 +7,7 @@
 	autocrlf = false
 	whitespace = cr-at-eol
 	editor = ${EDITOR:-nvim}
+	askpass = ksshaskpass

 [extensions]
 	objectFormat = sha256
@ -16,10 +17,14 @@

 [advice]
 	detachedHead = false
+	skippedCherryPicks = false

 [credential]
 	helper = store

+[credential "https://github.com"]
+	helper = !gh auth git-credential
+
 [commit]
 	gpgSign = true
 	status = true
@ -111,7 +116,6 @@
 	rev  = log --decorate --reverse --no-merges --stat @{1}..
 	amend = commit --amend -uno -a
 	wdiff = diff --word-diff
-	cdiff = diff --word-diff-regex=. --color-words
 	conflicts = diff --name-only --diff-filter=U
 	root = rev-parse --show-toplevel
 	shallow = clone --single-branch --depth=1
@ -137,7 +141,6 @@
 	insteadOf = @disroot:

 [url "aur@aur.archlinux.org:"]
-	insteadOf = https://aur.archlinux.org/
 	insteadOf = http://aur.archlinux.org/
 	insteadOf = @aur:

--- a/.config/mpv/input.conf
+++ b/.config/mpv/input.conf
@ -1,5 +1,6 @@
 # cycle {{{

+f             cycle fullscreen
 d             cycle deinterlace
 u             cycle video-unscaled
 v             cycle sub-visibility
@ -159,7 +160,7 @@ q           stop
 p           show-progress
 b           playlist-prev
 n           playlist-next
-f           playlist-shuffle
+F           playlist-shuffle
 Ctrl+l      ab-loop
 Ctrl+q      quit-watch-later
 Shift+RIGHT frame-step
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@ -52,7 +52,7 @@ idle=yes
 save-position-on-quit=yes

 # Video format/quality that is directly passed to youtube-dl.
-ytdl-format=best[height<=?1080]
+ytdl-format=bv*[height<=1080]+ba/b

 # Options that are directly passed to youtube-dl.
 ytdl-raw-options="yes-playlist="
--- a/.config/nvimpager/init.vim
+++ b/.config/nvimpager/init.vim
@ -10,3 +10,6 @@ vnoremap <C-Insert> "+y
 hi String cterm=NONE gui=NONE
 hi Special cterm=NONE gui=NONE
 hi Comment cterm=italic gui=italic
+hi NvimPagerFG_red_BG_ ctermfg=9 guifg=#ff0000
+hi NvimPagerFG_green_BG_ ctermfg=40 guifg=#00d700
+hi NvimPagerFG_yellow_BG_ ctermfg=172 guifg=#d78700
--- a/.config/yt-dlp/config
+++ b/.config/yt-dlp/config
@ -5,10 +5,16 @@
 --external-downloader "aria2c"

 # Give these arguments to the external downloader.
--external-downloader-args "--file-allocation=none"
+--downloader-args "aria2c:--file-allocation=none"

 # Video format code.
--format "(bestvideo*+bestaudio/best)[height<=?1080]"
+--format "bv*[height<=?1080]+ba/b"
+
+# If a merge is required, output to given container format.
+--merge-output-format "mkv"
+
+# Prefer video formats with free containers.
+--prefer-free-formats

 # Do not use .part files - write directly into output file.
 --no-part
@ -19,4 +25,10 @@
 # Specify a custom user agent.
 --user-agent "Mozilla/5.0 (Linux x86_64) yt-dlp/2021.11.10.1"

+# SponsorBlock categories to create chapters for.
+--sponsorblock-mark "all"
+
+# SponsorBlock categories to be removed from the video file.
+--sponsorblock-remove "music_offtopic"
+
 # vim:ft=conf:
--- a/.local/arch/init.sh
+++ b/.local/arch/init.sh
@ -113,9 +113,6 @@ declare -A ALIASES=(
  [goapp]=go
  [godoc]=go
  [gradlew]=gradle
-  [bundler]=bundle
-  [mvnDebug]=mvn
-  [mvnw]=mvn
 )
 aria2c -d "$DIRECTORY" -i - <<EOF
 https://raw.githubusercontent.com/mbrubeck/android-completion/master/android
@ -126,25 +123,12 @@ https://raw.githubusercontent.com/omakoto/go-completion.bash/master/go-completio
  out=go
 https://raw.githubusercontent.com/llvm-mirror/clang/master/utils/bash-autocomplete.sh
  out=clang
-https://raw.githubusercontent.com/mernen/completion-ruby/master/completion-ruby
-  out=ruby
-https://raw.githubusercontent.com/mernen/completion-ruby/master/completion-gem
-  out=gem
-https://raw.githubusercontent.com/mernen/completion-ruby/master/completion-bundle
-  out=bundle
-https://raw.githubusercontent.com/mernen/completion-ruby/master/completion-rake
-  out=rake
-https://raw.githubusercontent.com/juven/maven-bash-completion/master/bash_completion.bash
-  out=mvn
 EOF
 printf '\ncomplete -o default -F _ffmpeg ffprobe\n' >> "$DIRECTORY/ffmpeg"
 printf '\ncomplete -o default -F _clang clang++\n' >> "$DIRECTORY/clang"
-printf '\ncomplete -o default -F __bundle bundler\n' >> "$DIRECTORY/bundle"
 for key in "${!ALIASES[@]}"; do
  ln -fvs "$DIRECTORY/${ALIASES[$key]}" "$DIRECTORY/$key"
 done
-grunt --completion=bash > "$DIRECTORY/grunt"
-gulp --completion=bash > "$DIRECTORY/gulp"
 pandoc --bash-completion > "$DIRECTORY/pandoc"
 poetry completions bash > "$DIRECTORY/poetry"
 ln -fvs /usr/share/fzf/completion.bash "$DIRECTORY/fzf"
--- a/.local/arch/packages.aur.txt
+++ b/.local/arch/packages.aur.txt
@ -3,21 +3,15 @@ desmume-git
 discord-ptb
 easyrpg-player
 fakepkg
-freeoffice
-kde-thumbnailer-apk
 kora-icon-theme
-lab-bin
 lib32-gst-plugins-bad
 lib32-gst-plugins-ugly
 mkv-extractor-qt
 nvimpager-git
 otf-alegreya
 otf-alegreya-sans
+otf-fira-go
 otf-firamath
 otf-hasklig
 pandoc-bin
-python-pypresence
-rclone-browser-git
-ttf-fira-go
 ttf-twemoji-color
-virtio-win
--- a/.local/arch/packages.repo.txt
+++ b/.local/arch/packages.repo.txt
@ -24,12 +24,14 @@ doxygen
 eog
 eog-plugins
 exe-thumbnailer
+exfatprogs
 extra-cmake-modules
 fd
 ffmpegthumbs
 firefox-developer-edition
 fontconfig
 fontforge
+freeoffice
 fzf
 gamemode
 gawk
@ -38,6 +40,7 @@ gimp-git
 git
 git-lfs
 github-cli
+glab
 gnupg
 gst-plugins-bad
 gst-plugins-base
@ -108,12 +111,14 @@ python-isort
 python-pip
 python-poetry
 python-pynvim
+python-pypresence
 python-urwid
-qbittorrent
+qbittorrent-qt5
 qemu
 qt5-imageformats
 qutebrowser
 rclone
+rclone-browser
 ripgrep
 rsync
 sddm-kcm
@ -122,6 +127,7 @@ spectacle
 sshfs
 steam
 syncplay
+tea
 terminus-font
 texlive-bibtexextra
 texlive-langgreek
@ -139,7 +145,7 @@ vulkan-icd-loader-git
 vulkan-headers-tkg-git
 waifu2x-ncnn-vulkan-git
 webp-pixbuf-loader
-winetricks-git
+winetricks
 whois
 wine
 words
@ -154,3 +160,4 @@ yt-dlp
 zathura
 zathura-pdf-mupdf
 zip
+zlib-ng
--- a/.local/share/bash/aliases.sh
+++ b/.local/share/bash/aliases.sh
@ -48,17 +48,10 @@ fi
 # -l: use a long listing format
 # -N: print entry names without quoting
 # -1: list one file per line
+export TIME_STYLE=long-iso
 alias ll='ls -lhAFH'
 alias l1='ls -ANFH1'
 alias l='ls -lhNFHB'
 # }}}

-# Alert for long running commands {{{
-alert() { # Use like so: sleep 10; alert
-  # shellcheck disable=SC2181
-  notify-send -u low -i "$( (($?)) && printf error || printf terminal)" \
-    "$(history | sed -e '$!d;s/^[^}]\+}\s*//;s/[;&|]\s*alert$//')"
-}
-# }}}
-
 # vim:fdm=marker:fdl=1:
--- a/.local/share/bash/bashrc.sh
+++ b/.local/share/bash/bashrc.sh
@ -1,5 +1,5 @@
 # Define where cd looks for targets
-[ -d ~/Documents/Code ] && CDPATH='.:~/Documents/Code'
+[ -d "$HOME/Documents/Code" ] && CDPATH='.:~/Documents/Code'

 # Set the primary prompt string
 # shellcheck disable=SC2154
--- a/.yarnrc
+++ b/.yarnrc
@ -1,15 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-disable-self-update-check true
-email chronobserver@disroot.org
-init-author-email chronobserver@disroot.org
-init-author-name ObserverOfTime
-init-author-url "https://observeroftime.github.io"
-init-license MIT
-init-version "0.1.0"
-prefix "~/.local"
-user-agent "yarn/1.22.11 node/v16.11.1 linux x64"
-username ObserverOfTime
-version-git-sign true
--- a/README.md
+++ b/README.md
@ -77,11 +77,11 @@

 * [.config/nvimpager/init.vim](.config/nvimpager/init.vim): configuration file

-## [Pip](https://pypi.org/project/pip/)
+## [Pip](https://pip.pypa.io/en/stable/)

 * [.config/pip/pip.conf](.config/pip/pip.conf): configuration file

-## [Poetry](https://poetry.eustace.io/)
+## [Poetry](https://python-poetry.org/)

 * [.config/pypoetry/config.toml](.config/pypoetry/config.toml): configuration file

@ -105,10 +105,6 @@

 * [.config/X11/XCompose](.config/X11/XCompose): X client character mappings

-## [Yarn](https://yarnpkg.com/lang/en/)
-
-* [.yarnrc](.yarnrc): configuration file
-
 ## [Yay](https://github.com/Jguer/yay)

 * [.config/yay/config.json](.config/yay/config.json): configuration file