config tweaks

.aider.conf.yml

@@ -0,0 +1,31 @@
+#############
+# Main model:
+
+## Specify the model to use for the main chat
+# model: oca/gpt5
+model: oca/gpt-5.1-codex
+
+
+## Enable/disable automatic acceptance of architect changes (default: True)
+#auto-accept-architect: true
+
+weak-model: oca/llama4
+
+##################
+# Output settings:
+
+## Use colors suitable for a dark terminal background (default: False)
+dark-mode: true
+
+## Enable/disable auto commit of LLM changes (default: True)
+auto-commits: false
+
+
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+analytics: false
+
+## Permanently disable analytics
+analytics-disable: true

.codex/config.toml

@@ -0,0 +1,80 @@
+# doc: https://developers.openai.com/codex/config-advanced
+#      https://developers.openai.com/codex/config-reference
+approval_policy = "on-failure"
+preferred_auth_method = "apikey"
+# model = "oca/gpt-5-codex"
+# profile = "gpt-5-codex"
+# model = "oca/gpt-5.1-codex"
+# profile = "gpt-5-1-codex"
+
+model = "oca/gpt-5.1-codex-mini"
+profile = "gpt-5-1-codex-mini"
+
+
+
+web_search_request = true
+trust_level = "trusted"
+
+sandbox_mode = "workspace-write"
+[sandbox_workspace_write]
+network_access = true
+writable_roots = [ "/Users/jetpac/.codex/skills" ]
+
+[analytics]
+enabled = false
+[model_providers.oca-responses]
+base_url = "https://code-internal.aiservice.us-chicago-1.oci.oraclecloud.com/20250206/app/litellm"
+http_headers = { "client" = "codex-cli", "client-version" = "0" }
+model = "oca/gpt5"
+name = "Oracle Code Assist Responses"
+wire_api = "responses"
+[model_providers.oca-chat]
+base_url = "https://code-internal.aiservice.us-chicago-1.oci.oraclecloud.com/20250206/app/litellm"
+http_headers = { "client" = "codex-cli", "client-version" = "0" }
+model = "oca/gpt5"
+name = "Oracle Code Assist Chat"
+wire_api = "responses"
+[profiles.grok-4]
+model = "oca/grok4"
+model_provider = "oca-chat"
+review_model = "oca/grok4"
+[profiles.grok-4-fast-reasoning]
+model = "oca/grok4-fast-reasoning"
+model_provider = "oca-chat"
+review_model = "oca/grok4-fast-reasoning"
+[profiles.grok-code-fast-1]
+model = "oca/grok-code-fast-1"
+model_provider = "oca-chat"
+review_model = "oca/grok-code-fast-1"
+[profiles.gpt-4-1]
+model = "oca/gpt-4.1"
+model_provider = "oca-chat"
+review_model = "oca/gpt-4.1"
+[profiles.gpt-5]
+model = "oca/gpt5"
+model_provider = "oca-responses"
+review_model = "oca/gpt5"
+[profiles.gpt-5-1]
+model = "oca/gpt-5.1"
+model_provider = "oca-chat"
+review_model = "oca/gpt-5.1"
+[profiles.gpt-5-2]
+model = "oca/gpt-5.2"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.2"
+[profiles.gpt-5-codex]
+model = "oca/gpt-5-codex"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5-codex"
+personality = "pragmatic"
+[profiles.gpt-5-1-codex]
+model = "oca/gpt-5.1-codex"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.1-codex"
+personality = "pragmatic"
+model_reasoning_effort = "high"
+[profiles.gpt-5-1-codex-mini]
+model = "oca/gpt-5.1-codex-mini"
+model_provider = "oca-responses"
+review_model = "oca/gpt-5.1-codex-mini"
+personality = "pragmatic"

.p10k.zsh

@@ -104,13 +104,14 @@
     timewarrior             # timewarrior tracking status (https://timewarrior.net/)
     taskwarrior             # taskwarrior task count (https://taskwarrior.org/)
     cpu_arch              # CPU architecture
+    battery
     time                  # current time
     # =========================[ Line #2 ]=========================
     newline
     # ip                    # ip address and bandwidth usage for a specified network interface
     # public_ip             # public IP address
     proxy                 # system-wide http/https/ftp proxy
-    battery               # internal battery
+    # battery               # internal battery
     # wifi                  # wifi speed
     # example               # example user-defined segment (see prompt_example function below)
   )

.spacemacs

@@ -32,16 +32,28 @@ This function should only modify configuration layer settings."
 
    ;; List of configuration layers to load.
    dotspacemacs-configuration-layers
-   '(swift
+   '(windows-scripts
+     swift
      multiple-cursors ;; https://www.spacemacs.org/layers/+misc/multiple-cursors/README.html#key-bindings
+     (aider :variables
+            aidermacs-default-chat-mode 'architect
+            aidermacs-default-model "oca/gpt5"
+            aidermacs-backend 'vterm ;; Highly recommended for Spacemacs/Mac users over comint
+            aidermacs-program "/opt/homebrew/bin/ocaider"
+            aidermacs-extra-args '("--watch-files")
+            )
+
      shell
      yaml
      notmuch
-     ;; themes-megapack
+     themes-megapack
      nginx
      toml
      html
-     python
+     (python :variables
+             python-backend 'lsp
+             python-lsp-server 'pyright
+             )
      javascript
      pandoc
      ;; ----------------------------------------------------------------
@@ -64,6 +76,7 @@ This function should only modify configuration layer settings."
           org-enable-bootstrap-support t
           org-enable-jira-support t
           jiralib-url "https://jira.oci.oraclecorp.com"
+          jiralib-target-api-version 2
           ;; org-enable-roam-support t
           ;; org-enable-roam-ui t
           ;; org-roam-completion-everywhere t
