Overhaul almost everything

.config/alacritty/alacritty.yml

@@ -12,7 +12,7 @@
     # available, otherwise `xterm-256color` is used.
     #TERM: xterm-256color
 
-#window:
+window:
     # Window dimensions (changes require restart)
     #
     # Specified in number of columns/lines, not pixels.
@@ -33,9 +33,9 @@
     #
     # Blank space added around the window in pixels. This padding is scaled
     # by DPI and the specified value is always added at both opposing sides.
-    #padding:
+    padding:
-    #    x: 0
+        x: 2
-    #    y: 0
+        y: 2
 
     # Spread additional padding evenly around the terminal content.
     #dynamic_padding: false
@@ -283,14 +283,14 @@ background_opacity: 1.0
 # Allow terminal applications to change Alacritty's window title.
 #dynamic_title: true
 
-#cursor:
+cursor:
     # Cursor style
     #
     # Values for `style`:
     #     - ▇ Block
     #     - _ Underline
     #     - | Beam
-    #style: Block
+    style: Beam
 
     # If this is `true`, the cursor will be rendered as a hollow box when the
     # window is not focused.
@@ -512,19 +512,19 @@ mouse:
 # binding with the same triggers is defined. To unset a default binding, it can
 # be mapped to the `ReceiveChar` action. Alternatively, you can use `None` for
 # a no-op if you do not wish to receive input characters for that binding.
-#key_bindings:
+key_bindings:
     # (Windows, Linux, and BSD only)
-    #- { key: V,        mods: Control|Shift, action: Paste            }
+    - { key: V,        mods: Control|Shift, action: Paste            }
-    #- { key: C,        mods: Control|Shift, action: Copy             }
+    - { key: C,        mods: Control|Shift, action: Copy             }
     #- { key: Insert,   mods: Shift,         action: PasteSelection   }
-    #- { key: Key0,     mods: Control,       action: ResetFontSize    }
+    - { key: Key0,     mods: Control,       action: ResetFontSize    }
-    #- { key: Equals,   mods: Control,       action: IncreaseFontSize }
+    - { key: Equals,   mods: Control,       action: IncreaseFontSize }
     #- { key: Add,      mods: Control,       action: IncreaseFontSize }
     #- { key: Subtract, mods: Control,       action: DecreaseFontSize }
-    #- { key: Minus,    mods: Control,       action: DecreaseFontSize }
+    - { key: Minus,    mods: Control,       action: DecreaseFontSize }
 
     # (Windows only)
-    #- { key: Return,   mods: Alt,           action: ToggleFullscreen }
+    - { key: Return,   mods: Alt,           action: ToggleFullscreen }
 
     # (macOS only)
     #- { key: Key0,   mods: Command,         action: ResetFontSize    }

.config/bspwm/bspwmrc

@@ -14,11 +14,15 @@ else
     fi
 fi
 
-command -v st >/dev/null 2>&1
+command -v alacritty >/dev/null 2>&1
 return_val=$?
 if [ $return_val -ne 0 ]; then
-    echo >&2 "Can't seem to find the st executable. Exiting!"
+    command -v st >/dev/null 2>&1
-    bspc quit && exit 1
+    return_val=$?
+    if [ $return_val -ne 0 ]; then
+        echo >&2 "Can't seem to find either the st or the alacritty executable. Exiting!"
+        bspc quit && exit 1
+    fi
 fi
 
 for monitor in $(bspc query -M); do

.config/nvim

@@ -1 +1 @@
-Subproject commit f0811a86fee2858cb3198f8c5e99187f19d39adc
+Subproject commit 78dd440cbc23ad62e8f51a557fbda1f1a730cdc6

.config/sxhkd/sxhkdrc

@@ -117,7 +117,7 @@ alt + ctrl + {Left,Down,Up,Right}
     bspc node -v {-20 0,0 20,0 -20,20 0}
 
 alt + Return
-    st
+    alacritty
 
 # DMENU SCRIPTS
 

.gitignore

@@ -26,5 +26,4 @@
 !/.gnupg/
 !/.weechat/
 !/.ssh/
