gitconfig: added new command retag

2025-02-13 23:50:24 +01:00
20 changed files with 110 additions and 347 deletions
--- a/.alacritty.yml
+++ b/.alacritty.yml
@ -0,0 +1,82 @@
+font:
+  bold:
+    family: Comic Code
+    style: Bold
+    antialias: true
+  bold_italic:
+    family: Comic Code
+    style: Bold Italic
+    antialias: true
+  italic:
+    family: Comic Code
+    style: Italic
+    antialias: true
+  normal:
+    family: Comic Code
+    style: Medium
+    antialias: true
+  size: 16
+
+offset:
+  x: 0
+  y: 0
+
+glyph_offset:
+  x: 0
+  y: 0
+
+use_thin_strokes: true
+
+mouse:
+  hints:
+    launcher:
+      program: open
+    modifiers: Command
+
+key_bindings:
+  - { key: Return, mods: Control|Shift, action: SpawnNewInstance }
+  - { key: F, mods: Control, action: SearchForward }
+  - { key: V, mods: Control|Shift, action: Paste }
+  - { key: Space, mods: Control, chars: "\x00" }
+
+selection:
+  save_to_clipboard: true
+
+colors:
+  search:
+    focused_match:
+      foreground: "#181818"
+      background: "#ab4642"
+    matches:
+      foreground: "#181818"
+      background: "#f4bf75"
+    footer_bar:
+      background: "#262626"
+      foreground: "#d0d0d0"
+  # Default colors
+  primary:
+    background: "0x000000"
+    foreground: "0xffffff"
+  # Bright colors:
+  bright:
+    black: "0x7f7f7f"
+    blue: "0x5c5cff"
+    cyan: "0x00ffff"
+    green: "0x00ff00"
+    magenta: "0xff00ff"
+    red: "0xff0000"
+    white: "0xffffff"
+    yellow: "0xffff00"
+  # Normal colors
+  normal:
+    black: "0x000000"
+    blue: "0x0000ee"
+    cyan: "0x00cdcd"
+    green: "0x00cd00"
+    magenta: "0xcd00cd"
+    red: "0xcd0000"
+    white: "0xe5e5e5"
+    yellow: "0xcdcd00"
+
+import:
+  - C:\Users\marcin.wozniak\AppData\Roaming\alacritty\dracula.yml
--- a/.brew_programs
+++ b/.brew_programs
@ -3,24 +3,17 @@ coreutils
 dockutil
 duti
 fastfetch
-ffmpeg
 git
 gnu-sed
 htop
 imagemagick
 ipcalc
-iperf3
-mtr
 neovim
 newsboat
 parallel
-pinentry-mac
-ranger
 ripgrep
 rsync
-texinfo
 tmux
 tree
 wget
-zoxide
 zsh
--- a/.brew_programs_cask
+++ b/.brew_programs_cask
@ -1,38 +1,38 @@
-alacritty
-akiflow
 alfred
 chatterino
 dbeaver-community
-discord
 displaylink
 docker
 firefox@nightly
 font-hack-nerd-font
 gimp
-google-chrome
 hiddenbar
+iterm2
+jordanbaird-ice
 karabiner-elements
 keepassxc
+macfuse
 megasync
+microsoft-auto-update
 microsoft-teams
 mongodb-compass
 mpv
+mysides
 obsidian
 platypus
-postman
 qbittorrent
 qview
-rustdesk
 scroll-reverser
 signal
+skype
 spotify
 stats
 telegram
 the-unarchiver
 transfer
 twingate
-visual-studio-code
 vlc
 winbox
 wine-crossover
 wireshark