@@ -73,12 +86,14 @@ This function should only modify configuration layer settings."
      ;; (shell :variables
      ;;        shell-default-height 30
      ;;        shell-default-position 'bottom)
-     ;; spell-checking
+     (spell-checking :variables spell-checking-enable-by-default nil)
      syntax-checking
      ;; version-control
      treemacs
-     docker
-     terraform
+     (docker    :variables docker-dockerfile-backend 'lsp)
+     (terraform :variables terraform-backend 'lsp)
+     (conda :variables
+            conda-anaconda-home "/opt/homebrew/Caskroom/miniconda/base")
      )
 
 
@@ -97,9 +112,9 @@ This function should only modify configuration layer settings."
                                       org-mac-link
                                       org-alert
                                       org-msg
+                                      ai-code
                                         ;org-caldav
                                         ;org-protocol
-                                      aidermacs
                                       )
 
    ;; A list of packages that cannot be updated.
@@ -265,8 +280,12 @@ It should only modify the values of Spacemacs settings."
    ;; List of themes, the first of the list is loaded when spacemacs starts.
    ;; Press `SPC T n' to cycle to the next theme in the list (works great
    ;; with 2 themes variants, one dark and one light)
-   dotspacemacs-themes '(spacemacs-dark
-                         spacemacs-light)
+   dotspacemacs-themes '(
+                         spacemacs-dark
+                         doom-solarized-dark
+                         spacemacs-light
+                         doom-solarized-dark-high-contrast-theme
+                         )
 
    ;; Set the theme for the Spaceline. Supported themes are `spacemacs',
    ;; `all-the-icons', `custom', `doom', `vim-powerline' and `vanilla'. The
@@ -503,7 +522,7 @@ It should only modify the values of Spacemacs settings."
    ;; List of search tool executable names. Spacemacs uses the first installed
    ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
    ;; (default '("rg" "ag" "pt" "ack" "grep"))
-   dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
+   dotspacemacs-search-tools '("rg" "ag" "ack" "grep")
 
    ;; The backend used for undo/redo functionality. Possible values are
    ;; `undo-fu', `undo-redo' and `undo-tree' see also `evil-undo-system'.
@@ -621,11 +640,39 @@ configuration.
 Put your configuration code here, except for variables that should be set
 before packages are loaded."
 
+
+  ;; codex config
+  (use-package ai-code
+    ;; :straight (:host github :repo "tninja/ai-code-interface.el") ;; if you want to use straight to install, no need to have MELPA setting above
+    :config
+    ;; use codex as backend, other options are 'claude-code, 'gemini, 'github-copilot-cli, 'opencode, 'grok, 'cursor, 'kiro, 'codebuddy, 'aider, 'claude-code-ide, 'claude-code-el
+    (ai-code-set-backend 'codex)
+    ;; Enable global keybinding for the main menu
+    ;; (global-set-key (kbd "C-c a") #'ai-code-menu)
+    (spacemacs/set-leader-keys "oi" 'ai-code-menu)
+    ;; Optional: Use eat if you prefer, by default it is vterm
+    ;; (setq ai-code-backends-infra-terminal-backend 'eat) ;; the way to config all native supported CLI. for external backend such as claude-code-ide.el and claude-code.el, please check their config
+    ;; Optional: Enable @ file completion in comments and AI sessions
+    (ai-code-prompt-filepath-completion-mode 1)
+    ;; Optional: Ask AI to run test after code changes, for a tighter build-test loop
+    (setq ai-code-auto-test-type 'test-after-change)
+    ;; Optional: In AI session buffers, SPC in Evil normal state triggers the prompt-enter UI
+    (with-eval-after-load 'evil (ai-code-backends-infra-evil-setup))
+    ;; Optional: Turn on auto-revert buffer, so that the AI code change automatically appears in the buffer
+    (global-auto-revert-mode 1)
+    (setq auto-revert-interval 1) ;; set to 1 second for faster update
+    ;; (global-set-key (kbd "C-c a C") #'ai-code-toggle-filepath-completion)
+    ;; Optional: Set up Magit integration for AI commands in Magit popups
+    (with-eval-after-load 'magit
+      (ai-code-magit-setup-transients)))
+
   ;; email config
   ;; the saved command is a work-around for not working address completion
   (setq notmuch-show-logo nil
-        notmuch-search-oldest-first nil
-        notmuch-address-command "/Users/jetpac/bin/notmuch-address"
+        notmuch-search-oldest-first nil          ;; new email on top
+        notmuch-column-control 1.0               ;; just one columnt for searches
+        notmuch-hello-insert-recent-searches nil ;; don't display recent searches in notmuch-helo
+        ;; notmuch-address-command "/Users/jetpac/bin/notmuch-address"
 
         ;; these are default
         ;; notmuch-hello-sections '(notmuch-hello-insert-header notmuch-hello-insert-saved-searches
@@ -635,6 +682,7 @@ before packages are loaded."
         ;;                                                      notmuch-hello-insert-footer)
         )
 
+  ;; (add-hook 'org-msg-edit-mode-hook #'notmuch-address-mode)
   (setq notmuch-saved-searches
         '((:name "📥 Inbox" :query "tag:inbox AND tag:unread" :key "i")
           (:name "To me Unread" :query "tag:me AND tag:unread")
@@ -762,6 +810,60 @@ before packages are loaded."
 
   ;; / email config
 
+
+  ;; LSP config
+
+  ;; General LSP tuning - defaults
+  ;; (setq lsp-idle-delay 0.5)
+  ;; (setq lsp-log-io nil)
+  ;; (setq gc-cons-threshold 100000000)
+  ;; (setq read-process-output-max (* 1024 1024)) ;; 1MB
+
+  ;; Use flycheck for diagnostics (Spacemacs default)
+  ;; (setq lsp-diagnostics-provider :flycheck)
+
+  ;; Reduce file watcher overhead (important for Terraform repos)
+  ;; (setq lsp-file-watch-threshold 5000)
+
+  ;; for python, install ruff and pylsp:
+  ;; Python CONFIG
+  ;; brew install ruff pylsp pyright basedpyright
+  ;; 1. Use Basedpyright instead of standard Pyright
+  (setq lsp-pyright-langserver-command "basedpyright")
+
+  ;; 2. Enable Ruff support (requires ruff to be in your PATH)
+  ;; This tells lsp-mode to use the Ruff server for linting/formatting
+  (setq lsp-pylsp-plugins-ruff-enabled t)
+
+  ;; Spacemacs already uses deferred loading, but this ensures it
+  ;; (setq lsp-auto-configure t) ;; this is already default
+  ;; /Python CONFIG
+
+
+  ;; enable lsp mode for shells, needs to be deferred
+  ;; otherwise it locks up emacs startup
+  (add-hook 'sh-mode-hook #'lsp-deferred)
+
+  ;; Chain mode-specific checkers (Hadolint, TFLint) to run after LSP.
+  ;; We use `lsp-managed-mode-hook` to ensure the `lsp` checker is fully
+  ;; defined before modifying its chain, preventing "lsp is not a valid
+  ;; syntax checker" errors during startup.
+  (defun jp/lsp-flycheck-chaining ()
+    "Chain specific checkers to LSP based on the current mode."
+    (cond
+     ;; Dockerfile: LSP -> Hadolint
+     ((derived-mode-p 'dockerfile-mode)
+      (flycheck-add-next-checker 'lsp 'dockerfile-hadolint))
+
+     ;; Terraform: LSP -> TFLint
+     ((derived-mode-p 'terraform-mode)
+      (flycheck-add-next-checker 'lsp 'terraform-tflint))))
+
+  ;; Run this whenever LSP starts managing a buffer
+  (add-hook 'lsp-managed-mode-hook #'jp/lsp-flycheck-chaining)
+
+  ;; / LSP config
+
   ;; jira config
 
   ;; (defun my-jira-bearer-token ()
@@ -827,6 +929,9 @@ before packages are loaded."
   ;; Bind proxy toggle function to a key
   (spacemacs/set-leader-keys "ot" 'toggle-proxy)
 
+  ;; Bind ai for aidermacs
+  ;; (spacemacs/set-leader-keys "ai" 'aidermacs-transient-menu)
+
   ;; idea from chatgpt
   (defun jp/set-dotfiles-environment ()
     "Set environment variables for the dotfiles repository."
@@ -865,7 +970,8 @@ before packages are loaded."
     (let ((default-directory (expand-file-name "~/")))
       (jp/set-dotfiles-environment)
       (magit-status)
-      (jp/unset-dotfiles-environment)))
+      ;; (jp/unset-dotfiles-environment)
+      ))
 
   (with-eval-after-load 'org
     ;; test from https://superuser.com/questions/452649/org-mode-to-markdown-converter
@@ -893,54 +999,54 @@ before packages are loaded."
 
     (setq org-duration-format 'h:mm)
 
-    ;; ================================================================================
-    ;; config for org-caldav for my nextcloud installation
-    ;; not working to my satisfaction yet - only configured for not used files
-    ;; inspiration from https://www.reddit.com/r/orgmode/comments/8rl8ep/making_orgcaldav_useable/
-    ;; doc: https://github.com/dengste/org-caldav
+    ;; ;; ================================================================================
+    ;; ;; config for org-caldav for my nextcloud installation
+    ;; ;; not working to my satisfaction yet - only configured for not used files
+    ;; ;; inspiration from https://www.reddit.com/r/orgmode/comments/8rl8ep/making_orgcaldav_useable/
+    ;; ;; doc: https://github.com/dengste/org-caldav
 
-    ;; URL of the caldav server
-    (setq org-caldav-url "https://next.cloud.jetpac.org/remote.php/dav/calendars/jetpac")
+    ;; ;; URL of the caldav server
+    ;; (setq org-caldav-url "https://next.cloud.jetpac.org/remote.php/dav/calendars/jetpac")
 
-    (setq org-caldav-calendars
-          '((:calendar-id "personal"
-                          :files ("~/Documents/org/synced_calendar.org")
-                          ;; :inbox ("~/Documents/org/caldav/from-calendar.org")
-                          ;; :sync-direction ('org->cal)
-                          ))
-          )
+    ;; (setq org-caldav-calendars
+    ;;       '((:calendar-id "personal"
+    ;;                       :files ("~/Documents/org/synced_calendar.org")
+    ;;                       ;; :inbox ("~/Documents/org/caldav/from-calendar.org")
+    ;;                       ;; :sync-direction ('org->cal)
+    ;;                       ))
+    ;;       )
 
-    ;; config
-    (setq org-icalendar-alarm-time 1)
-    ;; This makes sure to-do items as a category can show up on the calendar
-    (setq org-icalendar-include-todo t)
-    ;; This ensures all org "deadlines" show up, and show up as due dates
-    (setq org-icalendar-use-deadline '(event-if-todo event-if-not-todo todo-due))
-    ;; This ensures "scheduled" org items show up, and show up as start times
-    (setq org-icalendar-use-scheduled '(todo-start event-if-todo event-if-not-todo))
+    ;; ;; config
+    ;; (setq org-icalendar-alarm-time 1)
+    ;; ;; This makes sure to-do items as a category can show up on the calendar
+    ;; (setq org-icalendar-include-todo t)
+    ;; ;; This ensures all org "deadlines" show up, and show up as due dates
+    ;; (setq org-icalendar-use-deadline '(event-if-todo event-if-not-todo todo-due))
+    ;; ;; This ensures "scheduled" org items show up, and show up as start times
+    ;; (setq org-icalendar-use-scheduled '(todo-start event-if-todo event-if-not-todo))
 
-    (setq org-caldav-backup-file "~/Documents/org/caldav/org-caldav-backup.org")
-    (setq org-caldav-save-directory "~/Documents/org/caldav/")
+    ;; (setq org-caldav-backup-file "~/Documents/org/caldav/org-caldav-backup.org")
+    ;; (setq org-caldav-save-directory "~/Documents/org/caldav/")
 
-    ;; ;; calendar ID on server
-    ;; (setq org-caldav-calendar-id "personal")
+    ;; ;; ;; calendar ID on server
+    ;; ;; (setq org-caldav-calendar-id "personal")
 
-    ;; ;; Org filename where new entries from calendar stored
-    (setq org-caldav-inbox "~/Documents/org/caldav/from-calendar.org")
+    ;; ;; ;; Org filename where new entries from calendar stored
+    ;; (setq org-caldav-inbox "~/Documents/org/caldav/from-calendar.org")
 
-    ;; ;; Additional Org files to check for calendar events
+    ;; ;; ;; Additional Org files to check for calendar events
 
-    ;; ;; this line breaks the sync!
-    ;; (setq org-caldav-files ("~/Documents/org/caldav/todo.org"))
-    ;; ;; (setq org-caldav-files nil)
+    ;; ;; ;; this line breaks the sync!
+    ;; ;; (setq org-caldav-files ("~/Documents/org/caldav/todo.org"))
+    ;; ;; ;; (setq org-caldav-files nil)
 
-    ;; ;; Usually a good idea to set the timezone manually
-    ;; (setq org-icalendar-timezone "Europe/Prague")
+    ;; ;; ;; Usually a good idea to set the timezone manually
+    ;; ;; (setq org-icalendar-timezone "Europe/Prague")
 
-    ;; ;; sync from org to cal only
-    ;; (setq org-caldav-sync-direction "org->cal")
-    ;; ;; (setq org-caldav-sync-direction "twoway")
-    ;; ================================================================================
+    ;; ;; ;; sync from org to cal only
+    ;; ;; (setq org-caldav-sync-direction "org->cal")
+    ;; ;; ;; (setq org-caldav-sync-direction "twoway")
+    ;; ;; ================================================================================
 
 
     ;; Define the custum capture templates
@@ -970,7 +1076,6 @@ before packages are loaded."
                              "~/Documents/org/work/oracle.org"
                              "~/Documents/org/someday.org"
                              "~/Documents/org/calendar.org"
-                             "~/Documents/org/synced_calendar.org"
                              ))
 
 
@@ -1031,9 +1136,6 @@ before packages are loaded."
   (with-eval-after-load 'markdown-mode
     (define-key markdown-mode-map (kbd "C-c x") 'my/markdown-toggle-checkbox))
 
-  ;; (with-eval-after-load 'flycheck
-  ;;   (flycheck-add-next-checker 'lsp '(warning . json-jsonlint)))
-
   (setq calendar-week-start-day 1) ;; calendar start on Monday
 
   ;; org-alert configuration
@@ -1048,24 +1150,6 @@ before packages are loaded."
           )
     (org-alert-enable))
 
-  (use-package aidermacs
-    :defer t ;; Lazy load until invoked
-    :init
-    ;; Set variables here so they are ready before the package loads
-    (setq aidermacs-default-chat-mode 'architect
-          aidermacs-default-model "oca/gpt5"
-          aidermacs-backend 'vterm ;; Highly recommended for Spacemacs/Mac users over comint
-          aidermacs-program "/opt/homebrew/bin/ocaider"
-          aidermacs-extra-args '("--watch-files")
-          )
-    :config
-    ;; Optional: Spacemacs-style keybindings (Leader key)
-    ;; Mnemonic: SPC a (apps) i (intelligence/aider)
-    (spacemacs/set-leader-keys
-      "ai" 'aidermacs-transient-menu)
-    )
-
-
   (defun my/markdown-toggle-checkbox ()
     "Toggle checkbox in markdown list at point."
     (interactive)
@@ -1261,34 +1345,178 @@ This function is called at the very end of Spacemacs initialization."
    ;; If you edit it by hand, you could mess it up, so be careful.
    ;; Your init file should contain only one such instance.
    ;; If there is more than one, they won't work right.
-   '(custom-enabled-themes '(spacemacs-dark))
+   ;; '(custom-enabled-themes '(doom-solarized-dark))
    '(custom-safe-themes
-     '("7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8"
+     '("d97ac0baa0b67be4f7523795621ea5096939a47e8b46378f79e78846e0e4ad3d"
+       "21d2bf8d4d1df4859ff94422b5e41f6f2eeff14dd12f01428fa3cb4cb50ea0fb"
+       "7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8"
        "810691bd221e4639d5ef736b1bd930a7fb32a7c6043a5634e04f86edea973f6d"
        "a0ac98a1bde5d6336295fd350155a4aac1d63c53c1b3773062271074d16ebeb5"
        "bbb13492a15c3258f29c21d251da1e62f1abb8bbd492386a673dcfab474186af"
        "7fd8b914e340283c189980cd1883dbdef67080ad1a3a9cc3df864ca53bdc89cf" default))
+   '(dired-listing-switches "-alh")
+   '(ibuffer-saved-filter-groups nil)
+   '(ibuffer-saved-filters
+     '(("dired-mode" (mode . dired-mode))
+       ("programming"
+        (or (derived-mode . prog-mode) (mode . ess-mode) (mode . compilation-mode)))
+       ("text document" (and (derived-mode . text-mode) (not (starred-name))))
+       ("TeX"
+        (or (derived-mode . tex-mode) (mode . latex-mode) (mode . context-mode)
+            (mode . ams-tex-mode) (mode . bibtex-mode)))
+       ("web"
+        (or (derived-mode . sgml-mode) (derived-mode . css-base-mode)
+            (derived-mode . js-base-mode) (derived-mode . typescript-ts-base-mode)
+            (mode . js2-mode) (derived-mode . haml-mode) (mode . sass-mode)))
+       ("gnus"
+        (or (mode . message-mode) (mode . mail-mode) (mode . gnus-group-mode)
+            (mode . gnus-summary-mode) (mode . gnus-article-mode)))))
+   '(notmuch-archive-tags '("-inbox" "-unread" "+archive" "-flagged"))
+   '(notmuch-column-control 1.0)
+   '(notmuch-hello-sections
+     '(notmuch-hello-insert-header notmuch-hello-insert-saved-searches
+                                   (notmuch-hello-insert-searches "Important"
+                                                                  (("General"
+                                                                    . "not (tag:solaris or tag:oci)")
+                                                                   ("Solaris"
+                                                                    . "tag:solaris")
+                                                                   ("OCI"
+                                                                    . "tag:oci"))
+                                                                  :filter
+                                                                  "date:1/1/2026.. and (tag:important and tag:action)"
+                                                                  :show-empty-searches
+                                                                  t)
+                                   (notmuch-hello-insert-searches
+                                    "Secure Desktop Focused"
+                                    (("OSD unread" . "tag:osd")
+                                     ("Deployment Tickets"
+                                      . "tag:deployment-ticket")
+                                     ("PRs to go through" . "tag:PRs")
+                                     ("Brownbag" . "tag:brownbag")
+                                     ("Ocean Incidents / Alarms"
+                                      . "tag:ocean-incident or tag:alarm")
+                                     ("Announcements (PSA etc)"
+                                      . "tag:announcement")
+                                     ("Deployment Calendar events"
+                                      . "tag:calendar")
+                                     ("SGD" . "tag:sgd"))
+                                    :filter
+                                    "tag:osd and date:12/1/2025.. and (tag:unread or tag:important or tag:action)"
+                                    :show-empty-searches nil)
+                                   (notmuch-hello-insert-searches
+                                    "Solaris Focused"
+                                    (("Solaris"
+                                      . "tag:solaris and not (tag:akidr or tag:s11u4-sru or tag:trunk or tag:cluster or tag:s11u3-sru or tag:RE or tag:mrspatmore or tag:IPS)")
+                                     ("Solaris/All Solaris logs"
+                                      . "tag:solaris or tag:pughlog")
+                                     ("Solaris/RE"
+                                      . "tag:RE and not  (tag:logs or tag:pughlog)")
+                                     ("Solaris/mrspatmore" . "tag:mrspatmore")
+                                     ("Solaris/Cluster"
+                                      . "tag:cluster and not  (tag:logs or tag:pughlog)")
+                                     ("Solaris/AK IDRs"
+                                      . "tag:akidr and not  (tag:logs or tag:pughlog)")
+                                     ("Solaris/AK IDRs/logs"
+                                      . "tag:akidr and (tag:logs or tag:pushlog")
+                                     ("Solaris/S11.4-SRU"
+                                      . "tag:s11u4-sru and not (tag:on or tag:userland)")
+                                     ("Solaris/S11.4-SRU/ON"
+                                      . "tag:s11u4-sru and tag:on and not (tag:logs or tag:pushlog or tag:webrti)")
+                                     ("Solaris/S11.4-SRU/ON/logs"
+                                      . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog) and not tag:webrti")
+                                     ("Solaris/S11.4-SRU/ON/WebRTI"
+                                      . "tag:s11u4-sru and tag:on and tag:webrti")
+                                     ("Solaris/S11.4-SRU/Userland"
+                                      . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog) and not tag:webrti")
+                                     ("Solaris/S11.4-SRU/Userland/logs"
+                                      . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
+                                     ("Solaris/S11.4-SRU/Userland/WebRTI"
+                                      . "tag:s11u4-sru and tag:userland and tag:webrti")
+                                     ("Solaris/Trunk"
+                                      . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
+                                     ("Solaris/Trunk/Logs"
+                                      . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
+                                     ("Solaris/Trunk/WebRTI/ON"
+                                      . "tag:trunk and tag:on and tag:webrti")
+                                     ("Solaris/Trunk/WebRTI/Userland"
+                                      . "tag:trunk and tag:userland and tag:webrti")
+                                     ("Solaris/S11.3-SRU" . "tag:s11u3-sru")
+                                     ("Solaris/GKAP" . "tag:gkap")
+                                     ("Solaris/IPS" . "tag:IPS"))
+                                    :filter
+                                    "date:1/1/2026.. and (is:unread or is:important or is:action) "
+                                    :filter-count
+                                    "date:1/1/2026.. and (is:unread or is:important or is:action)")
+                                   (notmuch-hello-insert-searches "Solaris All"
+                                                                  (("Solaris"
+                                                                    . "tag:solaris and not (tag:akidr or tag:s11u4-sru or tag:trunk or tag:cluster or tag:s11u3-sru or tag:RE or tag:mrspatmore or tag:IPS)")
+                                                                   ("Solaris/All Solaris logs"
+                                                                    . "tag:solaris or tag:pughlog")
+                                                                   ("Solaris/RE"
+                                                                    . "tag:RE and not  (tag:logs or tag:pughlog)")
+                                                                   ("Solaris/Cluster"
+                                                                    . "tag:cluster and not  (tag:logs or tag:pughlog)")
+                                                                   ("Solaris/AK IDRs"
+                                                                    . "tag:akidr and not  (tag:logs or tag:pughlog)")
+                                                                   ("Solaris/AK IDRs/logs"
+                                                                    . "tag:akidr and (tag:logs or tag:pushlog")
+                                                                   ("Solaris/S11.4-SRU"
+                                                                    . "tag:s11u4-sru and not (tag:on or tag:userland)")
+                                                                   ("Solaris/S11.4-SRU/ON"
+                                                                    . "tag:s11u4-sru and tag:on and not (tag:logs or tag:pushlog or tag:webrti)")
+                                                                   ("Solaris/S11.4-SRU/ON/logs"
+                                                                    . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog) and not tag:webrti")
+                                                                   ("Solaris/S11.4-SRU/ON/WebRTI"
+                                                                    . "tag:s11u4-sru and tag:on and tag:webrti")
+                                                                   ("Solaris/S11.4-SRU/Userland"
+                                                                    . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog) and not tag:webrti")
+                                                                   ("Solaris/S11.4-SRU/Userland/logs"
+                                                                    . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
+                                                                   ("Solaris/S11.4-SRU/Userland/WebRTI"
+                                                                    . "tag:s11u4-sru and tag:userland and tag:webrti")
+                                                                   ("Solaris/Trunk"
+                                                                    . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
+                                                                   ("Solaris/Trunk/Logs"
+                                                                    . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
+                                                                   ("Solaris/Trunk/WebRTI/ON"
+                                                                    . "tag:trunk and tag:on and tag:webrti")
+                                                                   ("Solaris/Trunk/WebRTI/Userland"
+                                                                    . "tag:trunk and tag:userland and tag:webrti")
+                                                                   ("Solaris/S11.3-SRU"
+                                                                    . "tag:s11u3-sru")
+                                                                   ("Solaris/GKAP"
+                                                                    . "tag:gkap")
+                                                                   ("Solaris/IPS"
+                                                                    . "tag:IPS"))
+                                                                  :filter
+                                                                  "date:1/1/2026.."
+                                                                  :show-empty-searches
+                                                                  t)
+                                   notmuch-hello-insert-inbox
+                                   notmuch-hello-insert-footer))
    '(notmuch-saved-searches
-     '((:name "To me Unread" :query "tag:me AND tag:unread" :key [109])
-       (:name "📥 Inbox" :query "tag:inbox AND tag:unread" :key [105])))
+     '((:name "📥 Inbox" :query "tag:inbox AND tag:unread" :key [105])
+       (:name "To me Unread" :query "tag:me AND tag:unread" :key [109])))
    '(notmuch-search-oldest-first nil)
+   '(org-hide-leading-stars t)
    '(package-selected-packages
-     '(a ace-jump-helm-line ace-link afternoon-theme aggressive-indent aidermacs aio
-         alect-themes alert all-the-icons ample-theme ample-zen-theme
-         anaconda-mode anti-zenburn-theme apropospriate-theme auto-compile
-         auto-highlight-symbol auto-yasnippet autothemer badwolf-theme
-         birds-of-paradise-plus-theme blacken bubbleberry-theme bui busybee-theme
-         centered-cursor-mode cherry-blossom-theme chocolate-theme
-         clean-aindent-mode closql clues-theme code-cells code-review
-         color-theme-sanityinc-solarized color-theme-sanityinc-tomorrow
-         column-enforce-mode company company-anaconda company-box
-         company-quickhelp company-shell company-statistics company-terraform
-         company-web concurrent cond-let ctable cyberpunk-theme cython-mode
-         dakrone-theme dap-mode darkmine-theme darkokai-theme darktooth-theme
-         deferred define-word devdocs diminish dired-quick-sort disable-mouse
-         django-theme docker dockerfile-mode doom-themes dotenv-mode dracula-theme
-         drag-stuff dumb-jump eat edit-indirect editorconfig ef-themes elisp-def
-         elisp-demos elisp-slime-nav emacsql emmet-mode emojify emr epc esh-help
+     '(a ace-jump-helm-line ace-link afternoon-theme aggressive-indent ai-code
+         aidermacs aio alect-themes alert all-the-icons ample-theme
+         ample-zen-theme anaconda-mode anti-zenburn-theme apropospriate-theme
+         auto-compile auto-highlight-symbol auto-yasnippet autothemer
+         badwolf-theme birds-of-paradise-plus-theme blacken bmx-mode
+         bubbleberry-theme bui busybee-theme centered-cursor-mode
+         cherry-blossom-theme chocolate-theme clean-aindent-mode closql
+         clues-theme code-cells code-review color-theme-sanityinc-solarized
+         color-theme-sanityinc-tomorrow column-enforce-mode company
+         company-anaconda company-box company-quickhelp company-shell
+         company-statistics company-terraform company-web concurrent cond-let
+         conda ctable cyberpunk-theme cython-mode dakrone-theme dap-mode
+         darkmine-theme darkokai-theme darktooth-theme deferred define-word
+         devdocs diminish dired-quick-sort disable-mouse django-theme docker
+         dockerfile-mode doom-themes dotenv-mode dracula-theme drag-stuff
+         dumb-jump eat edit-indirect editorconfig ef-themes elisp-def elisp-demos
+         elisp-slime-nav emacsql emmet-mode emojify emr epc esh-help
          eshell-prompt-extras eshell-z espresso-theme eval-sexp-fu evil-anzu
          evil-args evil-cleverparens evil-collection evil-easymotion evil-escape
          evil-evilified-state evil-exchange evil-goggles evil-iedit-state
@@ -1296,17 +1524,16 @@ This function is called at the very end of Spacemacs initialization."
          evil-nerd-commenter evil-numbers evil-org evil-surround evil-textobj-line
          evil-tutor evil-unimpaired evil-visual-mark-mode evil-visualstar
          exotica-theme expand-region eyebrowse eziam-themes fancy-battery
-         farmhouse-themes fish-mode flatland-theme flatui-theme flx-ido
-         flycheck-bashate flycheck-elsa flycheck-package flycheck-pos-tip forge
-         frame-local gandalf-theme gh-md ghub git-link git-messenger git-modes
-         git-timemachine gitignore-templates gntp gnuplot golden-ratio
-         google-translate gotham-theme grandshell-theme gruber-darker-theme
-         gruvbox-theme haml-mode hc-zenburn-theme hcl-mode helm-ag
-         helm-c-yasnippet helm-comint helm-company helm-css-scss helm-descbinds
-         helm-git-grep helm-ls-git helm-lsp helm-make helm-mode-manager
-         helm-notmuch helm-org helm-org-rifle helm-projectile helm-purpose
-         helm-pydoc helm-swoop helm-themes helm-xref hemisu-theme heroku-theme
-         hide-comnt hierarchy highlight-indentation highlight-numbers
+         farmhouse-themes fish-mode flatland-theme flatui-theme flx-ido flycheck
+         forge frame-local gandalf-theme ggtags gh-md ghub git-link git-messenger
+         git-modes git-timemachine gitignore-templates gntp gnuplot golden-ratio
+         google-translate gotham-theme grandshell-theme groovy-imports groovy-mode
+         gruber-darker-theme gruvbox-theme haml-mode hc-zenburn-theme hcl-mode
+         helm helm-ag helm-c-yasnippet helm-comint helm-company helm-css-scss
+         helm-descbinds helm-git-grep helm-ls-git helm-lsp helm-make
+         helm-mode-manager helm-notmuch helm-org helm-org-rifle helm-projectile
+         helm-purpose helm-pydoc helm-swoop helm-themes helm-xref hemisu-theme
+         heroku-theme hide-comnt hierarchy highlight-indentation highlight-numbers
          highlight-parentheses hl-todo holy-mode htmlize hungry-delete hybrid-mode
          impatient-mode importmagic indent-guide info+ inkpot-theme insert-shebang
          inspector ir-black-theme jazz-theme jbeans-theme js-doc js2-mode
@@ -1324,27 +1551,28 @@ This function is called at the very end of Spacemacs initialization."
          org-mac-link org-mime org-msg org-pomodoro org-present
          org-project-capture org-projectile org-rich-yank org-superstar
          organic-green-theme orgit orgit-forge origami overseer ox-jira ox-twbs
-         pandoc-mode paradox password-generator pcre2el phoenix-dark-mono-theme
-         phoenix-dark-pink-theme pip-requirements pipenv pippel planet-theme
-         poetry popwin pos-tip prettier-js professional-theme pug-mode
-         purple-haze-theme py-isort pydoc pyenv-mode pylookup pytest pythonic
-         pyvenv quickrun railscasts-theme rainbow-delimiters rebecca-theme request
-         restart-emacs reverse-theme sass-mode scss-mode seti-theme shell-pop
-         shfmt simple-httpd skewer-mode slim-mode smeargle smyx-theme
-         soft-charcoal-theme soft-morning-theme soft-stone-theme solarized-theme
-         soothe-theme space-doc spacegray-theme spaceline spacemacs-purpose-popwin
-         spacemacs-whitespace-cleanup sphinx-doc string-edit-at-point
-         string-inflection subatomic-theme subatomic256-theme sublime-themes
-         sunny-day-theme symbol-overlay symon tablist tagedit tango-2-theme
-         tango-plus-theme tangotango-theme tao-theme term-cursor terminal-here
-         tern terraform-mode toc-org toml-mode toxi-theme transient treemacs-evil
-         treemacs-icons-dired treemacs-magit treemacs-persp treemacs-projectile
-         treepy twilight-anti-bright-theme twilight-bright-theme twilight-theme
-         ujelly-theme underwater-theme undo-fu undo-fu-session vi-tilde-fringe
-         vim-powerline volatile-highlights vterm vundo web-beautify
-         web-completion-data web-mode which-key white-sand-theme winum with-editor
-         writeroom-mode ws-butler yaml yaml-mode yapfify yasnippet
-         yasnippet-snippets zen-and-art-theme zenburn-theme zonokai-emacs)))
+         pandoc-mode paradox password-generator pcache pcre2el
+         phoenix-dark-mono-theme phoenix-dark-pink-theme pip-requirements pipenv
+         pippel planet-theme poetry popwin pos-tip powershell prettier-js
+         professional-theme pug-mode purple-haze-theme py-isort pydoc pyenv-mode
+         pylookup pytest pythonic pyvenv quickrun railscasts-theme
+         rainbow-delimiters rebecca-theme request restart-emacs reverse-theme
+         sass-mode scss-mode seti-theme shell-pop shfmt simple-httpd skewer-mode
+         slim-mode smeargle smyx-theme soft-charcoal-theme soft-morning-theme
+         soft-stone-theme solarized-theme soothe-theme space-doc spacegray-theme
+         spaceline spacemacs-purpose-popwin spacemacs-whitespace-cleanup
+         sphinx-doc string-edit-at-point string-inflection subatomic-theme
+         subatomic256-theme sublime-themes sunny-day-theme symbol-overlay symon
+         tablist tagedit tango-2-theme tango-plus-theme tangotango-theme tao-theme
+         term-cursor terminal-here tern terraform-mode toc-org toml-mode
+         toxi-theme transient treemacs-evil treemacs-icons-dired treemacs-magit
+         treemacs-persp treemacs-projectile treepy twilight-anti-bright-theme
+         twilight-bright-theme twilight-theme ujelly-theme underwater-theme
+         undo-fu undo-fu-session vi-tilde-fringe volatile-highlights vterm vundo
+         web-beautify web-completion-data web-mode which-key white-sand-theme
+         winum with-editor writeroom-mode ws-butler yaml yaml-mode yapfify
+         yasnippet yasnippet-snippets zen-and-art-theme zenburn-theme
+         zonokai-emacs)))
   (custom-set-faces
    ;; custom-set-faces was added by Custom.
    ;; If you edit it by hand, you could mess it up, so be careful.

.ssh/config.oci

@@ -14,3 +14,6 @@ Host dabel dabel.us.oracle.com andel andel.us.oracle.com gates gates.us.oracle.c
 	RequestTTY yes
 
 
+Host oci.private.devops.scmservice.us-phoenix-1.oci.oracleiaas.com
+      PKCS11Provider /Library/OpenSC/lib/opensc-pkcs11.so
+      User pnyc@bmc_operator_access

.zshenv

@@ -2,11 +2,24 @@ 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/:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH:$HOME/.fzf/bin
+
+# homebrew config
+# output of brew shellenv
+export HOMEBREW_PREFIX="/opt/homebrew";
+export HOMEBREW_CELLAR="/opt/homebrew/Cellar";
+export HOMEBREW_REPOSITORY="/opt/homebrew";
+fpath[1,0]="/opt/homebrew/share/zsh/site-functions";
+eval "$(/usr/bin/env PATH_HELPER_ROOT="/opt/homebrew" /usr/libexec/path_helper -s)"
+[ -z "${MANPATH-}" ] || export MANPATH=":${MANPATH#:}";
+export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
+
 
 
 alias oe='open /Applications/Emacs.app'
-alias mc='/opt/homebrew/bin/mc --nosubshell'
+# Force mc to use bash for its subshell
+alias mc='SHELL=/bin/bash mc'
+
 alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 alias -g N="2>&1 "
 alias pig='ping'

.zshrc

@@ -304,3 +304,7 @@ if command -v launchctl >/dev/null 2>&1; then
 fi
 
 export GPG_TTY=$(tty)
+
+### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT)
+# export PATH="/Users/jetpac/.rd/bin:$PATH"
+### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT)

Library/Application Support/iTerm2/DynamicProfiles/tmux_keys.json

@@ -89,12 +89,6 @@
                  "Text" : "01 6c",
                  "Version" : 1
               },
-              "0x6e-0x80000-0x2d" : {
-                 "Action" : 11,
-                 "Label" : "",
-                 "Text" : "01 6e",
-                 "Version" : 1
-              },
               "0x70-0x80000-0x23" : {
                  "Action" : 11,
                  "Label" : "",

bin/retag-email

@@ -0,0 +1,492 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+#
+# script to tag notmuch emails based on my preference
+#
+# inspired by https://forsooth.org/posts/email-in-spacemacs/index.html
+#
+#
+# tags: important solaris oci osd
+#
+#
+
+notmuch tag +sent -unread 'folder:/[Ss]ent.*/'
+
+notmuch tag +me to:petr.nyc@oracle.com
+
+# idea for logic
+# sort by projects, don't unset new/read tag
+# at the very bottom, unset the new/read tag based on if I'm interested in the latest
+# status for the project / logs for the project and so on - good for stepping for someone
+
+# General sorting rules not specific to projects
+################################################################################
+notmuch tag +important -- \
+        tag:new AND "
+        (
+        subject:/[Cc]omplete.*[Tt]raining/ OR
+        subject:/.*Reminder:?/ OR
+        from:elanor.cz OR
+        from:payroll_cz OR
+        from:instructor.cz OR
+        subject:Expense Report Approval OR
+        subject:/[Aa]ction.[Nn]eeded/ OR
+        from:permissions.oci.oraclecloud.com
+)"
+notmuch tag +general \
+        tag:new AND "(
+        subject:'Oracle Open Roles' OR
+        from:tania.c.cortez OR
+        from:info@eduagroup.cz OR
+        subject:'FYI: Expense Reimbursement'
+)"
+
+notmuch tag +calendar \
+        tag:new AND mimetype:text/calendar
+
+
+# Solaris
+################################################################################
+
+# general solaris
+notmuch tag +solaris +logs +mrspatmore -- \
+        tag:new AND "(
+        subject:/.*BugDB.*release.deployment/ OR
+        subject:import/sig_ci/mercurial/mrspatmore OR
+        (from:vcap_admin_ww_grp AND subject:/WARNING:|INFO:/)
+        )"
+
+notmuch tag +solaris +logs \
+        tag:new AND 'subject:Next IDR ID is'
+notmuch tag +solaris \
+        tag:new AND "(
+        from:deirdre.williams@oracle.com AND subject:'Sustaining Meeting'
+        )"
+
+# phabricator
+notmuch tag +phabricator +logs -me \
+        tag:new AND \
+        from:noreply@scapen-phabricator.us.oracle.com
+
+notmuch tag +s11u3-sru +on \
+        tag:new AND "(
+        tag:phabricator AND
+        subject:/rONCLOSED|rONMAN|rONSRC/ and subject:/11.3/
+        )"
+
+notmuch tag +s11u3-sru +userland \
+        tag:new AND "(
+        tag:phabricator AND
+        subject:/\[Diffusion\].*rUSERLAND.*11\.3/
+)"
+
+notmuch tag +userland -unread -inbox \
+	tag:new AND "(
+		from:mailman-owner@userland.us.oracle.com
+	)"
+
+notmuch tag +s11u4-sru +userland \
+        tag:new AND "(
+        tag:phabricator AND
+        subject:/\[Diffusion\].*rUSERLAND.*11\.4/
+)"
+
+notmuch tag +mrspatmore \
+        tag:new AND "(
+        tag:phabricator AND \
+        subject:/\[Diffusion\].*rMRSPATMORE/
+)"
+
+notmuch tag +mrspatmore \
+        tag:new AND "(
+        tag:phabricator AND \
+        subject:/\[Diffusion\].*rREJENKINSLIB/
+)"
+
+notmuch tag +IPS \
+        tag:new AND "(
+        tag:phabricator AND \
+        ( ( subject:/\[Differential\]/ and body:REPOSITORY NEAR/1 rPKG ) OR
+          ( subject:/\[Diffusion\]/ and body:COMMITS NEAR rPKG )
+        )
+)"
+
+# akidr
+notmuch tag +akidr +logs -unread \
+        tag:new AND "(
+        from:vcap_admin_ww_grp AND
+        subject:'Docker with ARU uploadcli has been automatically frozen'
+        )"
+
+notmuch tag +akidr \
+        tag:new AND "(
+        to:'bot@artas' OR
+        from:'bot@artas' OR
+        to:'fishworks-gk_ww_grp@oracle.com' OR
+        subject:'PASS s11_4aksruidr' OR
+        subject:'Build started for AK IDR' OR
+        subject:'New AK IDR request for'
+)"
+
+notmuch tag +akidr +logs -unread \
+        tag:new AND "(
+        from:'vcap_admin_ww_grp@oracle.com' AND \
+        subject:'ARU Uploads has been frozen for' AND \
+        subject:'this is a reminder please review'
+)"
+
+notmuch tag +akidr +logs +important \
+        tag:new AND "(
+        (from:sig-devops_ww_grp OR from:adam.paul) AND \
+        subject:/8\.\8.*idr.*DC.*has.failed/
+)"
+
+
+# WebRTI
+notmuch tag +webrti \
+        tag:new AND "(
+        body:Consolidation: AND
+        body:RTI: AND
+        subject:WebRTI:
+        )"
+notmuch tag +important \
+        tag:new AND "(
+        tag:webrti AND
+        to:petr.nyc and
+        subject:/NEED.APPROVAL.*WebRTI/
+        )"
+
+
+# BugDB
+notmuch tag +bugdb \
+        tag:new AND "(
+        from:ociapp-notifications and subject:/ER|Bug/
+        )"
+
+# ON
+notmuch tag +on tag:new AND "(tag:webrti AND body:Consolidation: NEAR/1 on"
+
+notmuch tag +s11u3-sru tag:new AND "(tag:webrti AND tag:on AND body:Gates: S11.SRU.Sustaining)"
+
+notmuch tag +s11u3-sru tag:new AND "(subject:/Solaris.*11.3.*[Rr]eleased/)"
+notmuch tag +s11u4-sru tag:new AND "(subject:/Solaris.*11.4.*[Rr]eleased/)"
+
+notmuch tag +s11u4-sru +logs +on \
+        tag:new and 'from:/root@sig-on-sru11-3-[xs]01/'
+
+notmuch tag +s11u4-sru tag:new AND "(
+        tag:webrti AND tag:on AND body:Gates: 11.4-SRU
+        )"
+
+notmuch tag +on +pushlog \
+        tag:new AND \
+        subject:'/export.on-gate.*push/'
+
+notmuch tag +on +trunk \
+        tag:new AND "(
+        to:gk@hubbins OR to:gatekeeper@hubbins OR to:hg@hubbins OR
+        from:gatekeeper@hubbins
+        )"
+
+notmuch tag +important \
+        tag:new AND "(
+        tag:on and subject:error and (from:gatekeeper@hubbins or to:gatekeeper@hubbins)
+)"
+
+notmuch tag +important +s11u4-sru +on \
+        tag:new AND "(
+        from:sig-devops_ww_grp  AND
+        subject:/INPUT.NEEDED.*11.4|s11u4_sust.*Ready.for/
+)"
+
+notmuch tag +trunk \
+        tag:new AND "(
+        tag:on AND tag:pushlog body:Branch: default
+)"
+
+notmuch tag +s11u3-sru tag:new AND "(
+        tag:on AND tag:pushlog body:Branch:  s11u3-sru
+)"
+
+notmuch tag +on +trunk +logs \
+        tag:new AND \
+        '(to:gk-builds@hubbins.us.oracle.com OR to:gk-splice-builds@hubbins.us.oracle.com) AND body:"Build summary"'
+
+notmuch tag +on +trunk +logs -unread \
+        tag:new AND "(
+        from:noaccess AND
+        subject:/boston|eleven|hopper|on-gate-test|severin|smalls|stumpy|zero/
+        )"
+
+notmuch tag +on +trunk +jenkins tag:new AND to:gk-jenkins@hubbins.us.oracle.com
+notmuch tag +on +trunk +logs \
+        tag:new AND "(
+        (to:gk@hubbins.us.oracle.com and subject:'zpool report for') OR
+        (to:on-parfait@hubbins and subject:'Parfait Differences')
+)"
+
+notmuch tag +on +s11u4-sru +logs +important \
+        tag:new AND "(
+        from:gk@hubbins.us.oracle.com AND
+        subject:'New SRU branch from trunk'
+)"
+
+notmuch tag +on +trunk +s11u4-sru +s11u3-sru +logs +important \
+        tag:new AND subject:on-repo-hooks
+
+notmuch tag +on +s11u4-sru +important +logs \
+        tag:new AND 'subject:/URGENT:.production.build-11.4.*/'
+
+notmuch tag +on +pushlog \
+        tag:new AND to:hubbins AND 'subject:/.export\/on-gate.*push/'
+
+notmuch tag +on +s11u4-sru +important +logs \
+        tag:new AND subject:"fail" AND subject:"Solaris_11/11.4/ON" AND subject:"11.4"
+
+notmuch tag +on +s11u4-sru +important +logs \
+        tag:new AND subject:"fail" AND 'subject:/on-11u4-bld/'
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        tag:new AND "(
+        from:s11autoport_grp@oracle.com AND
+        (subject:'periodic GKAP push analysis') or subject:'GK Backport testing has completed'
+)"
+
+notmuch tag +on +gkap +logs +s11u4-sru  \
+        "tag:new AND tag:inbox AND (subject:GKAP or subject:GKAB)"
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND to:rpe_gk_backport_ww_grp and subject:/pass.*on11u4.*scapen/"
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND from:blduser@bld.us.oracle.com AND to:rpe_gk_backport_ww_grp"
+
+notmuch tag +on +gkap +logs +s11u4-sru \
+        "tag:new AND from:rpe_sme_ww_grp AND NOT
+                             (subject:/INTERIM.GK.Backport.*/ OR subject:/New.GK.backport.testing.has.started/ OR
+                              subject:/^.*GK.Backport.testing.has.completed/ OR
+                              subject:/INTERIM.GK.Backport.report.for/)"
+
+
+
+
+# notmuch tag +on +gkap +logs +s11u4-sru \
+#         tag:new AND from:rpe_sme_ww_grp@oracle.com AND subject:"/INTERIM.GK.Backport.report.for.GKAP_11.4.*/"
+
+# notmuch tag +on +gkap +logs +s11u4-sru \
+#         "tag:new AND subject:/.*Build.*GKAB.*Completed/"
+
+# notmuch tag +on +gkap +logs +s11u4-sru \
+#         "tag:new AND from:rpe_gk_backport_ww_grp AND (subject:pass or subject:successfull or subject:successful)"
+
+
+notmuch tag +on +logs +s11u4-sru \
+        tag:new AND "(
+        subject:/on-gate.s11u4..*.packages.ready/ OR
+        subject:/pass:.*Solaris_11/11.4/ON/production.build-11.4.*/ OR
+        subject:/^pass.*11.4..*.11.4.*..on-11u4-bld-[xs]./
+)"
+
+notmuch tag +solaris +logs -unread \
+        tag:new AND 'subject:/\[\/var\/tmp\/repo_cache\/PKG\]/'
+
+notmuch tag +on +important \
+        tag:new AND \
+        to:solaris_sru_gk_ww_grp AND \
+        subject:FAILED
+
+# userland
+notmuch tag +userland  tag:new AND "subject:GATE OPEN" AND "from:solaris_sru_gk_ww_grp" AND body:userland
+notmuch tag +userland  tag:new AND tag:webrti AND "body:/Consolidation.*userland/"
+notmuch tag +s11u4-sru tag:new AND tag:userland AND tag:webrti AND body:"/Gates:.*S11.4-SRU/"
+notmuch tag +trunk     tag:new AND tag:userland AND tag:webrti AND body:"/Gates:.*solaris-trunk/"
+notmuch tag +userland  tag:new AND to:userland-s11-sru-notify
+notmuch tag +s11u3-sru \
+        tag:new AND \
+        tag:userland AND \
+        subject:'push to s11u3-sru'
+notmuch tag +s11u4-sru \
+        tag:new AND \
+        tag:userland AND \
+        subject:'/.*push.to.s11u4_sust.*/'
+
+
+# cluster
+notmuch tag +cluster \
+        tag:new AND "(
+        tag:webrti AND (body:Consolidation:  sc-geo or body:Consolidation:  suncluster) OR
+        subject:'SC4.4 SRU Nightly' OR from:'SC Build Engineering'
+)"
+notmuch tag +important \
+        tag:new AND \
+        tag:cluster and 'subject:/[Ff]ail/'
+
+# IPS
+notmuch tag +IPS \
+        tag:new AND \
+        subject:'[Differential]' AND body:'rPKG Solaris Image Packaging System'
+
+# RE
+notmuch tag +RE \
+        tag:new AND "(
+        to:solaris-re_us_grp OR
+        to:ips_tracker_support_ww_grp OR
+        from:ips_tracker_support_ww_grp
+        )"
+
+notmuch tag +s11u3-sru \
+        tag:new AND \
+        tag:re AND \
+        'subject:/Oracle.Solaris.11\.3/'
+
+notmuch tag +RE +s11u4-sru \
+        tag:new AND \
+        tag:RE AND \
+        'subject:/.*IDRs.*s11_4sru.*/'
+
+notmuch tag +s11u4-sru \
+        tag:new AND \
+        tag:RE AND \
+        'subject:/RTI.*withdrawal.notification/' AND \
+        body:'11.4'
+
+notmuch tag +s11u4-sru \
+        tag:new AND \
+        tag:RE AND \
+        'subject:/S11.4.*repo.ready.for.testing/'
+
+
+notmuch tag +s11u3-sru \
+        tag:new AND \
+        tag:RE AND \
+        'subject:/.*IDRs.*s11_3sru.*/'
+
+notmuch tag +cluster \
+        tag:new AND \
+        tag:re AND \
+        '(subject:/.*IDRs.*cluster.*/ OR subject:/SRU.Build.Package.Profile.successfully.created.for.solariscluster.*/)'
+
+notmuch tag +akidr \
+        tag:new AND \
+        tag:RE AND \
+        'subject:/.*Tracker.FYI.*IDR.*state.change/'
+
+notmuch tag +RE s11u4-sru \
+        tag:new AND \
+        subject:'[Differential]' AND body:'Repository rRETRUNK Release Engineering Trunk Gate'
+
+notmuch tag +RE +logs -unread \
+        tag:new AND "(
+        from:noaccess AND
+        subject:/ipkg[1-9]/
+        )"
+
+notmuch tag +solaris \
+        tag:new AND "(
+        tag:akidr       OR
+        tag:bugdb       OR
+        tag:cluster     OR
+        tag:IPS         OR
+        tag:on          OR
+        tag:phabricator OR
+        tag:RE          OR
+        tag:trunk       OR
+        tag:userland    OR
+        tag:webrti
+)"
+
+# end of Solaris
+################################################################################
+
+# OCI / OSD
+################################################################################
+
+
+# seatch term to include in each search
+# commented out for debugging
+# ST='tag:new'
+ST="date:1/1/2026.."
+
+notmuch tag +osd \
+        "$ST" AND "(
+        to:osd-devops_ww_grp@oracle.com OR \
+        subject:[gbu confluence]
+)"
+
+notmuch tag +osd +brownbag \
+        "$ST" AND 'subject:/[Bb]rown.[Bb]ag/'
+notmuch tag +deployment-ticket "$ST" AND tag:osd AND subject:"New OSD deployment ticket:"
+notmuch tag +ocean-incident "$ST" AND tag:osd AND subject:"[Ocean Incident]"
+notmuch tag +alarm "$ST" AND tag:osd AND subject:'Alarm: '
+notmuch tag +osd "$ST" AND subject:'InfraCloud JIRA'
+notmuch tag +osd +sgd \
+        "$ST" AND subject:'SGD'
+notmuch tag +oci +announcement \
+        "$ST" AND subject:'A PSA'
+# PRs for approval
+notmuch tag +osd +PRs \
+        "$ST" AND subject:'ACTION REQUIRED - Peer approval needed for Change Request' AND \
+        body:'/Service Owner:.*Desktop as a Service/'
+# PRs from other projects
+notmuch tag +oci +CCAT-PRs \
+        "$ST" AND \
+        subject:'ACTION REQUIRED - Peer approval needed for Change Request' AND \
+        body:'/Service Owner:Compute Cloud at Customer/'
+
+# OCI production regions
+notmuch tag +oci +osd +important +region-ga \
+        "$ST" AND \
+        "from:/OCI-REGION-BUILD.*/"
+
+# Change Freeze
+notmuch tag +oci +important +changefreeze \
+	"$ST" AND \
+	"subject:/Oracle.Change.Management.Alert/"
+
+
+# ODAAS Deployments Calendar
+notmuch tag +osd +calendar \
+        "$ST" AND \
+        "subject:/\[confluence\].*created.a.new|updated.a.*event.in.the.*OSD.RE.Deployments.*calendar/"
+
+# ODAAS PRs
+notmuch tag +osd +PRs\
+        "$ST" AND \
+        "subject:/ODAAS\/.*Pull.request.*:/"
+
+
+
+
+
+notmuch tag +oci tag:new AND tag:osd
+
+################################################################################
+
+# I don't want these in my focused inbox
+################################################################################
+
+# passed logs for on trunk
+notmuch tag -inbox -unread tag:on AND tag:trunk AND tag:logs AND subject:"pass"
+
+# trunk RTIs,pushlog,jenkins logs
+notmuch tag -inbox -unread tag:trunk and tag:webrti
+notmuch tag -inbox -unread tag:on AND tag:trunk AND tag:pushlog
+notmuch tag -inbox -unread tag:on AND tag:trunk AND tag:jenkins
+
+# ON GKAP notifications
+notmuch tag -inbox -unread tag:new AND tag:gkap AND tag:logs and not subject:failed
+
+# osd ocean incidents, alarms
+notmuch tag -inbox -unread tag:osd AND '(tag:ocean-incident or tag:alarm)'
+
+
+# emails with subject:"REGION BUILD ALERT]" are important to watch
+
+
+
+# ================================================================================
+# the very last part of this - remove the new tag
+notmuch tag -new tag:new