8 changed files with 9 additions and 110 deletions
--- a/.config/mc/ini
+++ b/.config/mc/ini
@ -85,11 +85,10 @@ editor_stop_format_chars=-+*\\,.;:&>
 mcview_eof=
 skin=solarized-dark-256color
 shell_directory_timeout=900
-filepos_max_saved_entries=1024

 [Layout]
 output_lines=0
-left_panel_size=68
+left_panel_size=67
 top_panel_size=0
 message_visible=true
 keybar_visible=true
@ -119,8 +118,6 @@ color_terminals=
 alacritty=
 xterm=
 rxvt-256color=
-screen-256color=
-xterm-24bit=

 [Panels]
 show_mini_info=true
@ -146,7 +143,7 @@ select_flags=6
 simple_swap=false

 [Panelize]
-Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print
 Find *.orig after patching=find . -name \\*.orig -print
+Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print
 Find rejects after patching=find . -name \\*.rej -print
 Modified git files=git ls-files --modified
--- a/.tridactylrc
+++ b/.tridactylrc
@ -1,24 +0,0 @@
-" General Settings
-set update.lastchecktime 1755245204669
-set update.nag true
-set update.nagwait 7
-set update.lastnaggedversion 1.14.0
-set update.checkintervalsecs 86400
-set configversion 2.0
-set editorcmd '/opt/homebrew/bin/emacsclient'
-set smoothscroll true
-
-
-blacklistadd https://www.youtube.com/
-
-" tip from https://github.com/tridactyl/tridactyl/issues/1559
-seturl youtube.com modeindicator false
-
-" vim bind u back
-" vim bind U undo
-" vim bind Y clipboard yank
-" vim u
-" nbind <c-f>
-
-" For syntax highlighting see https://github.com/tridactyl/vim-tridactyl
-" vim: set filetype=tridactyl
--- a/.zshenv
+++ b/.zshenv
@ -2,7 +2,7 @@ set -o vi

 export LC_ALL=en_US.UTF-8

-export PATH=/Users/jetpac/.asdf/shims/:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH:$HOME/.fzf/bin
+export PATH=/Users/jetpac/.asdf/shims/:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH:


 alias oe='open /Applications/Emacs.app'
@ -103,38 +103,4 @@ if [ -f "/Users/jetpac/.local/bin/k9s" ]; then
 fi