+zed@preview
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@ -1,89 +0,0 @@
-# use_thin_strokes = true
-[env]
-TERM = "xterm-256color"
-
-[general]
-import = ["~/.config/alacritty/dracula.toml"]
-
-[keyboard]
-bindings = [
-  { key = "F", mods = "Control", action = "SearchForward" },
-  { key = "Left", mods = "Alt", chars = "\u001BB" },
-  { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" },
-  { key = "Right", mods = "Alt", chars = "\u001BF" },
-  { key = "Space", mods = "Control", chars = "\u0000" },
-  { key = "V", mods = "Control|Shift", action = "Paste" },
-]
-
-[font]
-size = 22
-
-[font.normal]
-family = "Terminess Nerd Font"
-style = "Regular"
-
-# [font.bold]
-# family = "Teminess Nerd Font"
-# style = "Bold"
-
-[font.bold_italic]
-family = "Terminess Nerd Font"
-style = "Bold Italic"
-
-[font.italic]
-family = "Terminess Nerd Font"
-style = "Italic"
-
-[font.glyph_offset]
-x = 0
-y = 0
-
-# [mouse.hints]
-# modifiers = "Command"
-
-# [mouse.hints.launcher]
-# program = "open"
-
-[font.offset]
-x = 0
-y = 0
-
-[selection]
-save_to_clipboard = true
-
-# Unused
-[colors.bright]
-black = "0x7f7f7f"
-blue = "0x5c5cff"
-cyan = "0x00ffff"
-green = "0x00ff00"
-magenta = "0xff00ff"
-red = "0xff0000"
-white = "0xffffff"
-yellow = "0xffff00"
-
-[colors.normal]
-black = "0x000000"
-blue = "0x0000ee"
-cyan = "0x00cdcd"
-green = "0x00cd00"
-magenta = "0xcd00cd"
-red = "0xcd0000"
-white = "0xe5e5e5"
-yellow = "0xcdcd00"
-
-[colors.primary]
-background = "0x000000"
-foreground = "0xffffff"
-
-[colors.search.focused_match]
-background = "#ab4642"
-foreground = "#181818"
-
-# [colors.search.footer_bar]
-# background = "#262626"
-# foreground = "#d0d0d0"
-
-[colors.search.matches]
-background = "#f4bf75"
-foreground = "#181818"
--- a/.config/alacritty/dracula.toml
+++ b/.config/alacritty/dracula.toml
@ -1,76 +0,0 @@
-# Dracula theme for Alacritty
-# https://draculatheme.com/alacritty
-#
-# Color palette
-# https://spec.draculatheme.com
-#
-# Instructions
-# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd
-
-[colors.primary]
-
-background = "#282a36"
-foreground = "#f8f8f2"
-bright_foreground = "#ffffff"
-
-[colors.cursor]
-
-text = "#282a36"
-cursor = "#f8f8f2"
-
-[colors.vi_mode_cursor]
-
-text = "CellBackground"
-cursor = "CellForeground"
-
-[colors.selection]
-
-text = "CellForeground"
-background = "#44475a"
-
-[colors.normal]
-
-black = "#21222c"
-red = "#ff5555"
-green = "#50fa7b"
-yellow = "#f1fa8c"
-blue = "#bd93f9"
-magenta = "#ff79c6"
-cyan = "#8be9fd"
-white = "#f8f8f2"
-
-[colors.bright]
-
-black = "#6272a4"
-red = "#ff6e6e"
-green = "#69ff94"
-yellow = "#ffffa5"
-blue = "#d6acff"
-magenta = "#ff92df"
-cyan = "#a4ffff"
-white = "#ffffff"
-
-[colors.search.matches]
-
-foreground = "#44475a"
-background = "#50fa7b"
-
-[colors.search.focused_match]
-
-foreground = "#44475a"
-background = "#ffb86c"
-
-[colors.footer_bar]
-
-background = "#282a36"
-foreground = "#f8f8f2"
-
-[colors.hints.start]
-
-foreground = "#282a36"
-background = "#f1fa8c"
-
-[colors.hints.end]
-
-foreground = "#f1fa8c"
-background = "#282a36"
--- a/.config/iterm2/AppSupport
+++ b/.config/iterm2/AppSupport
@ -0,0 +1 @@
+/Users/yorune/Library/Application Support/iTerm2
--- a/.config/karabiner/karabiner.json
+++ b/.config/karabiner/karabiner.json
@ -256,14 +256,6 @@
                        {
                            "from": { "consumer_key_code": "eject" },
                            "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }]
-                        },
-                        {
-                            "from": { "key_code": "right_command" },
-                            "to": [{ "key_code": "right_option" }]
-                        },
-                        {
-                            "from": { "key_code": "right_option" },
-                            "to": [{ "key_code": "right_command" }]
                        }
                    ]
                },
