brew_programs_cask: new version

Signed-off-by: Marcin Woźniak <y0rune@aol.com>

.brew_programs

@@ -3,18 +3,24 @@ 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

.brew_programs_cask

@@ -1,7 +1,9 @@
-alfred
 alacritty
+akiflow
+alfred
 chatterino
 dbeaver-community
+discord
 displaylink
 docker
 firefox@nightly
@@ -9,32 +11,28 @@ font-hack-nerd-font
 gimp
 google-chrome
 hiddenbar
-jordanbaird-ice
 karabiner-elements
 keepassxc
-macfuse
 megasync
-microsoft-auto-update
 microsoft-teams
 mongodb-compass
 mpv
-mysides
 obsidian
-postman
 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

.config/alacritty/alacritty.toml

@@ -5,25 +5,15 @@ TERM = "xterm-256color"
 [general]
 import = ["~/.config/alacritty/dracula.toml"]
 
-[[keyboard.bindings]]
+[keyboard]
-action = "SpawnNewInstance"
+bindings = [
-key = "Return"
+  { key = "F", mods = "Control", action = "SearchForward" },
-mods = "Control|Shift"
+  { key = "Left", mods = "Alt", chars = "\u001BB" },
-
+  { key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" },
-[[keyboard.bindings]]
+  { key = "Right", mods = "Alt", chars = "\u001BF" },
-action = "SearchForward"
+  { key = "Space", mods = "Control", chars = "\u0000" },
-key = "F"
+  { key = "V", mods = "Control|Shift", action = "Paste" },
-mods = "Control"
+]
-
-[[keyboard.bindings]]
-action = "Paste"
-key = "V"
-mods = "Control|Shift"
-
-[[keyboard.bindings]]
-chars = "\u0000"
-key = "Space"
-mods = "Control"
 
 [font]
 size = 22
@@ -61,8 +51,6 @@ y = 0
 [selection]
 save_to_clipboard = true
 
-[keyboard]
-
 # Unused
 [colors.bright]
 black = "0x7f7f7f"

.config/iterm2/AppSupport

@@ -1 +0,0 @@
-/Users/yorune/Library/Application Support/iTerm2

.config/karabiner/karabiner.json

@@ -256,6 +256,14 @@
                         {
                             "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" }]
                         }
                     ]
                 },
@@ -395,10 +403,6 @@
                     "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" }]

.config/mpv/mpv.conf

@@ -14,7 +14,7 @@ keep-open=yes
 
 # Always save the current playback position on exit
 save-position-on-quit=yes
-ontop=yes
+# ontop=yes
 
 # Geometry settings
 geometry=50%:50%

.config/nvim/init.vim

@@ -642,6 +642,9 @@ autocmd BufRead,BufNewFile *.yaml,*.yml 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
+
 " GoLang
 autocmd BufRead *.go set noexpandtab
 autocmd BufWritePre *.go lua go_org_imports()

.gitignore

@@ -278,3 +278,5 @@ golang
 Cisco Packet Tracer 8.0.0
 .local/bin/kubectl
 .rustup
+.local/tss-sdk
+.local/bin/tss

.local/bin/Update-pkg

@@ -199,6 +199,7 @@ 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
@@ -299,6 +300,8 @@ 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"
@@ -307,7 +310,6 @@ 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"
@@ -611,7 +613,7 @@ function main() {
     command_start install_prettier
     command_start install_google_cloud_sdk
     command_start install_bgpreader
-    command_start install_fonts_terminess
+    command_start install_font_terminess
     command_start install_zsh_addons
     command_start install_brew_programs
 }

.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 -u "$2"
+[[ $KERNEL =~ "Darwin" ]] && open -a Firefox\ Nightly "$@"
 #[[ $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

.local/bin/ffmpeg-resize-sub

@@ -0,0 +1,16 @@
+#!/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

.local/bin/getting-spotify

@@ -1,15 +1,21 @@
 #!/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
@@ -32,16 +38,26 @@ 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'

.local/bin/notify-program

@@ -2,3 +2,4 @@
 KERNEL=$(uname -sr)
 [[ $KERNEL =~ "icrosoft" ]] && $HOME/.local/bin/wsl-notify "$@"
 [[ $KERNEL =~ "gentoo" ]] && /usr/bin/notify-send "$@"
+[[ $KERNEL =~ "Darwin" ]] && osascript -e "display notification \"$*\""

.local/bin/youtube-dl

@@ -1 +0,0 @@
-/usr/local/bin/yt-dlp

.tilde-switch

@@ -0,0 +1 @@
+hidutil property --set '{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000035,"HIDKeyboardModifierMappingDst":0x700000064},{"HIDKeyboardModifierMappingSrc":0x700000064,"HIDKeyboardModifierMappingDst":0x700000035}]}'

.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-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-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/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/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/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
@@ -189,7 +189,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,6 +225,9 @@ 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"