fixes after setup

install.sh

@@ -15,6 +15,7 @@ if hash brew 2>/dev/null; then
 else
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
+eval "$(/opt/homebrew/bin/brew shellenv)"
 
 # install all required homebrew formulas (Cask is first as it has dependencies for brew)
 source ./setup-scripts/Caskfile
@@ -23,22 +24,16 @@ source ./setup-scripts/Brew-Gemfile
 source ./setup-scripts/Nodefile
 source ./setup-scripts/Pipfile
 source ./setup-scripts/Nativefierfile
-source ./setup-scripts/MacOSfile
+#source ./setup-scripts/MacOSfile - doesn't work anymore :/
 
 # Setup bash from brew
 sudo sh -c 'echo "/opt/homebrew/bin/bash" >> /etc/shells'
 sudo sh -c 'echo "/opt/homebrew/bin/zsh"  >> /etc/shells'
 chsh -s /opt/homebrew/bin/zsh
 
-# RVM
-curl -sSL https://get.rvm.io | bash -s stable --ruby --autolibs=brew
-
 # NVM
 mkdir ~/.nvm
 
-# Global gems
-#rvm @global do gem install tmuxinator
-
 # For updating the submodules
 git submodule init
 git submodule update --remote --merge
@@ -99,6 +94,7 @@ link_files $PWD/nvimrc               $PWD/config/nvim/init.vim
 link_files $PWD/non-packaged-repos/vim-plug/plug.vim $PWD/config/nvim/autoload/plug.vim
 link_files $PWD/sshconfig            ~/.ssh/config
 link_files $PWD/rvmrc                ~/.rvmrc
+link_files $PWD/terraformrc          ~/.terraformrc
 
 # OSX settings
 source setup-scripts/osx-setup.sh

my-config/iterm.settings/com.googlecode.iterm2.plist

@@ -5866,7 +5866,7 @@
 			<key>Columns</key>
 			<integer>80</integer>
 			<key>Command</key>
-			<string>/usr/local/bin/zsh -i</string>
+			<string>/opt/homebrew/bin/zsh -i</string>
 			<key>Cursor Color</key>
 			<dict>
 				<key>Blue Component</key>
@@ -6226,13 +6226,13 @@
 			<key>Name</key>
 			<string>Default</string>
 			<key>Non Ascii Font</key>
-			<string>DroidSansMonoNerdFontCompleteM-Regular 11</string>
+			<string>DroidSansMNF 11</string>
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Non-ASCII Ligatures</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>DroidSansMonoNerdFontComplete-Regular 12</string>
+			<string>DroidSansMNFM 11</string>
 			<key>Option Key Sends</key>
 			<integer>2</integer>
 			<key>Prompt Before Closing 2</key>

nvimrc

@@ -476,8 +476,9 @@ set termguicolors
 set inccommand=split
 
 " Python executables
-"let g:python_host_prog = $HOME . '/work/virtualenvs/neovim/bin/python'
-let g:python3_host_prog = $HOME . '/work/virtualenvs/neovim3/bin/python'
+let g:python3_host_prog = $VENV_HOME . '/neovim/bin/python'
+let g:perl_host_prog = '/opt/homebrew/bin/perl'
+
 
 " }}}
 

setup-scripts/Brew-Gemfile

@@ -1,4 +1,6 @@
-#brew install brew-gem
+rbenv install 3.2.2
+rbenv global 3.2.2
+eval "$(rbenv init - zsh)"
 
 #brew gem install tmuxinator
 gem install neovim

setup-scripts/Brewfile

@@ -2,16 +2,16 @@
 
 # services external command
 brew tap homebrew/services
-brew tap homebrew/command-not-found
+#brew tap homebrew/command-not-found
 
 # wine
 #brew install winetricks
 
 # Development
 brew install python
 brew install nvm node
-#brew install mysql
-#brew install postgresql pgcli
+brew install rbenv
+#brew install pgcli
 brew install jd # json diff tool - test it
 brew install awscli okta-aws-cli
 brew install fx jq qp # JSON tools - test qp, a sql like syntax for json quering
@@ -44,8 +44,7 @@ brew install bash-completion@2
 brew install rails-completion rake-completion bundler-completion gem-completion pip-completion \
              ruby-completion vagrant-completion tmuxinator-completion grunt-completion django-completion \
              packer-completion spring-completion brew-cask-completion open-completion \
-             launchctl-completion fabric-completion stormssh-completion \
-             yarn-completion docker-completion
+             launchctl-completion fabric-completion yarn-completion docker-completion
 
 # git
 brew install git git-flow-avh diff-so-fancy git-sizer onefetch
