adsk changes

.config/lvim/config.lua

@@ -207,3 +207,11 @@ table.insert(lvim.builtin.cmp.sources, 1, { name = "copilot" })
 --     require("nvim-treesitter.highlight").attach(0, "bash")
 --   end,
 -- })
+
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = { "Jenkinsfile" },
+  callback = function()
+    require("nvim-treesitter.highlight").attach(0, "groovy")
+    command = "set ft=groovy"
+  end,
+})

.config/nvim/init.vim

@@ -101,6 +101,7 @@ Plug 'zpieslak/vim-autofix'
 Plug 'juvenn/mustache.vim'
 Plug 'github/copilot.vim'
 Plug 'hunner/vim-beancount'
+Plug 'prisma/vim-prisma'
 call plug#end()
 
 " Because.

.doom.d/init.el

@@ -147,7 +147,11 @@
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       org               ; organize your plain life in plain text
+       (org               ; organize your plain life in plain text
+               +pretty
+               +journal
+               +dragndrop
+               )
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional

.gnupg/gpg-agent.conf

@@ -2,8 +2,6 @@ default-cache-ttl 3600
 max-cache-ttl 3600
 enable-ssh-support
 #disable-scdaemon
-#pinentry-program /usr/local/bin/pinentry-mac
-#pinentry-program /usr/sbin/pinentry-curses
-pinentry-program /opt/homebrew/bin/pinentry-mac
 #pinentry-program /usr/bin/pinentry-curses
-#extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra
+pinentry-program /Users/haugenh1/.gnupg/pinentry-ide.sh
+#extra-socket /Users/hunner/.gnupg/S.gpg-agent.extra

.gnupg/pinentry-ide.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -n "$PINENTRY_USER_DATA" ]; then
+  case "$PINENTRY_USER_DATA" in
+    IJ_PINENTRY=*)
+      "/Users/haugenh1/Applications/WebStorm.app/Contents/jbr/Contents/Home/bin/java" -cp "/Users/haugenh1/Applications/WebStorm.app/Contents/plugins/vcs-git/lib/git4idea-rt.jar:/Users/haugenh1/Applications/WebStorm.app/Contents/lib/externalProcess-rt.jar" git4idea.gpg.PinentryApp
+      exit $?
+    ;;
+  esac
+fi
+exec /opt/homebrew/bin/pinentry-mac "$@"

.ideavimrc

@@ -22,3 +22,5 @@ set smartcase
 set showmatch
 set hlsearch
 set incsearch
+
+" CMD-k o to open the current file in a new window

.tmux/plugins/nord-tmux

@@ -1 +1 @@
-Subproject commit f7b6da07ab55fe32ee5f7d62da56d8e5ac691a92
+Subproject commit 4e2dc2a5065f5e8e67366700f803c733682e8f8c

.tmux/plugins/tmux-prefix-highlight

@@ -1 +1 @@
-Subproject commit 489a96189778a21d2f5f4dbbbc0ad2cec8f6c854
+Subproject commit 15acc6172300bc2eb13c81718dc53da6ae69de4f

.tmux/plugins/tmux-sensible

@@ -1 +1 @@
-Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa
+Subproject commit 44af8d8eff820eedd9702704d832ceda6732b34c

.zsh/aliases

@@ -66,7 +66,7 @@ alias hide="SetFile -a V"
 alias show="SetFile -a v"
 base64url::encode () { base64 -w0 | tr '+/' '-_' | tr -d '='; }
 base64url::decode () { awk '{ if (length($0) % 4 == 3) print $0"="; else if (length($0) % 4 == 2) print $0"=="; else print $0; }' | tr -- '-_' '+/' | base64 -d; }
-alias whyfail="tmux copy-mode && tmux send-keys -X search-backward '--- FAIL'"
+alias whyfail="tmux copy-mode && tmux send-keys -X search-backward 'FAIL'"
 alias m4b-tool='docker run -it --rm -u $(id -u):$(id -g) -v "$(pwd)":/mnt m4b-tool'
 alias morserunner="docker-wine --as-me --force-owner --sound=default --cache --volume=/home/hunner/Downloads/morserunner:/data --workdir=/data wine MorseRunner.exe"
 alias ry="vim -R +'set ft=yaml'"
@@ -242,6 +242,25 @@ alias ecx="emacsclient --eval '(make-frame-on-display \"$DISPLAY\")'"
 
 
 # Git
