Updates

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

.brew_programs

@@ -12,17 +12,16 @@ ipcalc
 iperf3
 mtr
 neovim
+newsboat
 parallel
 pinentry-mac
 ranger
 ripgrep
 rsync
-taplo
 telnet
 texinfo
 tmux
 tree
-uv
 watch
 wget
 zoxide

.brew_programs_cask

@@ -1,32 +1,30 @@
 alacritty
-brave-browser
+brave
 chatterino
 dbeaver-community
 discord
 displaylink
 docker
-excalidrawz
 firefox
 font-hack-nerd-font
+gimp
 karabiner-elements
 keepassxc
 megasync
 microsoft-teams
+mongodb-compass
 mpv
-obs
 obsidian
 platypus
-podman-desktop
 postman
 qbittorrent
 rustdesk
 scroll-reverser
 signal
-slack
 spotify
+stats
 telegram
 the-unarchiver
-thunderbird
 transfer
 twingate
 visual-studio-code

.brew_programs_disable

@@ -1,2 +1 @@
 example
-displaylink

.config/Ublock.txt

@@ -1,11 +1,12 @@
 {
-  "timeStamp": 1779457464224,
+  "timeStamp": 1753482850400,
-  "version": "1.71.0",
+  "version": "1.63.2",
   "userSettings": {
-    "externalLists": "https://abpvn.com/filter/abpvn-IPl6HE.txt\nhttps://easylist-downloads.adblockplus.org/advblock.txt\nhttps://easylist-downloads.adblockplus.org/antiadblockfilters.txt\nhttps://easylist-downloads.adblockplus.org/easylistchina.txt\nhttps://easylist-downloads.adblockplus.org/easylistdutch.txt\nhttps://easylist-downloads.adblockplus.org/easylistpolish.txt\nhttps://easylist-downloads.adblockplus.org/easylistportuguese.txt\nhttps://easylist-downloads.adblockplus.org/koreanlist.txt\nhttps://easylist-downloads.adblockplus.org/liste_fr.txt\nhttps://easylist.to/easylist/easylist.txt\nhttps://easylist.to/easylist/easyprivacy.txt\nhttps://easylist.to/easylist/fanboy-social.txt\nhttps://hole.cert.pl/domains/domains_adblock.txt\nhttps://malware-filter.gitlab.io/malware-filter/phishing-filter.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion Sprout's Anti-Malware List.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt\nhttps://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts\nhttps://raw.githubusercontent.com/FiltersHeroes/KAD/master/KAD.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhole.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhosts.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PAF_supp.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAntiAnnoyingSpecialSupplement/master/polish_rss_filters.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/adblock_social_list.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/social_filters_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/cookies_filters/cookies_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_adguard.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_test.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adservers.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt\nhttps://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt\nhttps://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt\nhttps://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list\nhttps://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/adblock.txt\nhttps://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/anti-adblock.txt\nhttps://raw.githubusercontent.com/quenhus/uBlock-Origin-dev-filter/main/dist/all_search_engines/global.txt\nhttps://raw.githubusercontent.com/xxcriticxx/.pl-host-file/master/hosts.txt\nhttps://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt\nhttps://secure.fanboy.co.nz/fanboy-annoyance.txt\nhttps://secure.fanboy.co.nz/fanboy-cookiemonster.txt\nhttps://winhelp2002.mvps.org/hosts.txt\nhttps://www.i-dont-care-about-cookies.eu/abp/\nhttps://www.zoso.ro/pages/rolist.txt",
+    "externalLists": "https://abpvn.com/filter/abpvn-IPl6HE.txt\nhttps://alleblock.pl/alleblock/alleblock.txt\nhttps://easylist-downloads.adblockplus.org/advblock.txt\nhttps://easylist-downloads.adblockplus.org/antiadblockfilters.txt\nhttps://easylist-downloads.adblockplus.org/easylistchina.txt\nhttps://easylist-downloads.adblockplus.org/easylistdutch.txt\nhttps://easylist-downloads.adblockplus.org/easylistpolish.txt\nhttps://easylist-downloads.adblockplus.org/easylistportuguese.txt\nhttps://easylist-downloads.adblockplus.org/koreanlist.txt\nhttps://easylist-downloads.adblockplus.org/liste_fr.txt\nhttps://easylist.to/easylist/easylist.txt\nhttps://easylist.to/easylist/easyprivacy.txt\nhttps://easylist.to/easylist/fanboy-social.txt\nhttps://hole.cert.pl/domains/domains_adblock.txt\nhttps://malware-filter.gitlab.io/malware-filter/phishing-filter.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/Dandelion Sprout's Anti-Malware List.txt\nhttps://raw.githubusercontent.com/DandelionSprout/adfilt/master/NorwegianExperimentalList alternate versions/NordicFiltersABP-Inclusion.txt\nhttps://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts\nhttps://raw.githubusercontent.com/FiltersHeroes/KAD/master/KAD.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhole.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADhosts.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PAF_supp.txt\nhttps://raw.githubusercontent.com/FiltersHeroes/PolishAntiAnnoyingSpecialSupplement/master/polish_rss_filters.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/adblock_social_list.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/adblock_social_filters/social_filters_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/cookies_filters/cookies_uB_AG.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_adguard.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_test.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_ublock.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adservers.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile.txt\nhttps://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/hostfile_regex.txt\nhttps://raw.githubusercontent.com/gioxx/xfiles/master/filtri.txt\nhttps://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt\nhttps://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/nocoin.txt\nhttps://raw.githubusercontent.com/mmotti/pihole-regex/master/regex.list\nhttps://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/adblock.txt\nhttps://raw.githubusercontent.com/olegwukr/polish-privacy-filters/master/anti-adblock.txt\nhttps://raw.githubusercontent.com/quenhus/uBlock-Origin-dev-filter/main/dist/all_search_engines/global.txt\nhttps://raw.githubusercontent.com/xxcriticxx/.pl-host-file/master/hosts.txt\nhttps://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt\nhttps://secure.fanboy.co.nz/fanboy-annoyance.txt\nhttps://secure.fanboy.co.nz/fanboy-cookiemonster.txt\nhttps://winhelp2002.mvps.org/hosts.txt\nhttps://www.i-dont-care-about-cookies.eu/abp/\nhttps://www.zoso.ro/pages/rolist.txt",
     "ignoreGenericCosmeticFilters": true,
     "importedLists": [
       "https://abpvn.com/filter/abpvn-IPl6HE.txt",
+      "https://alleblock.pl/alleblock/alleblock.txt",
       "https://easylist-downloads.adblockplus.org/advblock.txt",
       "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
       "https://easylist-downloads.adblockplus.org/easylistchina.txt",
@@ -65,6 +66,7 @@
     "adguard-generic",
     "adguard-mobile",
     "easyprivacy",
+    "adguard-spyware",
     "urlhaus-1",
     "plowe-0",
     "dpollock-0",
@@ -74,7 +76,6 @@
     "ublock-cookies-adguard",
     "fanboy-social",
     "adguard-social",
-    "fanboy-ai-suggestions",
     "easylist-chat",
     "easylist-newsletters",
     "easylist-notifications",
@@ -126,6 +127,7 @@
     "https://abpvn.com/filter/abpvn-IPl6HE.txt",
     "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock_test.txt",
     "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt",
+    "https://alleblock.pl/alleblock/alleblock.txt",
     "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-pihole-filters/adservers.txt",
     "https://hole.cert.pl/domains/domains_adblock.txt",
     "https://easylist.to/easylist/easylist.txt",

.config/nvim/init.vim

@@ -413,7 +413,7 @@ set laststatus=3
 lua <<EOF
 vim.o.statusline = table.concat({
   "%#IncSearch#",
-  "%{&filetype!=#''?'  ['.&filetype..'] ':' '}",
+  "%{&filetype!=#''?'  ['.&filetype..'] ':'\\ '}",
   "%{&modified?'[+] ':''}",
   "%#CursorLineNr#",
   " %F",

.local/bin/Update-pkg

@@ -259,6 +259,12 @@ function install_ansible-language-server() {
     sudo npm -s -g i yaml-language-server --force
 }
 
+function install_meraki_ansible() {
+    # Install python, ansible module for meraki
+    ansible-galaxy collection install cisco.meraki --force
+    $pip install meraki $PIPEXT
+}
+
 function install_azure_cli() {
     # Install azure_cli
     $install azure-cli
@@ -269,6 +275,11 @@ function install_awscli() {
     $install awscli
 }
 
+function install_aws_adfs() {
+    # Install aws-adfs
+    $pip install aws-adfs $PIPEXTPRE
+}
+
 function install_ytdlp() {
     # Install yt-dlp
     $pip install yt-dlp $PIPEXTPRE
@@ -433,6 +444,11 @@ function install_tss_client() {
     fi
 }
 
+function install_taplo() {
+    # Install taplo
+    $install taplo
+}
+
 function install_precommit() {
     # Install pre-commit
     $pip install pre-commit $PIPEXTPRE
@@ -469,7 +485,7 @@ function install_brew_programs() {
         if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]] &&
             [[ ! " ${LIST_OF_PROGRAMS_DISABLE[*]} " =~ ${i} ]]; then
             timestamp "Installing the $i brew cask program"
-            brew install $i --cask --appdir=~/Applications --force
+            brew install $i --cask --force
         fi
     done
 
@@ -594,15 +610,18 @@ function main() {
     command_start install_terragrunt
     command_start install_azure_cli
     command_start install_ansible
+    command_start install_meraki_ansible
     command_start install_ansible-language-server
     command_start install_ytdlp
     command_start install_spotifydl
     command_start install_awscli
+    command_start install_aws_adfs
     command_start install_speedtest
     command_start install_gh_cli
     command_start install_kubernetes
     command_start install_rust
     command_start install_tss_client "1.5.9"
+    command_start install_taplo
     command_start install_precommit
     command_start install_streamlink
     command_start install_fzf
@@ -612,6 +631,7 @@ function main() {
     command_start install_font_terminess
     command_start install_zsh_addons
     command_start install_brew_programs
+    command_start update_zsh
 }
 
 main

.local/bin/mount-synology

@@ -1,24 +1,22 @@
 #!/bin/bash
 ~/.local/bin/sidebar-restore-macos
-open -gj "smb://10.0.0.14/Downloads"
+open -gj "afp://10.0.0.14/Downloads"
 sleep 10
-open -gj "smb://10.0.0.14/Anime"
+open -gj "afp://10.0.0.14/Anime"
 sleep 2
-open -gj "smb://10.0.0.14/Music"
+open -gj "afp://10.0.0.14/Music"
 sleep 2
-open -gj "smb://10.0.0.14/Video"
+open -gj "afp://10.0.0.14/Video"
 sleep 2
-open -gj "smb://10.0.0.14/Series"
+open -gj "afp://10.0.0.14/Series"
 sleep 2
-open -gj "smb://10.0.0.14/photo"
+open -gj "afp://10.0.0.14/Photos"
 sleep 2
-open -gj "smb://10.0.0.14/Backups"
+open -gj "afp://10.0.0.14/Backups"
 sleep 2
-open -gj "smb://10.0.0.14/Recordings"
+open -gj "afp://10.0.0.14/Recordings"
 sleep 2
-open -gj "smb://10.0.0.14/Work"
+open -gj "afp://10.0.0.14/Work"
-sleep 2
-open -gj "smb://10.0.0.14/Dokumenty"
 sleep 2
 
 /usr/local/bin/mysides add Synology file:///Volumes/Recordings/
@@ -27,7 +25,6 @@ sleep 2
 /usr/local/bin/mysides add Synology file:///Volumes/Music/
 /usr/local/bin/mysides add Synology file:///Volumes/Video/
 /usr/local/bin/mysides add Synology file:///Volumes/Series/
-/usr/local/bin/mysides add Synology file:///Volumes/photo/
+/usr/local/bin/mysides add Synology file:///Volumes/Photos/
 /usr/local/bin/mysides add Synology file:///Volumes/Anime/
-/usr/local/bin/mysides add Synology file:///Volumes/Work/
+/usr/local/bin/mysides add Synology file:///Volumes/Work
-/usr/local/bin/mysides add Synology file:///Volumes/Dokumenty/

.local/bin/python_env

@@ -2,8 +2,8 @@
 
 source "$HOME"/.local/bin/functions
 
-# Base function for creating a python venv
+# Function for creating a python env
-python_env_base() {
+python_env(){
 
     [ -z "$PYTHONVERSION" ] && err "Python version is not set"
 
@@ -14,49 +14,7 @@ python_env_base() {
     virtualenv -p "$PYTHONVERSION" .venv
 
     .venv/bin/python -m pip install --upgrade pip
-    .venv/bin/pip install pre-commit --break --force
-}
-
-# Default python env with requirements.txt
-python_env() {
-    python_env_base
-    if [ -f requirements.txt ]; then
     .venv/bin/pip install -r requirements.txt --break --force
-        timestamp "Installing Python packages from requirements.txt"
-    fi
 }
 
-# Ansible python env
+python_env "$@"
-python_env_ansible() {
-    python_env_base
-    timestamp "Installing Ansible packages"
-    .venv/bin/pip install \
-        ansible \
-        ansible-core \
-        ansible-lint \
-        ansible-parallel \
-        passlib \
-        python-tss-sdk \
-        --break --force
-
-    export ANSIBLE_COLLECTIONS_PATH=".venv/collections"
-    export ANSIBLE_ROLES_PATH=".venv/roles"
-
-    timestamp "Installing Ansible Galaxy collections to .venv/collections"
-    .venv/bin/ansible-galaxy collection install community.general -p .venv/collections --upgrade
-
-    timestamp "Installing Ansible Galaxy roles from requirements.yml files to .venv/roles"
-    find . -maxdepth 3 -name "requirements.yml" -path "*/roles/*" -not -path "./.venv/*" -print0 | while IFS= read -r -d '' req; do
-        timestamp "Found requirements: $req"
-        .venv/bin/ansible-galaxy install --force -r "$req" -p .venv/roles
-    done
-}
-
-case "$1" in
-ansible)
-    python_env_ansible
-    ;;
-*)
-    python_env
-    ;;
-esac

.zshrc

@@ -16,6 +16,10 @@ gbranch() {
     echo -e "$(git branch "$@")"
 }
 
+dt() {
+    date +"%Y%m%d%H%M%S"
+}
+
 [ -f /etc/gentoo-release ] && export ZSH="/usr/share/zsh/site-contrib/oh-my-zsh"
 [ -f /etc/centos-release ] && export ZSH="$HOME/.oh-my-zsh"
 [ -f /etc/debian_version ] && export ZSH="$HOME/.oh-my-zsh"
@@ -57,6 +61,7 @@ export XMODIFIERS=@im=ibus
 export QT_IM_MODULE=ibus
 export _JAVA_AWT_WM_NONREPARENTING=1
 export CCACHE_DIR="/usr/ccache"
+export LC_ALL="en_US.UTF-8"
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 export BROWSER=$HOME/.local/bin/browser-x
@@ -85,11 +90,22 @@ export PATH=$PATH:$HOME/.cargo/bin
 # History
 export HISTTIMEFORMAT="%F %T "
 
+# Export for WSL
+if [[ "$(uname -sr)" =~ "Microsoft" ]]; then
+    export GOROOT=/usr/lib/go
+fi
+
 # Work
+alias ansible-lint-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" ansible-lint'
+alias ansible-galaxy-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" ansible-galaxy'
 alias ssh-work="ssh -i ~/.ssh/work/id_rsa"
 alias rsyncwork="rsync -h --progress -e 'ssh -i ~/.ssh/work/id_rsa'"
 alias git-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" git'
-alias git-commit-work="git commit --author='Marcin Woźniak <marcin.wozniak@vml.com>'"
+alias git-commit-work="git commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com>'"
+
+# Alias ssh
+alias ssh-restore="cp -rv ~/ssh-mega/config ~/.ssh/ ; ssh-permissions"
+alias ssh-backup="cp -rv ~/.ssh/config ~/ssh-mega/"
 
 # Alias and Export Gentoo
 alias svm="sudo $EDITOR /etc/portage/make.conf"
@@ -104,21 +120,10 @@ alias feh="feh --edit --scale-down"
 alias graphic-card="glxinfo|egrep 'OpenGL vendor|OpenGL renderer'"
 alias mylaptop-components="inxi -Fxz"
 alias update_time="sudo ntpdate -b -u vega.cbk.poznan.pl"
-alias dt='LC_TIME=C /bin/date "+%Y%m%d%H%M%S"'
+alias dn='LC_TIME=C /bin/date "+%Y%m%d%H%M%S"'
 
 # Alias and Export for Mac
 if [[ "$(uname)" == "Darwin" ]]; then
-    # Unsetting LANGs and settings it
-    unset LANG LC_ALL
-
-    export LC_ALL=C.UTF-8
-    export LANG=C.UTF-8
-
-    # Enabling a HOMEBREW in preview versions of MacOS
-    export HOMEBREW_DEVELOPER=1
-    export HOMEBREW_NO_REQUIRE_TAP_TRUST=1
-    export HOMEBREW_CASK_OPTS="--appdir=~/Applications"
-
     # Resolve problem with GOPATH
     # https://stackoverflow.com/questions/66284870/go-get-not-downloading-to-src-folder
     export GO111MODULE=on
@@ -157,7 +162,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
     alias date='gdate'
 
     alias lsblk="diskutil list"
-    alias Update="$HOME/.local/bin/Update-pkg; yes | brew update; yes | brew upgrade; yes | brew upgrade --greedy; yes | sudo softwareupdate -i -a -R"
+    alias Update="$HOME/.local/bin/Update-pkg; brew update; brew upgrade; brew upgrade --greedy; sudo softwareupdate -i -a -R"
     alias ls="ls -Gh"
     alias mpv="mpv --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo+bestaudio/best'"
     alias code="open -a 'Visual Studio Code'"
@@ -168,7 +173,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
     alias restart-network-share="sudo pkill -i netauthsysagent"
     alias streamlink="streamlink --config $HOME/.config/streamlink/config"
     alias powershell="pwsh"
-    alias finder="open -a Finder ."
 
     # Terraform
     export TFENV_ARCH=amd64