@@ -57,7 +56,7 @@ brew tap "rhysd/git-brws" "https://github.com/rhysd/git-brws"
 brew install git-brws # Cool browsing command for git
 
 # Command line tools
-brew install wget coreutils rename tree cheat stormssh dos2unix prettyping pstree lsusb \
+brew install wget coreutils rename tree cheat dos2unix prettyping pstree lsusb \
              gawk telnet findutils grep gnu-sed gnu-tar htop tcping lunchy-go ipinfo-cli
 brew install fd # better find
 brew install bat # better cat
@@ -81,7 +80,7 @@ $(brew info fzf | grep /install)
 #brew install kubectl helm helmfile
 #brew install terraform_landscape terraform-docs terraformer terraforming
 #brew install docker-clean
-brew install lazygit lazydocker skanehira/docui/docui gitui
+brew install lazygit lazydocker gitui
 #brew install liamg/tfsec/tfsec
 brew install tflint
 brew install pre-commit

setup-scripts/Caskfile

@@ -1,12 +1,11 @@
 brew tap homebrew/cask-versions
-brew tap homebrew/cask-drivers
 
 # General purpose
-brew install --cask xquartz
+#brew install --cask xquartz
 #brew install --cask adoptopenjdk - deprecated - maybe use temurin
 brew install --cask karabiner-elements
 brew install --cask menumeters
-brew install --cask recordit
+#brew install --cask recordit
 brew install --cask keepingyouawake
 brew install --cask flux
 brew install --cask whatsapp
@@ -15,7 +14,6 @@ brew install --cask whatsapp
 # Productivity
 brew install --cask cheatsheet
 brew install --cask sizeup
-#brew install --cask alfred
 brew install --cask time-out
 brew install --cask maccy # Clipboard manager
 
@@ -44,18 +42,18 @@ brew install --cask firefox
 # Editors
 brew install --cask sublime-text
 brew install --cask pycharm
-#brew install --cask visual-studio-code
+brew install --cask visual-studio-code
 
 # VPN
 #brew install --cask FortiClient
 
 # Password manager
-brew install --cask KeePassXC
 brew install --cask 1password
+#brew install --cask KeePassXC
 
 # Other
 #brew install --cask teamviewer
-brew install --cask tunnelblick
+#brew install --cask tunnelblick
 brew install --cask coconutbattery
 #brew install --cask picasa
 #brew install --cask utorrent
@@ -81,5 +79,5 @@ brew install --cask font-droid-sans-mono-nerd-font font-fira-code
 brew install --cask aerial
 
 # quick look plugins
-brew install --cask qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv qlimagesize \
-                  webpquicklook suspicious-package
+#brew install --cask qlcolorcode qlstephen qlmarkdown quicklook-json qlprettypatch quicklook-csv qlimagesize \
+#                  webpquicklook suspicious-package

setup-scripts/MacOSfile

@@ -10,7 +10,7 @@ mas install 497799835
 mas install 1114591412
 
 # Microsoft Remote Desktop
-mas install 715768417
+#mas install 715768417
 
 # Encrypto
-mas install 935235287
+#mas install 935235287

setup-scripts/Nodefile

@@ -2,7 +2,7 @@
 #npm install -g ember-cli
 
 # builders and task runners
-npm install -g gulp
+#npm install -g gulp
 npm install -g yarn
 
 # dev tools

setup-scripts/Pipfile

@@ -1,25 +1,26 @@
-export PATH="/usr/local/opt/python/libexec/bin/python:$PATH"
-#export PATH="/opt/homebrew/opt/[email protected]/libexec/bin:$PATH"
 # development
-pip install virtualenv
-pip install virtualenvwrapper
-export WORKON_HOME=~/work/virtualenvs
-source /opt/homebrew//bin/virtualenvwrapper.sh
+python3 -m pip install --upgrade pip
+export VENV_HOME=~/.venvs
 
 # Neovim
-[ -d $WORKON_HOME/neovim3 ] && rm -rf $WORKON_HOME/neovim3
-mkvirtualenv neovim3 || true
+[ -d $VENV_HOME/neovim ] && rm -rf $VENV_HOME/neovim
+python3 -m venv $VENV_HOME/neovim
+source $VENV_HOME/neovim/bin/activate
+python -m pip install --upgrade pip
+pip install virtualenv
 pip install pynvim
 pip install pylama_pylint
 pip install -U jedi-language-server
+pip install urllib3
 deactivate
 
 # super charged AWS cli (https://github.com/donnemartin/saws)
 #pip3 install saws - commented out until it supports up to date python
 #pip install aws-shell --upgrade --ignore-installed six
 
 # git enhancements
