From 30d8648fd614e5c1e82305ccb7c281f5692b4f78 Mon Sep 17 00:00:00 2001 From: DustVoice Date: Mon, 29 Mar 2021 09:38:12 +0200 Subject: [PATCH] Overhaul almost everything --- .config/alacritty/alacritty.yml | 26 ++++----- .config/bspwm/bspwmrc | 10 ++-- .config/nvim | 2 +- .config/sxhkd/sxhkdrc | 2 +- .gitignore | 1 - .zsh_alias | 16 ++++-- .zshrc | 5 ++ AUR/.gitignore | 4 -- AUR/update | 96 --------------------------------- 9 files changed, 39 insertions(+), 123 deletions(-) delete mode 100644 AUR/.gitignore delete mode 100755 AUR/update diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index fee772d..7ab978b 100644 --- a/.config/alacritty/alacritty.yml +++ b/.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: - # x: 0 - # y: 0 + padding: + x: 2 + 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: C, mods: Control|Shift, action: Copy } + - { key: V, mods: Control|Shift, action: Paste } + - { key: C, mods: Control|Shift, action: Copy } #- { key: Insert, mods: Shift, action: PasteSelection } - #- { key: Key0, mods: Control, action: ResetFontSize } - #- { key: Equals, mods: Control, action: IncreaseFontSize } + - { key: Key0, mods: Control, action: ResetFontSize } + - { 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 } diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index ff0adc8..9841362 100755 --- a/.config/bspwm/bspwmrc +++ b/.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!" - bspc quit && exit 1 + command -v st >/dev/null 2>&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 diff --git a/.config/nvim b/.config/nvim index f0811a8..78dd440 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit f0811a86fee2858cb3198f8c5e99187f19d39adc +Subproject commit 78dd440cbc23ad62e8f51a557fbda1f1a730cdc6 diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 453ccc4..d56ba7b 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.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 diff --git a/.gitignore b/.gitignore index 10888ff..706c745 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,4 @@ !/.gnupg/ !/.weechat/ !/.ssh/ -!/AUR/ !/Wallpapers/ diff --git a/.zsh_alias b/.zsh_alias index a509541..5978c14 100644 --- a/.zsh_alias +++ b/.zsh_alias @@ -1,10 +1,18 @@ # === # Directory listing # === -alias la='ls -lahF' -alias ll='ls -lhF' -alias ls='ls -F --color=tty' -alias lsa='ls -aF' +# command -v exa >/dev/null 2>&1 +# if [ $? -eq 0 ]; then +alias ea='exa -lah' +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 diff --git a/.zshrc b/.zshrc index c2cee78..255aa38 100644 --- a/.zshrc +++ b/.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 diff --git a/AUR/.gitignore b/AUR/.gitignore deleted file mode 100644 index b1b64ed..0000000 --- a/AUR/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/* -/*/ -!/.gitignore -!/update diff --git a/AUR/update b/AUR/update deleted file mode 100755 index 2348971..0000000 --- a/AUR/update +++ /dev/null @@ -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