Updates

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

.brew_programs

@@ -12,12 +12,12 @@ ipcalc
 iperf3
 mtr
 neovim
+newsboat
 parallel
 pinentry-mac
 ranger
 ripgrep
 rsync
-taplo
 telnet
 texinfo
 tmux

.brew_programs_cask

@@ -1,4 +1,5 @@
 alacritty
+brave
 chatterino
 dbeaver-community
 discord
@@ -21,6 +22,7 @@ rustdesk
 scroll-reverser
 signal
 spotify
+stats
 telegram
 the-unarchiver
 transfer

.brew_programs_disable

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

.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
@@ -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/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
+    .venv/bin/pip install -r requirements.txt --break --force
 }
 
-# Default python env with requirements.txt
+python_env "$@"
-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

.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"
@@ -86,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"
@@ -105,7 +120,7 @@ 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