+alias gh="echo 'ga <file>     -- git add file
+gb            -- git branch
+gc            -- git commit
+gca           -- git commit --amend
+gd            -- git diff
+gdc           -- git diff --cached
+gdw           -- git diff --color-words
+ge <branch>   -- git checkout branch
+geb <branch>  -- git checkout -b branch
+gfa           -- git fetch --all --prune
+gl            -- git short log
+gla           -- git short log all
+gp            -- git push
+gr            -- git remote -v show
+grs <file>    -- git restore --staged file
+gs            -- git status
+gst           -- git stash
+gstp          -- git stash pop
+gu            -- git pull'"
 alias git="hub"
 alias gs="git status"
 alias gl="git lg"

.zshrc

@@ -13,7 +13,7 @@ fpath=(/usr/local/share/zsh-completions /opt/homebrew/share/zsh/site-functions $
 #typeset -u fpath
 
 # Options
-setopt prompt_subst inc_append_history hist_ignore_space hist_ignore_all_dups hist_expire_dups_first hist_find_no_dups hist_save_no_dups hist_reduce_blanks extendedglob nomatch notify dvorak # correct
+setopt prompt_subst inc_append_history hist_ignore_space hist_ignore_all_dups hist_expire_dups_first hist_find_no_dups hist_save_no_dups hist_reduce_blanks extendedglob nomatch notify dvorak interactive_comments # correct
 unsetopt beep
 bindkey -e
 
@@ -289,6 +289,9 @@ EOF
 #[ -f ~/.zsh-fuzzy-match/fuzzy-match.zsh ] && source ~/.zsh-fuzzy-match/fuzzy-match.zsh
 if [ -d ~/.asdf ] ; then
   . $HOME/.asdf/asdf.sh
+  if [ -d $HOME/.asdf/plugins/java ]; then
+    . $HOME/.asdf/plugins/java/set-java-home.zsh
+  fi
 fi
 enabledotnet() {
   if [ -d ~/.dotnet/tools ] ; then
@@ -298,7 +301,7 @@ enabledotnet() {
   fi
 }
 
-export PATH=$(go env GOPATH)/bin:$PATH
+#export PATH=$(go env GOPATH)/bin:$PATH
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
@@ -320,7 +323,7 @@ getdevadsktoken() {
     -H 'Accept: application/json' \
     -H "Authorization: Basic ${TEMP_TOKEN}" \
     -d 'grant_type=client_credentials' \
-    -d 'scope=data:read' \
+    -d 'scope=data:read data:write bucket:create bucket:read bucket:update bucket:delete' \
     | jq -r '.access_token'
 }
 
@@ -336,15 +339,15 @@ getprodadsktoken() {
 }
 
 devidlookup() {
-  curl -s -H "Authorization: Bearer ${$(getdevadsktoken)}" -H 'Content-Type: application/json' "https://developer-dev.api.autodesk.com/userprofile/v1/users/${1}" | jq -r .userId
+  curl -s -H "Authorization: Bearer ${$(getdevadsktoken)}" -H 'Content-Type: application/json' "https://developer-dev.api.autodesk.com/userprofile/v1/users/${1}" | jq -r '"\(.userId) \(.emailId)"'
 }
 
 stageidlookup() {
-  curl -s -H "Authorization: Bearer ${$(getstageadsktoken)}" -H 'Content-Type: application/json' "https://developer-stg.api.autodesk.com/userprofile/v1/users/${1}" | jq -r .userId
+  curl -s -H "Authorization: Bearer ${$(getstageadsktoken)}" -H 'Content-Type: application/json' "https://developer-stg.api.autodesk.com/userprofile/v1/users/${1}" | jq -r '"\(.userId) \(.emailId)"'
 }
 
 prodidlookup() {
-  curl -s -H "Authorization: Bearer ${$(getprodadsktoken)}" -H 'Content-Type: application/json' "https://developer.api.autodesk.com/userprofile/v1/users/${1}" | jq -r .userId
+  curl -s -H "Authorization: Bearer ${$(getprodadsktoken)}" -H 'Content-Type: application/json' "https://developer.api.autodesk.com/userprofile/v1/users/${1}" | jq -r '"\(.userId) \(.emailId)"'
 }
 
 # load-nvm() {

Brewfile

@@ -83,5 +83,6 @@ cask "onedrive" # File sync
 #cask "firefox" # Personal browsing
 #cask "firefox-nightly" # Work browsing
 cask "choosy" # Browser choosing
+cask "orion" # Better browser
 #cask "multifirefox" # Profile manager
 #cask "google-chrome" # Flash/music