diff --git a/.gitconfig b/.gitconfig index bff66c0..f826b6a 100644 --- a/.gitconfig +++ b/.gitconfig @@ -45,3 +45,5 @@ defaultBranch = master [webui] autoupdate = true +; [color] +; ui = auto diff --git a/.spacemacs b/.spacemacs index 27366ff..c954431 100644 --- a/.spacemacs +++ b/.spacemacs @@ -32,7 +32,10 @@ This function should only modify configuration layer settings." ;; List of configuration layers to load. dotspacemacs-configuration-layers - '(nginx + '(swift + yaml + themes-megapack + nginx toml html python @@ -74,6 +77,7 @@ This function should only modify configuration layer settings." ;; version-control treemacs docker + terraform ) @@ -91,6 +95,7 @@ This function should only modify configuration layer settings." dotspacemacs-additional-packages '( org-mac-link org-alert + ;org-caldav ;org-protocol ) @@ -278,10 +283,11 @@ It should only modify the values of Spacemacs settings." ;; fixed-pitch faces. The `:size' can be specified as ;; a non-negative integer (pixel size), or a floating-point (point size). ;; Point size is recommended, because it's device independent. (default 10.0) - dotspacemacs-default-font '("Source Code Pro for Powerline" - :size 18.0 - :weight normal - :width normal) + ;; commented out on 30.7.2025 - seems not to have effect + ;; dotspacemacs-default-font '("Source Code Pro for Powerline" + ;; :height 180 + ;; :weight normal + ;; :width normal) ;; The leader key (default "SPC") dotspacemacs-leader-key "SPC" @@ -347,7 +353,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil, the paste transient-state is enabled. While enabled, after you ;; paste something, pressing `C-j' and `C-k' several times cycles through the ;; elements in the `kill-ring'. (default nil) - dotspacemacs-enable-paste-transient-state t + dotspacemacs-enable-paste-transient-state nil ;; Which-key delay in seconds. The which-key buffer is the popup listing ;; the commands bound to the current keystroke sequence. (default 0.4) @@ -592,6 +598,8 @@ This function is called immediately after `dotspacemacs/init', before layer configuration. It is mostly for variables that should be set before packages are loaded. If you are unsure, try setting them in `dotspacemacs/user-config' first." + ;; (add-to-list 'load-path "/Users/jetpac/Documents/emacs/tramp-mirror/tramp/lisp") + ) @@ -609,6 +617,33 @@ This function is called at the very end of Spacemacs startup, after layer configuration. Put your configuration code here, except for variables that should be set before packages are loaded." + + + ;; setting gui font for gui only + (defun my/set-gui-font () + (when (display-graphic-p) + (set-frame-font "MesloLGS Nerd Font-18" t t))) + ;; (set-frame-font "Source Code Pro for Powerline-18" t t))) + + (add-hook 'after-make-frame-functions + (lambda (frame) + (select-frame frame) + (my/set-gui-font))) + + ;; Also apply font immediately if current frame is GUI + (my/set-gui-font) + + ;; end of setting gui font + + ;; (require 'tramp) + + ;; for 24bit colors to work (and extra themes), use TERM=xterm-24bit + ;; as described at https://github.com/syl20bnr/spacemacs/wiki/Terminal + + ;; for pandoc to work + (add-to-list 'exec-path "/opt/homebrew/bin") + (setenv "PATH" (concat "/opt/homebrew/bin:" (getenv "PATH"))) + ;; Proxy toggle function (setq http_proxy "http://www-proxy.uk.oracle.com:80") (defun toggle-proxy () @@ -632,7 +667,7 @@ before packages are loaded." (defun set-dotfiles-environment () "Set environment variables for the dotfiles repository." (interactive) - (setenv "GIT_DIR" (expand-file-name "~/.cfg/.git")) + (setenv "GIT_DIR" (expand-file-name "~/.cfg/")) (setenv "GIT_WORK_TREE" (expand-file-name "~")) (message "Dotfiles environment set.")) @@ -660,6 +695,56 @@ 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 + + ;; 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) + )) + ) + + ;; 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/") + + ;; ;; 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") + + ;; ;; 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) + + ;; ;; 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") + ;; ================================================================================ + + ;; Define the custum capture templates (setq org-capture-templates '(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks") @@ -685,7 +770,9 @@ before packages are loaded." (setq org-agenda-files '("~/Documents/org/inbox.org" "~/Documents/org/projects.org" "~/Documents/org/someday.org" - "~/Documents/org/calendar.org")) + "~/Documents/org/calendar.org" + "~/Documents/org/synced_calendar.org" + )) @@ -769,6 +856,52 @@ before packages are loaded." (if (string= (match-string 1) " ") "x" " ") nil nil nil 1)))) + (setq warning-minimum-level :error) + + + ;; 28.4. - terminal clipboard integration + ;; (when (and (not (display-graphic-p)) + ;; (eq system-type 'darwin)) + ;; (defun copy-to-mac-clipboard (text &optional push) + ;; (let ((process-connection-type nil)) + ;; (let ((proc (start-process "pbcopy" "*Messages*" "pbcopy"))) + ;; (process-send-string proc text) + ;; (process-send-eof proc)))) + + ;; (defun paste-from-mac-clipboard () + ;; (shell-command-to-string "pbpaste")) + + ;; (setq interprogram-cut-function 'copy-to-mac-clipboard) + ;; (setq interprogram-paste-function 'paste-from-mac-clipboard)) + + ;; terminal clipboard that should also work on remote systems + (defun my/set-clipboard-integration () + (cond + ;; macOS in terminal (non-GUI mode) – use pbcopy/pbpaste + ((and (eq system-type 'darwin) + (not (display-graphic-p))) + (defun copy-to-mac-clipboard (text &optional push) + (let ((process-connection-type nil)) + (let ((proc (start-process "pbcopy" "*Messages*" "pbcopy"))) + (process-send-string proc text) + (process-send-eof proc)))) + (defun paste-from-mac-clipboard () + (shell-command-to-string "pbpaste")) + (setq interprogram-cut-function 'copy-to-mac-clipboard) + (setq interprogram-paste-function 'paste-from-mac-clipboard)) + + ;; All other non-GUI modes (e.g., tmux, remote SSH) – use OSC 52 + ((not (display-graphic-p)) + (defun copy-to-osc52 (text &optional push) + (let ((osc52 (concat "\e]52;c;" (base64-encode-string text t) "\a"))) + (send-string-to-terminal osc52))) + (setq interprogram-cut-function 'copy-to-osc52) + ;; paste not supported with OSC 52, leave interprogram-paste-function nil + (message "Using OSC 52 for clipboard integration")))) + + (my/set-clipboard-integration) + + ) ;; user-config @@ -784,53 +917,84 @@ 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-safe-themes + '("7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8" + "810691bd221e4639d5ef736b1bd930a7fb32a7c6043a5634e04f86edea973f6d" + "a0ac98a1bde5d6336295fd350155a4aac1d63c53c1b3773062271074d16ebeb5" + "bbb13492a15c3258f29c21d251da1e62f1abb8bbd492386a673dcfab474186af" + "7fd8b914e340283c189980cd1883dbdef67080ad1a3a9cc3df864ca53bdc89cf" default)) '(package-selected-packages - '(a ace-jump-helm-line ace-link aggressive-indent aio alert all-the-icons - anaconda-mode auto-compile auto-highlight-symbol auto-yasnippet blacken - bui centered-cursor-mode clean-aindent-mode closql code-cells code-review + '(a ace-jump-helm-line ace-link afternoon-theme aggressive-indent 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-web concurrent - ctable cython-mode dap-mode deferred define-word devdocs diminish - dired-quick-sort disable-mouse docker dockerfile-mode dotenv-mode - drag-stuff dumb-jump edit-indirect editorconfig elisp-def elisp-demos - elisp-slime-nav emacsql emmet-mode emojify emr epc 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 - evil-indent-plus evil-lion evil-lisp-state evil-matchit evil-mc - evil-nerd-commenter evil-numbers evil-org evil-surround evil-textobj-line - evil-tutor evil-unimpaired evil-visual-mark-mode evil-visualstar - expand-region eyebrowse fancy-battery fish-mode flx-ido flycheck-bashate - flycheck-elsa flycheck-package flycheck-pos-tip forge frame-local gh-md + company-quickhelp company-shell company-statistics company-terraform + company-web concurrent 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 edit-indirect editorconfig ef-themes elisp-def elisp-demos + elisp-slime-nav emacsql emmet-mode emojify emr epc 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 evil-indent-plus evil-lion evil-lisp-state + evil-matchit evil-mc 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 haml-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-org - helm-org-rifle helm-projectile helm-purpose helm-pydoc helm-swoop - helm-themes helm-xref hide-comnt hierarchy highlight-indentation - highlight-numbers highlight-parentheses hl-todo holy-mode htmlize - hungry-delete hybrid-mode impatient-mode importmagic indent-guide info+ - insert-shebang inspector js-doc js2-mode js2-refactor json-mode - json-navigator json-reformat json-snatcher link-hint live-py-mode - livid-mode load-env-vars log4e lorem-ipsum lsp-docker lsp-mode - lsp-origami lsp-pyright lsp-treemacs lsp-ui macrostep magit magit-section - markdown-mode markdown-toc multi-line multiple-cursors nameless - nginx-mode nodejs-repl nose npm-mode open-junk-file org-alert - org-category-capture org-cliplink org-contrib org-download org-jira - org-mac-link org-mime org-pomodoro org-present org-project-capture - org-projectile org-rich-yank org-superstar orgit orgit-forge origami - overseer ox-jira ox-pandoc ox-twbs pandoc-mode paradox password-generator - pcre2el pip-requirements pipenv pippel poetry popwin pos-tip prettier-js - pug-mode py-isort pydoc pyenv-mode pylookup pytest pythonic pyvenv - quickrun rainbow-delimiters request restart-emacs sass-mode scss-mode - shfmt simple-httpd skewer-mode slim-mode smeargle space-doc spaceline - spacemacs-purpose-popwin spacemacs-whitespace-cleanup sphinx-doc - string-edit-at-point string-inflection symbol-overlay symon tablist - tagedit term-cursor tern toc-org toml-mode transient treemacs-evil + 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-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 + js2-refactor json-mode json-navigator json-reformat json-snatcher + kaolin-themes light-soap-theme link-hint live-py-mode livid-mode + load-env-vars log4e lorem-ipsum lsp-docker lsp-mode lsp-origami + lsp-pyright lsp-treemacs lsp-ui lush-theme macrostep madhat2r-theme magit + magit-section markdown-mode markdown-toc material-theme minimal-theme + modus-themes moe-theme molokai-theme monochrome-theme monokai-theme + multi-line multiple-cursors mustang-theme nameless naquadah-theme + nginx-mode noctilux-theme nodejs-repl nose npm-mode obsidian-theme + occidental-theme oldlace-theme omtose-phellack-themes open-junk-file + org-alert org-caldav org-category-capture org-cliplink org-contrib + org-download org-jira org-mac-link org-mime 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 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 tern + terraform-mode toc-org toml-mode toxi-theme transient treemacs-evil treemacs-icons-dired treemacs-magit treemacs-persp treemacs-projectile - treepy undo-fu undo-fu-session vi-tilde-fringe vim-powerline - volatile-highlights vundo web-beautify web-completion-data web-mode - which-key winum with-editor writeroom-mode ws-butler yaml yapfify - yasnippet yasnippet-snippets))) + 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 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. diff --git a/.ssh/config.oci b/.ssh/config.oci index 41f4136..9067a5c 100644 --- a/.ssh/config.oci +++ b/.ssh/config.oci @@ -2,3 +2,9 @@ Include config-scm Include ssh_configs/config Include osd_configs/config Include user + +Host bitbucket.oci.oraclecorp.com + IdentityFile ~/.ssh/orabucket + HostkeyAlgorithms +ssh-rsa + PubkeyAcceptedAlgorithms +ssh-rsa + diff --git a/.ssh/config.solaris b/.ssh/config.solaris index 7bb0261..8fe8507 100644 --- a/.ssh/config.solaris +++ b/.ssh/config.solaris @@ -15,6 +15,10 @@ Host * Host 192.168.2.* IdentitiesOnly yes +Host gitlab.com + User git + IdentityFile ~/.ssh/gitlab + Host solaris-reviews.us.oracle.com User hg IdentityFile ~/.ssh/id_phabricator diff --git a/.zshenv b/.zshenv index cd701f0..6e02d29 100644 --- a/.zshenv +++ b/.zshenv @@ -13,6 +13,16 @@ alias pig='ping' # export PATH=$HOME/.rd/bin # +# on speccy only +if [[ "$(hostname)" == "speccy" ]]; +then + # defined via https://github.com/syl20bnr/spacemacs/wiki/Terminal + export TERM=xterm-24bit + alias ssh="TERM=xterm-256color ssh" + alias vi=te + alias vim=te +fi + # for gems installed in my home direcotry # inspiration: https://guides.cocoapods.org/using/getting-started.html#installation @@ -85,7 +95,7 @@ alias nextcloud-shell='k exec -n nextcloud deployments/nextcloud -c nextcloud -i alias nextcloud-shell-root='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- bash' alias occ='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- runuser --user www-data /var/www/html/occ' -alias speech_to_text="$HOME/Downloads/whisper-cpp/convert_video_to_txt.sh" +alias speech_to_text="$HOME/Downloads/whisper.cpp/convert_video_to_txt.sh" if [ -f "/Users/jetpac/.local/bin/k9s" ]; then diff --git a/bin/ul11u4_gate_open.sh b/bin/ul11u4_gate_open.sh index cf7512a..cae46c7 100755 --- 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.83.0.1.195.1}" +TARGET="${1-11.4.84.0.1.201.1}" log::info "TARGET:${TARGET}"