-pip3 install git-sweep # remove mereged branches
+#pip3 install git-sweep # remove mereged branches
 
 # Really cool REPL
 pip3 install ptpython
+pip3 install boto3

zshrc

@@ -63,13 +63,7 @@ alias brew_desc="brew desc"
 alias brew_cask="brew cask"
 alias brew_formulas_that_depend_on="brew uses --recursive "
 
-#export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
-#export HOMEBREW_REPOSITORY="/opt/homebrew"
-export MANPATH="/opt/homebrew/share/man:$MANPATH"
-export INFOPATH="/opt/homebrew/share/info:$INFOPATH"
-
-export HOMEBREW_PREFIX="$(/usr/local/bin/brew --prefix)"
-export PATH="$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:$PATH"
+eval "$(/opt/homebrew/bin/brew shellenv)"
 export HOMEBREW_APP_PREFIX="$(dirname $(brew --prefix coreutils))"
 
 # brew installed utils
@@ -126,14 +120,11 @@ export PATH="$HOMEBREW_APP_PREFIX/python/libexec/bin:$HOME/Library/Python/3.9/bi
 
 alias upgrade_pip3="   pip3 install --upgrade setuptools wheel \
                     && pip3 install --upgrade pip        \
-                    && pip3 install --upgrade virtualenv virtualenvwrapper \
                     && for pkg in \$(pip3 list --outdated 2> /dev/null | tail -n +3 | awk '{ print \$1 }' | grep -v \"^pip3\\\$\"); do pip3 install -U \$pkg; done"
 alias update_pip3="pip3 list --outdated"
 
 # Setup virtual env
-export WORKON_HOME=~/work/virtualenvs
-zinit depth'3' lucid wait'0a' light-mode for \
-  OMZP::virtualenvwrapper
+export VENV_HOME="~/.venvs/"
 
 # For installing dependencies
 export LDFLAGS="$LDFLAGS -L$HOMEBREW_APP_PREFIX/libgeoip/lib/ -L$HOMEBREW_APP_PREFIX/[email protected]/lib -L$HOMEBREW_APP_PREFIX/libxml2/lib"
@@ -243,25 +234,21 @@ export NVM_DIR="$HOME/.nvm"
 # It loads every time I cd... need to fix that... export NVM_AUTOLOAD=1 # load a node version when if finds a .nvmrc file in the current working directory
 # TODO: bring back, currently not working
 [ -s "$HOMEBREW_APP_PREFIX/nvm/nvm.sh" ] && \. "$HOMEBREW_APP_PREFIX/nvm/nvm.sh"
+[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
 #zinit depth'3' lucid light-mode for \
 #  trigger-load'!yarn;npm;node' \
 #    OMZP::nvm
 
 ####################
 # RVM, Ruby, Rails #
 ####################
-alias upgrade_rvm="rvm get stable && rvm requirements && rvm reload"
-alias rvm_cheatsheat="start http://cheat.errtheblog.com/s/rvm"
-alias rvm_known_rubys="rvm list known"
+eval "$(rbenv init - zsh)"
 alias rc="rails console --sandbox"
 alias gem_docs="yard server -g"
-#export PATH="$HOME/.rvm/bin:$PATH" # Add RVM to PATH for scripting
 export PATH="$HOMEBREW_PREFIX/opt/ruby/bin:$PATH"
 export LDFLAGS="-L$HOMEBREW_PREFIX/opt/ruby/lib"
 export CPPFLAGS="-I$HOMEBREW_PREFIX/opt/ruby/include"
 
-# TODO: make fast! -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
-
 # Perl
 # TODO: make fast! - eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib=$HOME/perl5)"
 
@@ -449,7 +436,6 @@ alias upgrade_all="   echo 'remove' \
                    && upgrade_say 'neovim' && upgrade_neovim    \
                    && upgrade_say 'Dotfiles (all submodules)' && upgrade_submodules \
                    && echo 'Done upgrading.'"
-#                   && upgrade_say 'RVM'    && upgrade_rvm       \
 alias update_project="update_node_project && rake bower:list && bundle outdated"
 
 [[ -f ~/.dotfiles/zshrc.private ]] && source ~/.dotfiles/zshrc.private
@@ -588,6 +574,3 @@ alias maccy-enable="defaults write org.p0deje.Maccy ignoreEvents false"
 export PATH=".:$PATH"
 
 echo " -----------------------------------------------------------"
-
-
-source "$HOME/.config/broot/launcher/bash/br"