Merge Brewfiles

Bump bleach from 3.1.4 to 3.3.0

Brewfile

@@ -1,6 +1,7 @@
 tap "homebrew/bundle"
 tap "homebrew/cask"
 tap "homebrew/core"
+tap "homeport/tap"
 # Tap for chezmoi
 tap "twpayne/taps"
 # Tap for real path
@@ -22,7 +23,10 @@ tap "romkatv/powerlevel10k" # provides powerlevel10k
 tap "shopify/shopify" # provides toxiproxy
 tap "homebrew/cask-fonts" # provides fonts used by vim-devicons https://vimawesome.com/plugin/vim-devicons https://github.com/ryanoasis/nerd-fonts#font-installation
 tap "wtfutil/wtfutil" # https://wtfutil.com/getting_started/installation/
-
+cask "cyberduck"
+cask "docker"
+cask "lens"
+cask "obsidian"
 cask "java"
 cask "iterm2"
 cask "zoomus"
@@ -68,6 +72,7 @@ mas 'Pages', id: 409201541
 mas 'GarageBand', id: 682658836
 mas 'Numbers', id: 409203825
 
+brew "homeport/tap/havener"
 brew "zsh"
 brew "git-ftp"
 brew "gnu-sed"
@@ -75,11 +80,12 @@ brew "hugo"
 brew "inetutils"
 brew "ncftp"
 brew "plantuml"
-brew "python3"
 brew "ripgrep"
 brew "twpayne/taps/chezmoi"
 brew "tmux"
 brew "node"
+brew "direnv"
+brew "fish"
 
 # Fasd (pronounced similar to "fast") is a command-line productivity booster. https://github.com/clvv/fasd
 brew "fasd"
@@ -109,7 +115,8 @@ brew "asciidoc"
 brew "bash-snippets"
 # Mac App Store command line interface
 brew "mas"
-# Using pyenv to be able to install specific python versions https://stackoverflow.com/questions/49794432/how-to-setup-a-pipenv-python-3-6-project-if-os-python-version-is-3-5
+# Using pyenv to be able to install specific python versions https://stackoverflow.com/questions/49794432/how-to-setup-a-pipenv-python-3-6-project-if-os-
+-version-is-3-5
 brew "pyenv"
 # Google CLI https://github.com/jarun/googler
 brew "googler"
@@ -143,13 +150,23 @@ brew "aspell"
 brew "neofetch"
 # add nushell https://github.com/nushell/nushell
 brew "nushell"
+brew "ncspot"
+brew "python@3.10"
+brew "pipx"
+brew "watch"
 
 # tools for K8S
 brew "kubectl"
 brew "kubectx"
+brew "kube-linter"
+brew "kubernetes-cli"
+brew "kustomize"
+brew "popeye" # Kubernetes resources sanity analysis
 
 brew "packer"
 brew "go"
+brew "golangci-lint"
+brew "gopls"
 brew "weechat" # need an IRC client
 brew "tflint" # terraform linter
 brew "ktlint" # kotlin linter
@@ -157,6 +174,8 @@ brew "cmake" # compiler, was needed for compiling YouCompleteMe, see https://git
 brew "zola" # a simple and fast static site generator
 brew "rustup" # Install Rust
 brew "jq" # add jq utility for parsing json
+brew "jsonlint"
+brew "gron"
 brew "octant" # k8s cluster viewer
 brew "telepresence" # telepresence https://www.telepresence.io/reference/install
 brew "ansiweather" # https://github.com/fcambus/ansiweather
@@ -172,7 +191,6 @@ brew "tac" # Needed for some terraform modules at work
 brew "coreutils"
 brew "gh" # GitHub CLI
 brew "bash" # time to upgrade bash
-brew "popeye" # Kubernetes resources sanity analysis
 brew "pre-commit" # https://pre-commit.com/#install
 brew "terraform-docs" # https://github.com/segmentio/terraform-docs
 brew "shfmt" # format shell

requirements.txt

@@ -12,7 +12,7 @@ backcall==0.1.0
 beautifulsoup4==4.9.1
 beautysh==6.0.1
 black==19.10b0
-bleach==3.1.4
+bleach==3.3.0
 bs4==0.0.1
 cachetools==3.1.1
 castero==0.8.0
@@ -74,7 +74,7 @@ pexpect==4.7.0
 pickleshare==0.7.5
 pigpio==1.44
 Pillow==6.2.1
-pipenv==2022.1.8
+pipenv==2018.11.26
 pkginfo==1.5.0.1
 pocket==0.3.6
 prompt-toolkit==2.0.10
@@ -165,7 +165,7 @@ backcall==0.1.0
 beautifulsoup4==4.9.1
 beautysh==6.0.1
 black==19.10b0
-bleach==3.1.4
+bleach==3.3.0
 bs4==0.0.1
 cachetools==3.1.1
 castero==0.8.0
@@ -227,7 +227,7 @@ pexpect==4.7.0
 pickleshare==0.7.5
 pigpio==1.44
 Pillow==6.2.1
-pipenv==2022.1.8
+pipenv==2018.11.26
 pkginfo==1.5.0.1
 pocket==0.3.6
 prompt-toolkit==2.0.10