Update adjustmends from last months

Brewfile

@@ -3,21 +3,33 @@ tap "homebrew/cask"
 tap "homebrew/cask-fonts"
 tap "homebrew/cask-versions"
 tap "homebrew/core"
+brew "azcopy"
+brew "azure-cli"
 brew "ccache"
 brew "clang-format"
 brew "cmake"
 brew "ctags"
+brew "docker-completion"
+brew "docker-compose-completion"
 brew "fzf"
 brew "git"
-brew "python@3.8"
+brew "gnupg"
+brew "graphviz"
+brew "helm"
 brew "imagemagick"
+brew "jenv"
+brew "kubernetes-cli"
+brew "minikube"
 brew "ncdu"
 brew "neovim"
 brew "node"
-brew "numpy", link: false
-brew "pandoc"
-brew "root"
+brew "poetry"
+brew "postgresql"
+brew "pyenv"
+brew "pyenv-virtualenv"
+brew "qpdf"
 brew "rsync"
+brew "scala"
 brew "sshuttle"
 brew "task"
 brew "tmux"
@@ -25,23 +37,22 @@ brew "watch"
 brew "zsh"
 brew "zsh-completions"
 cask "amethyst"
+cask "docker"
 cask "enpass"
+cask "firefox"
 cask "font-fira-code"
-cask "font-fira-mono-for-powerline"
 cask "font-fira-sans"
 cask "font-hack-nerd-font"
 cask "font-sauce-code-pro-nerd-font"
-cask "google-earth-pro"
-cask "inkscape"
+cask "google-chrome"
 cask "iterm2"
 cask "keepassxc"
-cask "mactex"
-cask "mattermost"
+cask "microsoft-teams"
+cask "miro"
 cask "nextcloud"
-cask "qlmarkdown"
 cask "qlstephen"
-cask "skim"
+cask "sbarex-qlmarkdown"
 cask "spotify"
 cask "telegram"
-cask "tomighty"
-cask "xquartz"
+cask "visual-studio-code"
+cask "wrike"

README.md

@@ -23,6 +23,23 @@ Remap ESC and CAPSLOCK keys
 sudo defaults read com.apple.loginwindow || sudo defaults write com.apple.loginwindow LoginHook $PWD/osx_startup_script.sh && sudo ./osx_startup_script.sh
 ```
 
+## Apple M1 and python quirks
+Currently, adding this to the `.zsh_local` for x86 vs arm64 workarounds
+```bash
+if [ "$(uname -m)" = "x86_64" ]; then
+    export X86_SLUG="86"
+fi
+
+export PATH="/opt/homebrew$X86_SLUG/bin:/opt/homebrew$X86_SLUG/sbin:$PATH"
+export PYENV_ROOT="$HOME/.pyenv$X86_SLUG"
+export PATH="$PYENV_ROOT/bin:$HOME/.jenv/bin:$PATH"
+eval "$(pyenv init --path)"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+eval "$(jenv init -)"
+```
+I've added a prompt segment to indicate if I'm currently in a rosetta shell.
+
 ## Oddities
 
 To properly activate autocompletion, I need to run

coc-extensions.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "coc-json": ">=1.3.4",
-    "coc-pyright": ">=1.1.134",
-    "coc-vimtex": ">=1.0.4",
-    "coc-yaml": ">=1.3.1"
+    "coc-json": ">=1.3.6",
+    "coc-metals": ">=1.0.7",
+    "coc-pyright": ">=1.1.164",
+    "coc-yaml": ">=1.4.2"
   }
 }

gitignore_global

@@ -46,3 +46,4 @@ __pycache__/
 toolchain.cmake
 livepreview/
 .env
+.python-version

install.conf.yaml

@@ -26,7 +26,6 @@
         create: true
         relink: true
         path: external/vim-plug/plug.vim
-    ~/.config/coc/extensions/package.json: coc-extensions.json
     ~/.gitignore_global: gitignore_global
     ~/.taskrc: taskrc
     ~/.p10k.zsh: p10k.zsh

install_osx.conf.yaml

@@ -6,4 +6,3 @@
 - link:
     ~/.latexmkrc: latexmkrc
     ~/Library/Application Support/iTerm2/DynamicProfiles/iterm-profiles.json: iterm-profiles.json
-    ~/.zsh_local: zsh_local_osx

nvimrc

@@ -109,6 +109,9 @@ set relativenumber  " aka :set rnu
 set ignorecase " ignore case while searching
 nnoremap <C-s> :set hlsearch!<CR>
 
+" python
+let g:python3_host_prog = '~/.pyenv/versions/3.9.5/bin/python'
+
 " autoformatting
 let g:formatter_python = ['yapf']
 let g:formatter_yapf_style = 'pep8'

p10k.zsh

@@ -100,6 +100,7 @@
     # battery               # internal battery
     # wifi                  # wifi speed
     # example               # example user-defined segment (see prompt_example function below)
+    x86
   )
 
   # Defines character set used by powerlevel10k. It's best to let `p10k configure` set it for you.
@@ -1518,6 +1519,9 @@
   function prompt_example() {
     p10k segment -b 1 -f 3 -i '⭐' -t 'hello, %n'
   }
+  function prompt_x86() {
+    p10k segment -b 1 -t "$X86_SLUG"
+  }
 
   # User-defined prompt segments may optionally provide an instant_prompt_* function. Its job
   # is to generate the prompt segment for display in instant prompt. See

taskrc

@@ -33,3 +33,5 @@ search.case.sensitive=no
 include ~/.dotfiles/task.theme
 
 context.focus=(project:bs2dsk or project:thesis) -ideas
+context.work=+dds
+context=work

zsh_local_osx

@@ -16,8 +16,5 @@ export PYTHONPATH=/usr/local/lib/root
 export LANG=en_US.UTF-8
 export LC_CTYPE=en_US.UTF-8
 
-export P=$HOME/Nextcloud/Studium/2016.3\ Promotion
-export D=$HOME/mounts/ceph/b2oc/dsk-run2/
-
 # pyenv setup
 eval "$(pyenv init -)"

zshrc

@@ -13,6 +13,8 @@ zplug "junegunn/fzf", use:"shell/*.zsh"
 zplug "modules/git", from:prezto
 zplug "modules/completion", from:prezto
 zplug "esc/conda-zsh-completion"
+zplug "docker/compose", use:contrib/completion/zsh
+zplug "docker/cli", use:contrib/completion/zsh
 
 # Install plugins if there are plugins that have not been installed
 if ! zplug check --verbose; then
@@ -157,6 +159,9 @@ compdef _task t=task
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
+# load homebrew autocompletions
+fpath=($(brew --prefix)/share/zsh/site-functions $fpath)
+
 zplug load
 
 # use up and down keys for substring search (needs to be called after plugin loading)