-!/AUR/
 !/Wallpapers/

.zsh_alias

@@ -1,10 +1,18 @@
 # ===
 # Directory listing
 # ===
-alias la='ls -lahF'
+# command -v exa >/dev/null 2>&1
-alias ll='ls -lhF'
+# if [ $? -eq 0 ]; then
-alias ls='ls -F --color=tty'
+alias ea='exa -lah'
-alias lsa='ls -aF'
+alias ee='exa -lh'
+alias esa='exa -a'
+alias es='exa'
+# else
+alias la='ls -lahf'
+alias ll='ls -lhf'
+alias lsa='ls -af'
+alias ls='ls -f --color=tty'
+# fi
 
 # ===
 # Software

.zshrc

@@ -57,3 +57,8 @@ else
     PS1=$'%b%n@%M %~
 %(!.#.$) '
 fi
+
+command -v zoxide >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+    eval "$(zoxide init zsh)"
+fi

AUR/.gitignore

@@ -1,4 +0,0 @@
-/*
-/*/
-!/.gitignore
-!/update

AUR/update

@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-clean=false
-fetch=false
-minimal=false
-noconfirm=false
-pull=false
-update=false
-verbose=false
-
-for arg in "$@"; do
-    if [[ $arg == "-c" ]] || [[ $arg == "--clean" ]]; then
-        clean=true
-    elif [[ $arg == "-f" ]] || [[ $arg == "--fetch" ]]; then
-        fetch=true
-    elif [[ $arg == "-m" ]] || [[ $arg == "--minimal" ]]; then
-        minimal=true
-    elif [[ $arg == "--noconfirm" ]]; then
-        noconfirm=true
-    elif [[ $arg == "--pull" ]]; then
-        pull=true
-    elif [[ $arg == "-u" ]] || [[ $arg == "--update" ]]; then
-        update=true
-    elif [[ $arg == "-v" ]] || [[ $arg == "--verbose" ]]; then
-        verbose=true
-    elif [[ $arg == "-h" ]] || [[ $arg == "--help" ]]; then
-        echo "Helper script for the AUR directory, which tells you what packages need an update.
-Usage: ./update.sh [options]
-Options:
--c, --clean        Do 'git reset HEAD --hard' and 'git clean -fdx'.
--f, --fetch        Fetch the latest change from the upstream repos.
--m, --minimal      Only show directories in need for an update.
--u, --update       If an update is needed, 'makepkg -si'.
-    --noconfirm    Pass the --noconfirm option to 'makepkg -si', if using the -u/--update option
-    --pull         Pull the latest changes from the repo before running any command. Note that this might fail!
--v, --verbose      Don't suppress the output of any command run within the script."
-        exit 0
-    fi
-done
-
-for dir in *; do
-    if [ -d "$dir" ]; then
-        cd $dir
-        if $fetch; then
-            if $verbose; then
-                git fetch --all
-            else
-                git fetch --all --quiet
-            fi
-        fi
-
-        BEHIND=$(git rev-list HEAD...origin/master --count)
-        if [[ $BEHIND -eq 0 ]]; then
-            if ! $minimal; then
-                echo "[ ] $(pwd) is up to date"
-            fi
-        else
-            echo "[X] $(pwd) is $BEHIND commits behind"
-
-            if $update; then
-                if $pull; then
-                    if $verbose; then
-                        git pull --all
-                    else
-                        git pull --all --quiet
-                    fi
-                fi
-
-                if $noconfirm; then
-                    if $verbose; then
-                        makepkg -si --noconfirm
-                    else
-                        makepkg -si --noconfirm > /dev/null
-                    fi
-                else
-                    if $verbose; then
-                        makepkg -si
-                    else
-                        makepkg -si > /dev/null
-                    fi
-                fi
-            fi
-        fi
-
-        if $clean; then
-            if $verbose; then
-                git reset HEAD --hard
-                git clean -fdx
-            else
-                git reset HEAD --hard --quiet
-                git clean -fdx --quiet
-            fi
-        fi
-
-        cd ..
-    fi
-done