-# lh nodes function for kubectl
-if [[ -n ${commands[kubectl]} ]]; then
-    lh_nodes() {
-        local ns="${1:-longhorn-system}"
-        kubectl -n "$ns" get nodes.longhorn.io -o yaml | \
-            yq eval '
-    .items[] |
-    {
-      "node": .metadata.name,
-      "allowScheduling": .spec.allowScheduling,
-      "disks": (
-        [ (.spec.disks // {}) | to_entries | .[] |
-          {
-            "diskName": .key,
-            "path": .value.path,
-            "allowScheduling": .value.allowScheduling,
-            "evictionRequested": .value.evictionRequested,
-            "storageReservedGiB": ((.value.storageReserved // 0) / 1073741824)
-          }
-        ]
-      ),
-      "diskStatus": (
-        [ (.status.diskStatus // {}) | to_entries | .[] |
-          {
-            "diskName": .key,
-            "storageAvailableGiB": ((.value.storageAvailable // 0) / 1073741824),
-            "storageMaximumGiB":  ((.value.storageMaximum  // 0) / 1073741824),
-            "storageScheduledGiB":((.value.storageScheduled // 0) / 1073741824)
-          }
-        ]
-      )
-    }'
-    }

-fi
--- a/.zshrc
+++ b/.zshrc
@ -113,41 +113,9 @@ COMPLETION_WAITING_DOTS="true"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(colorize colored-man-pages vi-mode common-aliases themes dircycle iterm2 zsh-navigation-tools urltools history zsh-syntax-highlighting zsh-autosuggestions web-search aliases)
-
-cmd_plugins=(rsync tmux docker docker-compose tmux kubectl helm terraform asdf brew emacs fzf asdf brew emacs)
-
-# Add a plugin only if its command exists
-add_plugin_if_command_exists() {
-    local cmd="$1"
-    if [[ -n ${commands[$cmd]} ]]; then
-        # Only append if not already in the plugins array
-        if (( ! ${plugins[(Ie)$cmd]} )); then
-            plugins+=("$cmd")
-        fi
-    fi
-}
-
-for cmd in $cmd_plugins; do
-    add_plugin_if_command_exists "$cmd"
-done
-
-# use mercurial plugin
-if [[ -n ${commands[hg]} ]]; then
-    plugins+=("mercurial")
-fi
+plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux zsh-syntax-highlighting zsh-autosuggestions kubectl helm terraform asdf brew web-search kubectl helm aliases emacs)

-# use macos plugin
-if [[ "$(uname -o)" == "Darwin" ]]; then
-   plugins+=("macos")
-fi
-
-# use zoxide
-if [[ -n ${commands[zoxide]} ]]; then
-    export FZF_DEFAULT_OPTS="--style full"
-    export _ZO_FZF_OPTS="--height ~90% --tmux bottom,70% --layout reverse"
-    eval "$(zoxide init --cmd cd zsh)"
-fi
+# consider plugin fzf - only available for Mac/Linux

 # colorize - adds ccat and cless
 # common-aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/common-aliases
@ -277,5 +245,3 @@ export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH

 # alias scm-ssh='/Users/jetpac/.ssh/scm-script.sh'
 # scm-ssh start_agent
-
-# export FZF_DEFAULT_OPTS="--style full --preview '/opt/homebrew/bin/pygmentize -g {}' --bind 'focus:transform-header:file --brief {}'"
--- a/bin/create_mrshughes
+++ b/bin/create_mrshughes
@ -8,10 +8,8 @@ set -x
 #

 if [[ -z $1 ]]; then
-    # PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/secure-integrate/userland11.4'
-    # PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/userland-pipeline'
-    # PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/akidr-text'
-    PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/on-sru'
+    PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/secure-integrate/userland11.4'
+    PARENT_WS='ssh://pnyc@dabel.us.oracle.com//workspace/pnyc/solaris-reviews/userland-pipeline'
 else
    PARENT_WS=$1
 fi
--- a/bin/ul11u4_build.sh
+++ b/bin/ul11u4_build.sh
@ -12,8 +12,7 @@ AWK=/usr/bin/awk
 CURL=/usr/bin/curl

 source "${BINDIR}/lib/logging.sh"
-TARGET="${1-11.4.85.0.1.201.1}"
-hg_branch="s11u4_sust_084"
+TARGET="${1-11.4.83.0.1.195.1}"
 log::info "TARGET:${TARGET}"

 URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=4&target=${TARGET}"
@ -44,7 +43,6 @@ set -x
 curl -X POST "${JOB_URL}" \
 	--user "pnyc:${JENKINS_TOKEN}" \
 	--data-urlencode "Build_Label=${TARGET}" \
-	--data-urlencode "hg_branch=${hg_branch}" \
 	--data-urlencode "hguser=petr.nyc@oracle.com" \
 	--data-urlencode "verbose=true" \
 	--data-urlencode "debug=true" \
--- a/bin/ul11u4_delivery_and_integrate.sh
+++ b/bin/ul11u4_delivery_and_integrate.sh
@ -13,7 +13,6 @@ CURL=/usr/bin/curl

 source "${BINDIR}/lib/logging.sh"
 TARGET="${1-11.4.83.0.1.195.1}"
-hg_branch="s11u4_sust_084"
 log::info "TARGET:${TARGET}"

 URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=4&target=${TARGET}"
@ -44,7 +43,6 @@ set -x
 curl -X POST "${JOB_URL}" \
 	--user "pnyc:${JENKINS_TOKEN}" \
 	--data-urlencode "Build_Label=${TARGET}" \
-	--data-urlencode "hg_branch=${hg_branch}" \
 	--data-urlencode "hguser=petr.nyc@oracle.com" \
 	--data-urlencode "verbose=true" \
 	--data-urlencode "debug=true" \
--- a/bin/ul11u4_gate_open.sh
+++ b/bin/ul11u4_gate_open.sh
@ -13,7 +13,7 @@ CURL=/usr/bin/curl

 source "${BINDIR}/lib/logging.sh"

-TARGET="${1-11.4.85.0.1.201.1}"
+TARGET="${1-11.4.84.0.1.201.1}"

 log::info "TARGET:${TARGET}"