Updates

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

.brew_programs

@@ -10,19 +10,18 @@ htop
 imagemagick
 ipcalc
 iperf3
-lf
 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/alacritty/alacritty.toml

@@ -19,35 +19,10 @@ bindings = [
 opacity = 0.95
 
 [font]
-size = 25
+size = 20
 
-##############################
-# Terminess Nerd Font
-
-[font.normal]
-family = "Terminess Nerd Font"
-style = "Regular"
-
-[font.bold_italic]
-family = "Terminess Nerd Font"
-style = "Bold Italic"
-
-[font.italic]
-family = "Terminess Nerd Font"
-style = "Italic"
-
-[font.offset]
-x = 0
-y = 0
-
-[font.glyph_offset]
-x = 0
-y = 0
-
-##############################
-# Comic code
 # [font.normal]
-# family = "Comic Code Ligatures"
+# family = "Terminess Nerd Font"
 # style = "Regular"
 
 # # [font.bold]
@@ -55,21 +30,38 @@ y = 0
 # # style = "Bold"
 
 # [font.bold_italic]
-# family = "Comic Code"
+# family = "Terminess Nerd Font"
 # style = "Bold Italic"
 
 # [font.italic]
-# family = "Comic Code"
+# family = "Terminess Nerd Font"
 # style = "Italic"
 
-# [font.offset]
-# x = 0
-# y = -6
 
-# [font.glyph_offset]
-# x = 0
-# y = -2
-##############################
+# Comic code
+[font.normal]
+family = "Comic Code Ligatures"
+style = "Regular"
+
+# [font.bold]
+# family = "Teminess Nerd Font"
+# style = "Bold"
+
+[font.bold_italic]
+family = "Comic Code"
+style = "Bold Italic"
+
+[font.italic]
+family = "Comic Code"
+style = "Italic"
+
+[font.offset]
+x = 0
+y = -6
+
+[font.glyph_offset]
+x = 0
+y = -2
 
 # [mouse.hints]
 # modifiers = "Command"

.config/newsraft/config

@@ -1,38 +0,0 @@
-# Newsraft configuration for IT Ops / Security
-# macOS-friendly defaults; Newsraft already auto-detects `open` on macOS.
-
-# Interface
-scrolloff 3
-scrollwrap true
-menu-item-sorting time-desc
-menu-feed-sorting unread-desc
-menu-section-sorting alphabet-asc
-list-entry-date-format "%d %b %H:%M"
-sections-menu-paramount-explore true
-feeds-menu-paramount-explore true
-status-show-menu-path true
-
-# Keep the local database useful without becoming huge.
-database-analyze-on-startup true
-database-clean-on-startup false
-database-batch-transactions true
-
-# Network
-download-timeout 30
-respect-ttl-element true
-respect-expires-header true
-send-if-none-match-header true
-send-if-modified-since-header true
-
-# Reading
-mark-item-read-on-hover false
-read-on-arrival false
-mark-item-unread-on-change false
-
-# Open article in browser and immediately mark it read.
-bind o open-in-browser; mark-read
-
-# Handy shortcuts.
-bind R reload-all
-bind q quit
-bind Q quit-hard

.config/newsraft/feeds

@@ -1,48 +0,0 @@
-# Newsraft IT Ops / Security feed collection
-# Sections are organised for a sysadmin / cloud / security workflow.
-# Newsraft syntax: @ Section, then URL "Feed name" < settings
-
-@ Polska < reload-period 60; item-limit 100
-https://www.rmf24.pl/feed "RMF24 — Najważniejsze" < reload-period 30; item-limit 100
-https://samorzad.pap.pl/rss.xml "PAP — Samorząd" < reload-period 120; item-limit 50
-
-@ Polska Security < reload-period 60; item-limit 100
-https://cert.pl/rss/ "CERT Polska" < reload-period 30; item-limit 100
-https://sekurak.pl/feed/ "Sekurak" < reload-period 60; item-limit 100
-https://feeds.feedburner.com/niebezpiecznik/ "Niebezpiecznik" < reload-period 60; item-limit 100
-https://zaufanatrzeciastrona.pl/feed "Zaufana Trzecia Strona" < reload-period 60; item-limit 100
-
-@ DevOps / SRE < reload-period 120; item-limit 100
-https://thenewstack.io/feed/ "The New Stack" < reload-period 120; item-limit 100
-https://feed.infoq.com/ "InfoQ" < reload-period 120; item-limit 100
-https://devops.com/feed/ "DevOps.com" < reload-period 120; item-limit 100
-https://sreweekly.com/feed/ "SRE Weekly" < reload-period 360; item-limit 50
-https://www.lastweekinaws.com/feed/ "Last Week in AWS" < reload-period 360; item-limit 50
-
-@ Linux / Open Source < reload-period 180; item-limit 100
-https://www.phoronix.com/rss.php "Phoronix" < reload-period 120; item-limit 100
-https://www.kernel.org/feeds/kdist.xml "Linux Kernel Releases" < reload-period 360; item-limit 50
-https://www.omgubuntu.co.uk/feed "OMG! Ubuntu" < reload-period 180; item-limit 75
-https://www.redhat.com/en/rss/blog/channel/red-hat-enterprise-linux "Red Hat Enterprise Linux" < reload-period 180; item-limit 75
-
-@ Proxmox / Virtualisation < reload-period 180; item-limit 100
-https://shop.proxmox.com/index.php?rp=/announcements&rss=1 "Proxmox Announcements" < reload-period 120; item-limit 100
-https://forum.proxmox.com/forums/proxmox-virtual-environment.19/index.rss "Proxmox VE Forum" < reload-period 120; item-limit 100
-
-@ Security < reload-period 60; item-limit 100
-https://www.cisa.gov/cybersecurity-advisories/all.xml "CISA Cybersecurity Advisories" < reload-period 30; item-limit 100
-https://cvefeed.io/rssfeed/severity/high.xml "CVEFeed — High / Critical" < reload-period 15; item-limit 50
-https://cvefeed.io/rssfeed/latest.xml "CVEFeed — Latest CVEs" < reload-period 15; item-limit 50
-https://krebsonsecurity.com/feed/ "Krebs on Security" < reload-period 120; item-limit 100
-https://www.schneier.com/feed/atom/ "Schneier on Security" < reload-period 180; item-limit 75
-https://feeds.feedburner.com/TheHackersNews "The Hacker News" < reload-period 60; item-limit 100
-https://isc.sans.edu/rssfeed_full.xml "SANS Internet Storm Center" < reload-period 60; item-limit 100
-
-@ Networking / Edge < reload-period 180; item-limit 100
-https://blog.cloudflare.com/rss/ "Cloudflare Blog" < reload-period 120; item-limit 100
-https://blog.mikrotik.com/?feed=rss2 "MikroTik Blog" < reload-period 180; item-limit 75
-https://labs.ripe.net/feed/ "RIPE Labs" < reload-period 180; item-limit 75
-
-@ GitHub < reload-period 120; item-limit 100
-https://github.blog/changelog/feed/ "GitHub Changelog" < reload-period 60; item-limit 100
-https://github.blog/engineering/feed/ "GitHub Engineering" < reload-period 180; item-limit 75

.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"
-sleep 2
-open -gj "smb://10.0.0.14/Dokumenty"
+open -gj "afp://10.0.0.14/Work"
 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/Dokumenty/
+/usr/local/bin/mysides add Synology file:///Volumes/Work

.local/bin/python_env

@@ -2,8 +2,8 @@
 
 source "$HOME"/.local/bin/functions
 
-# Base function for creating a python venv
-python_env_base() {
+# Function for creating a python env
+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
+    .venv/bin/pip install -r requirements.txt --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_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
+python_env "$@"

.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; brew update --force; brew upgrade --force --greedy -y; brew cleanup --prune=all -s; 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
@@ -176,7 +180,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
         grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' |
         sort |
         head -n1)
-    export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv |
+    export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/*/versions |
         grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' |
         sort |
         head -n1)