Merge branch 'main' of ssh://git.scalene.net:22023/jswank/dotfiles

nvim/.config/nvim/init.vim

@@ -40,8 +40,14 @@ iab idate <c-r>=strftime("%Y-%m-%d")<cr>
 " use \ toc to insert a table of contents for markdown from the current line to EOF
 nmap <leader>toc <cmd>.put =execute('.,$write !gh-md-toc --hide-header --hide-footer')<cr>
 
-" use \ tf to format a buffer as terraform
+" use \ tf to format a buffer as tofu / terraform
-nmap <leader>tf <cmd>!tofu fmt -no-color %<cr>
+nmap <leader>tf <cmd>% !tofu fmt -no-color -<cr>
+
+" use \ jn to format a buffer as Jsonnet
+nmap <leader>jn <cmd>% !jsonnetfmt -<cr>
+
+" use \ js to format a buffer as JSON
+nmap <leader>js <cmd>% !jq . -<cr>
 
 set lazyredraw " redraw only when req'd
 set wildmenu " visual auto-complete

ssh/.ssh/scalene-config

@@ -8,5 +8,5 @@ Host www.scalene.net
 Host tilde.club
   User eke
 
-Match host git.scalene.net exec "ip route |grep -q -E '^(192.168.101.0/24|100.115.92.192/28)'"
+#Match host git.scalene.net exec "ip route |grep -q -E '^(192.168.101.0/24)'"
-  Hostname tonttu.scalene.net
+#  Hostname tonttu.scalene.net

zsh/.zshenv

@@ -19,3 +19,6 @@ export GOPATH=~/go
 #export PATH
 
 export TMPDIR=/var/tmp
+
+export BROWSER=open_browser.sh
+export TF_PLUGIN_CACHE_DIR=~/cfa-work/.tf_cache