@ -403,6 +395,10 @@
                    "from": { "key_code": "caps_lock" },
                    "to": [{ "key_code": "escape" }]
                },
+                {
+                    "from": { "key_code": "grave_accent_and_tilde" },
+                    "to": [{ "key_code": "non_us_backslash" }]
+                },
                {
                    "from": { "key_code": "left_command" },
                    "to": [{ "key_code": "right_command" }]
--- a/.config/mpv/mpv.conf
+++ b/.config/mpv/mpv.conf
@ -14,7 +14,6 @@ keep-open=yes

 # Always save the current playback position on exit
 save-position-on-quit=yes
-# ontop=yes

 # Geometry settings
 geometry=50%:50%
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@ -637,13 +637,10 @@ autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
 autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>

 " Yaml
-autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_enabled = 1
-autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_char = '⦙'
+autocmd BufRead,BufNewFile *.yaml let g:indentLine_enabled = 1
+autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙'
 au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif
-autocmd BufWritePre *.yaml,*.yml silent! undojoin | Neoformat prettier
-
-" JSON
-autocmd BufWritePre *.json silent! undojoin | Neoformat prettier
+autocmd BufWritePre *.yaml silent! undojoin | Neoformat prettier

 " GoLang
 autocmd BufRead *.go set noexpandtab
--- a/.config/streamlink/config
+++ b/.config/streamlink/config
@ -1,12 +1,5 @@
-default-stream "1080p60,1080p,720p60,720p"
-default-stream best
-hls-live-edge 2
-hls-segment-stream-data
-player-no-close
 player=mpv
-retry-max 100
-retry-open 10
-retry-streams 10
-stream-segment-threads=4
 twitch-disable-ads
 twitch-low-latency
+default-stream best
+player-no-close
--- a/.gitconfig.local
+++ b/.gitconfig.local
@ -32,7 +32,6 @@
    c = commit --author='Marcin Woźniak <y0rune@aol.com> -s'
    cw = commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com> -s'
    retag = "!f() { if [ -z \"$1\" ]; then echo \"No version provided. Skipping git push.\"; else git tag --delete $1 2>/dev/null; git tag -a $1 -m \"Version $1\"; git push --tags -f; git push -f; fi; }; f"
-    delete-branch = "!$HOME/.local/bin/git-delete-branch"

 [url "git@github.com:"]
    insteadOf = "https://github.com/"
--- a/.gitignore
+++ b/.gitignore
@ -278,5 +278,3 @@ golang
 Cisco Packet Tracer 8.0.0
 .local/bin/kubectl
 .rustup
-.local/tss-sdk
-.local/bin/tss
--- a/.local/bin/Update-pkg
+++ b/.local/bin/Update-pkg
@ -199,7 +199,6 @@ function install_terragrunt() {
            timestamp "The current version of the TSS-SDK is the same as the newest version"
            return 0
        else
-            brew install wget
            wget https://github.com/gruntwork-io/terragrunt/releases/latest/download/terragrunt_linux_amd64 -O $TERRAGRUNT
            chmod +x "$TERRAGRUNT"
        fi
@ -300,8 +299,6 @@ function install_fzf() {
 function install_zsh_addons() {

    if [ ! -d $ZSHFOLDER/aws ]; then
-        mkdir -p "$ZSHFOLDER/azure-cli" "$ZSHFOLDER/aws"
-
        curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh \
            -o "$ZSHFOLDER"/aws/aws.plugin.zsh &&
            timestamp "Downloaded the newest version of aws plugin for zsh"
@ -310,6 +307,7 @@ function install_zsh_addons() {
            -o "$ZSHFOLDER"/azure-cli/az.completion &&
            timestamp "Downloaded the newest version of az plugin for zsh"

+        mkdir -p "$ZSHFOLDER/azure-cli" "$ZSHFOLDER/aws"
        cd $ZSHFOLDER || err "Folder $ZSHFOLDER has been NOT found"
        git clone https://github.com/popstas/zsh-command-time.git &&
            timestamp "Cloning the zsh-command-time"
@ -486,93 +484,6 @@ function install_winbox_old() {
    xattr -cr ~/Applications/winbox.exe
 }

-function install_prettier() {
-    $install prettier
-    $install prettierd
-}
-
-function install_google_cloud_sdk() {
-    # Install google cloud sdk
-    if [[ "$(uname)" == "Darwin" ]]; then
-        $install google-cloud-sdk
-    else
-        curl -s https://sdk.cloud.google.com | bash
-    fi
-}
-
-function install_lib_wandio() {
-    local REPO="LibtraceTeam/wandio"
-    local REMOTE_VERSION=$(curl -s \
-        https://api.github.com/repos/$REPO/releases/latest |
-        grep -iEo '"tag_name":.*' |
-        sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
-    local RELEASE="${REMOTE_VERSION}.tar.gz"
-    local DEST="/tmp/wandio-$REMOTE_VERSION.tar.gz"
-    local DEST_FOLDER="/tmp/wandio-$REMOTE_VERSION"
-
-    $install autoconf automake libtool
-    wget https://github.com/$REPO/archive/refs/tags/$RELEASE -O $DEST
-    tar -xvf $DEST -C /tmp
-    cd $DEST_FOLDER || err "Folder $DEST_FOLDER has been NOT found"
-    ./bootstrap.sh
-    ./configure
-    make -j"$(nproc)"
-    sudo make install && timestamp "Installed the newest version of the $REPO"
-    rm -rfv $DEST $DEST_FOLDER
-}
-
-function install_bgpreader() {
-    local CURRENT_VERSION="0.0.0"
-    local REPO="CAIDA/libbgpstream"
-    local NAME="${REPO##*/}"
-    local REMOTE_VERSION=$(curl -s \
-        https://api.github.com/repos/$REPO/releases/latest |
-        grep -iEo '"tag_name":.*' |
-        sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
-    local RELEASE="$NAME-${REMOTE_VERSION/v/}.tar.gz"
-    local DEST="/tmp/$NAME-$REMOTE_VERSION.tar.gz"
-    local DEST_FOLDER="/tmp/$NAME-$REMOTE_VERSION"
-
-    if command_exists bgpreader; then
-        CURRENT_VERSION="v$(bgpreader -v 2>&1 | grep -ioE '[0-9\.]+')"
-    fi
-
-    if [ "$CURRENT_VERSION" == "$REMOTE_VERSION" ]; then
-        timestamp "The current version of the BGPREADER is the same as the newest version"
-        return 0
-    else
-        $install autoconf automake libtool
-        command_start install_lib_wandio
-        wget https://github.com/$REPO/releases/download/$REMOTE_VERSION/$RELEASE -O $DEST
-        tar -xvf $DEST -C /tmp
-        cd /tmp/$NAME-* || err "Folder /tmp/$NAME-* has been NOT found"
-        ./configure --without-kafka
-        make -j"$(nproc)"
-        sudo make install && timestamp "Installed the newest version of the $REPO"
-        rm -rfv /tmp/$NAME-*
-    fi
-}
-
-function install_font_terminess() {
-    local REPO="ryanoasis/nerd-fonts"
-    local REMOTE_VERSION=$(curl -s \
-        https://api.github.com/repos/$REPO/releases/latest |
-        grep -iEo '"tag_name":.*' |
-        sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
-    local RELEASE="Terminus.zip"
-    local DEST="/tmp/Terminess"
-
-    if [ ! -f $HOME/Library/Fonts/TerminessNerdFont-Regular.ttf ]; then
-        mkdir -p $DEST
-        cd $DEST || err "Folder $DEST has been NOT found"
-        wget https://github.com/$REPO/releases/download/$REMOTE_VERSION/$RELEASE -O $DEST/$RELEASE
-        unzip $RELEASE -d $DEST
-        mv $DEST/*.ttf ~/Library/Fonts
-        cd $HOME || err "Folder $HOME has been NOT found"
-        rm -rfv $DEST
-    fi
-}
-
 function main() {
    command_start update_pip
    command_start install_neovim_module_for_python
@ -610,10 +521,6 @@ function main() {
    command_start install_streamlink
    command_start install_fzf
    command_start install_winbox_old
-    command_start install_prettier
-    command_start install_google_cloud_sdk
-    command_start install_bgpreader
-    command_start install_font_terminess
    command_start install_zsh_addons
    command_start install_brew_programs
 }
--- a/.local/bin/browser-x
+++ b/.local/bin/browser-x
@ -6,7 +6,7 @@ export QT_IM_MODULE=ibus
 KERNEL=$(uname -sr)
 [[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@"
 [[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@"
-[[ $KERNEL =~ "Darwin" ]] && open -a Firefox\ Nightly "$@"
+[[ $KERNEL =~ "Darwin" ]] && open -a firefox -u "$2"
 #[[ $KERNEL =~ "gentoo" ]] && __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 GDK_DPI_SCALE="1.2" firefox "$@"

 # Firefox
--- a/.local/bin/ffmpeg-resize-sub
+++ b/.local/bin/ffmpeg-resize-sub
@ -1,16 +0,0 @@
-#!/bin/bash
-FILE_FFMPEG="$1"
-ffmpeg -i "$FILE_FFMPEG" \
-    -vf "scale=1920:1080" \
-    -c:v h264_videotoolbox \
-    -b:v 3000k \
-    -preset medium \
-    -movflags \
-    +faststart \
-    -c:a aac \
-    -b:a 192k \
-    -ac 2 \
-    -map 0:v \
-    -map 0:a \
-    -map 0:s \
-    -c:s copy resized.mkv
--- a/.local/bin/getting-spotify
+++ b/.local/bin/getting-spotify
@ -1,21 +1,15 @@
 #!/bin/bash

-FOLDER_AUDIOBOOK="/Volumes/Music/Jellyfin/Playlist-Audiobook"
 FOLDER_FAV="/Volumes/Music/Jellyfin/Playlist-Fav"
 FOLDER_DUB="/Volumes/Music/Jellyfin/Playlist-Dub"
-FOLDER_PIANO="/Volumes/Music/Jellyfin/Playlist-Piano"

 # Check if folder exists
-[ ! -d $FOLDER_AUDIOBOOK ] && exit 1
 [ ! -d $FOLDER_DUB ] && exit 1
 [ ! -d $FOLDER_FAV ] && exit 1
-[ ! -d $FOLDER_PIANO ] && exit 1

 # Remove old files
-rm -rfv $FOLDER_AUDIOBOOK/errors.txt
 rm -rfv $FOLDER_DUB/errors.txt
 rm -rfv $FOLDER_FAV/errors.txt
-rm -rfv $FOLDER_PIANO/errors.txt

 # Download new files for DUB
 cd $FOLDER_DUB || exit 1
@ -38,26 +32,16 @@ spotdl --user-auth --keep-alive \
    --yt-dlp-args no-check-certificates

 # Sync to Jellyfin
-rsync -h --progress --recursive --ignore-existing \
-    $FOLDER_AUDIOBOOK/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Audiobook
-
 rsync -h --progress --recursive --ignore-existing \
    $FOLDER_DUB/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Dub

 rsync -h --progress --recursive --ignore-existing \
    $FOLDER_FAV/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Fav

-rsync -h --progress --recursive --ignore-existing \
-    $FOLDER_PIANO/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Piano
-
 # Generate playlist
-ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Audiobook; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
-
 ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Dub; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"

 ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Fav; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"

-ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Piano; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
-
 # Fix permissions
 ssh docker-de -t 'chown docker-user: /mnt/HC_Volume_34966154/jellifin -R'
--- a/.local/bin/notify-program
+++ b/.local/bin/notify-program
@ -2,4 +2,3 @@
 KERNEL=$(uname -sr)
 [[ $KERNEL =~ "icrosoft" ]] && $HOME/.local/bin/wsl-notify "$@"
 [[ $KERNEL =~ "gentoo" ]] && /usr/bin/notify-send "$@"
-[[ $KERNEL =~ "Darwin" ]] && osascript -e "display notification \"$*\""
--- a/.local/bin/youtube-dl
+++ b/.local/bin/youtube-dl
@ -0,0 +1 @@
+/usr/local/bin/yt-dlp
--- a/.tilde-switch
+++ b/.tilde-switch
@ -1 +0,0 @@
-hidutil property --set '{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000035,"HIDKeyboardModifierMappingDst":0x700000064},{"HIDKeyboardModifierMappingSrc":0x700000064,"HIDKeyboardModifierMappingDst":0x700000035}]}'
--- a/.zshrc
+++ b/.zshrc
@ -4,11 +4,11 @@ CONFIG=$HOME/.config

 parse_git_branch() {
    command=$(git branch \
-        2> /dev/null |
+        2>/dev/null |
        sed -n -e 's/^\* \(.*\)/\1/p' |
        awk 'NF{print $NF}' |
        sed 's/)//g' \
-            2> /dev/null)
+            2>/dev/null)
    [ -z $command ] && echo -e "$ " || echo -e "$command $ "
 }

@ -33,11 +33,11 @@ plugins=(rake ruby vagrant knife knife_ssh kitchen)
 ZSH_DISABLE_COMPFIX=true
 source $ZSH/oh-my-zsh.sh

-[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
-[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
-[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null
-[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null
-[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>> /dev/null
+[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>>/dev/null
+[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>>/dev/null
+[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>>/dev/null
+[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>>/dev/null
+[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>>/dev/null
 [ -f $HOME/.password ] && source $HOME/.password
 [ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
@ -167,7 +167,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
    alias sleep-lid-off="sudo pmset -b sleep 0; sudo pmset -b disablesleep 1"
    alias sleep-lid-on="sudo pmset -b sleep 5; sudo pmset -b disablesleep 0"
    alias restart-network-share="sudo pkill -i netauthsysagent"
-    alias streamlink="streamlink --config $HOME/.config/streamlink/config"

    # Terraform
    export TFENV_ARCH=amd64
@ -189,7 +188,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
 fi

 # Setting the right editor
-if which nvim > /dev/null 2>&1; then
+if which nvim >/dev/null 2>&1; then
    export VISUAL='nvim -u $HOME/.vimrc'
    export EDITOR='nvim -u $HOME/.vimrc'
 else
@ -225,9 +224,6 @@ alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
 alias irc="ssh mikrus -t 'screen -r'"
 alias neofetch=fastfetch

-# Zoxide
-[ -f $(which zoxide) ] && {eval "$(zoxide init zsh)"; alias cd='z'}
-
 # GoLang
 alias go-mod="go mod edit -go $(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g');  go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy"
				`@ -0,0 +1 @@`
				`/Users/yorune/Library/Application Support/iTerm2`
				`@ -1 +0,0 @@`
				`hidutil property --set '{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000035,"HIDKeyboardModifierMappingDst":0x700000064},{"HIDKeyboardModifierMappingSrc":0x700000064,"HIDKeyboardModifierMappingDst":0x700000035}]}'`