From b8ec75febe869d8f3b2a14e874742cf0a4e4cf2f Mon Sep 17 00:00:00 2001 From: Petr Nyc Date: Sun, 13 Apr 2025 11:34:32 +0200 Subject: [PATCH] 13.4.2025 Sunday 11:34 --- .config/alacritty/alacritty.toml | 2 + .config/karabiner/karabiner.json | 33 ++--------- .config/mc/ini | 5 +- .gitconfig | 3 + .spacemacs | 97 +++++++++++++++++++++++++++++--- .ssh/config.oci | 1 + .ssh/config.solaris | 6 ++ .zshenv | 7 ++- .zshrc | 6 +- 9 files changed, 118 insertions(+), 42 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 3d2f578..1ab4c31 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -14,6 +14,8 @@ italic.family = "MesloLGS Nerd Font Mono" bold_italic.family = "MesloLGS Nerd Font Mono" size = 18 offset.x = 1 +# set apple font smoothing for alacritty: +# defaults write org.alacritty AppleFontSmoothing -int 0 # JetBrains Nerd font # normal.family = "JetBrainsMono NF" diff --git a/.config/karabiner/karabiner.json b/.config/karabiner/karabiner.json index 58aa81c..1abefe7 100644 --- a/.config/karabiner/karabiner.json +++ b/.config/karabiner/karabiner.json @@ -2226,19 +2226,6 @@ ] }, "devices": [ - { - "identifiers": { - "is_keyboard": true, - "product_id": 834, - "vendor_id": 1452 - }, - "simple_modifications": [ - { - "from": { "key_code": "non_us_backslash" }, - "to": [{ "key_code": "grave_accent_and_tilde" }] - } - ] - }, { "identifiers": { "is_keyboard": true, @@ -2269,19 +2256,6 @@ } ] }, - { - "identifiers": { - "is_keyboard": true, - "product_id": 668, - "vendor_id": 76 - }, - "simple_modifications": [ - { - "from": { "key_code": "non_us_backslash" }, - "to": [{ "key_code": "grave_accent_and_tilde" }] - } - ] - }, { "identifiers": { "is_keyboard": true, @@ -2313,6 +2287,10 @@ { "from": { "key_code": "left_option" }, "to": [{ "key_code": "left_command" }] + }, + { + "from": { "key_code": "non_us_pound" }, + "to": [{ "key_code": "grave_accent_and_tilde" }] } ] }, @@ -2352,7 +2330,8 @@ } ], "name": "Default profile", - "selected": true + "selected": true, + "virtual_hid_keyboard": { "keyboard_type_v2": "iso" } }, { "name": "test profile" } ] diff --git a/.config/mc/ini b/.config/mc/ini index 8d9060d..7a49c99 100644 --- a/.config/mc/ini +++ b/.config/mc/ini @@ -84,10 +84,11 @@ editor_filesize_threshold=64M editor_stop_format_chars=-+*\\,.;:&> mcview_eof= skin=solarized-dark-256color +shell_directory_timeout=900 [Layout] output_lines=0 -left_panel_size=64 +left_panel_size=67 top_panel_size=0 message_visible=true keybar_visible=true @@ -115,6 +116,8 @@ base_color= xterm-256color= color_terminals= alacritty= +xterm= +rxvt-256color= [Panels] show_mini_info=true diff --git a/.gitconfig b/.gitconfig index 76ef693..bff66c0 100644 --- a/.gitconfig +++ b/.gitconfig @@ -25,6 +25,7 @@ diffc = "!f() { git diff ${1}^1 ${1} -- $2; }; f" vimdiffc = "!f() { git vimdiff ${1}^1 ${1} -- $2; }; f" cat = show + webui = !/Users/jetpac/.git-webui/release/libexec/git-core/git-webui [user] name = Petr Nyc @@ -42,3 +43,5 @@ ; modulePath = /usr/lib/apache2/modules [init] defaultBranch = master +[webui] + autoupdate = true diff --git a/.spacemacs b/.spacemacs index 3c06127..732eab4 100644 --- a/.spacemacs +++ b/.spacemacs @@ -37,12 +37,18 @@ This function should only modify configuration layer settings." html python javascript + pandoc ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press `SPC f e R' (Vim style) or ;; `M-m f e R' (Emacs style) to install them. ;; ---------------------------------------------------------------- auto-completion + (auto-completion :variables + auto-completion-enable-snippets-in-popup t + auto-completion-enable-help-tooltip t + auto-completion-use-company-box t + auto-completion-enable-sort-by-usage t) ;; better-defaults emacs-lisp git @@ -66,7 +72,9 @@ This function should only modify configuration layer settings." ;; spell-checking syntax-checking ;; version-control - treemacs) + treemacs + docker + ) ;; List of additional packages that will be installed without being wrapped @@ -83,6 +91,7 @@ This function should only modify configuration layer settings." dotspacemacs-additional-packages '( org-mac-link org-alert + ;org-protocol ) ;; A list of packages that cannot be updated. @@ -315,7 +324,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil then the last auto saved layouts are resumed automatically upon ;; start. (default nil) - dotspacemacs-auto-resume-layouts nil + dotspacemacs-auto-resume-layouts t ;; If non-nil, auto-generate layout name when creating new layouts. Only has ;; effect when using the "jump to layout by number" commands. (default nil) @@ -338,7 +347,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 nil + dotspacemacs-enable-paste-transient-state t ;; Which-key delay in seconds. The which-key buffer is the popup listing ;; the commands bound to the current keystroke sequence. (default 0.4) @@ -480,7 +489,7 @@ It should only modify the values of Spacemacs settings." ;; If non-nil, advise quit functions to keep server open when quitting. ;; (default nil) - dotspacemacs-persistent-server nil + dotspacemacs-persistent-server t ;; List of search tool executable names. Spacemacs uses the first installed ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'. @@ -648,6 +657,9 @@ before packages are loaded." (setq org-directory "~/Documents/org") (setq org-default-notes-file "~/Documents/org/inbox.org") + + (setq org-duration-format 'h:mm) + ;; Define the custum capture templates (setq org-capture-templates '(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks") @@ -656,15 +668,28 @@ before packages are loaded." "* MEETING %? :Meeting:\n%t" :clock-in t :clock-resume t) ("d" "Diary [diary] " entry (file+datetree "~/org/diary.org") "* %?\n%U\n" :clock-in t :clock-resume t) - ("i" "Idea [inbox] " entry (file org-default-notes-file) - "* %? :IDEA: \n%t" :clock-in t :clock-resume t) + ("i" "Inbox [inbox]" entry (file+headline org-default-notes-file "Capture") + "* %?\n Captured: %U\n%i\n %a" :empty-lines 1) + ;; ("i" "Idea [inbox] " entry (file org-default-notes-file) + ;; "* %? :IDEA: \n%t" :clock-in t :clock-resume t) ("n" "Next Task" entry (file+headline org-default-notes-file "Tasks") "** NEXT %? \nDEADLINE: %t") )) + ; original + ; (setq org-agenda-files '("~/Documents/org/inbox.org" + ; "~/Documents/org/projects.org" + ; "~/Documents/org/someday.org" + ; "~/Documents/org/calendar.org")) + + ; testing freeze (setq org-agenda-files '("~/Documents/org/inbox.org" "~/Documents/org/projects.org" "~/Documents/org/someday.org" "~/Documents/org/calendar.org")) + + + + (setq org-refile-targets '(("/Users/jetpac/Documents/org/projects.org" :maxlevel . 3) ("/Users/jetpac/Documents/org/inbox.org" :maxlevel . 3) ("/Users/jetpac/Documents/org/someday.org" :maxlevel . 3) @@ -716,6 +741,10 @@ before packages are loaded." (setq org-clock-out-remove-zero-time-clocks t) ) ;; with-eval-after-load + (with-eval-after-load 'markdown-mode + (define-key markdown-mode-map (kbd "C-c x") 'my/markdown-toggle-checkbox)) + + (setq calendar-week-start-day 1) ;; calendar start on Monday ;; org-alert configuration @@ -730,6 +759,16 @@ before packages are loaded." ) (org-alert-enable)) + (defun my/markdown-toggle-checkbox () + "Toggle checkbox in markdown list at point." + (interactive) + (save-excursion + (beginning-of-line) + (when (looking-at "\\s-*[-*]\\s-+\\[\\([ xX]\\)\\]") + (replace-match + (if (string= (match-string 1) " ") + "x" " ") nil nil nil 1)))) + ) ;; user-config @@ -746,7 +785,51 @@ This function is called at the very end of Spacemacs initialization." ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - '(lsp-docker bui emojify a pos-tip gh-md origami lsp-treemacs lsp-mode markdown-toc orgit forge yaml markdown-mode ghub closql emacsql treepy magit with-editor magit-section tern anaconda-mode web-completion-data company epc ctable concurrent deferred multiple-cursors hierarchy json-snatcher load-env-vars transient pythonic pyvenv haml-mode skewer-mode js2-mode simple-httpd yasnippet org-jira ox-jira htmlize alert log4e gntp org-project-capture org-category-capture evil-mc yasnippet-snippets yapfify ws-butler writeroom-mode winum which-key web-mode web-beautify vundo volatile-highlights vim-powerline vi-tilde-fringe undo-fu-session undo-fu treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil toml-mode toc-org term-cursor tagedit symon symbol-overlay string-inflection string-edit-at-point sphinx-doc spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline space-doc smeargle slim-mode shfmt scss-mode sass-mode restart-emacs request rainbow-delimiters quickrun pytest pylookup pyenv-mode pydoc py-isort pug-mode prettier-js popwin poetry pippel pipenv pip-requirements pcre2el password-generator paradox pandoc-mode ox-twbs ox-pandoc overseer orgit-forge org-superstar org-rich-yank org-projectile org-present org-pomodoro org-mime org-mac-link org-download org-contrib org-cliplink org-alert open-junk-file npm-mode nose nodejs-repl nameless multi-line macrostep lsp-ui lsp-pyright lsp-origami lorem-ipsum livid-mode live-py-mode link-hint json-reformat json-navigator json-mode js2-refactor js-doc inspector insert-shebang info+ indent-guide importmagic impatient-mode hybrid-mode hungry-delete holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt helm-xref helm-themes helm-swoop helm-pydoc helm-purpose helm-projectile helm-org-rifle helm-org helm-mode-manager helm-make helm-lsp helm-ls-git helm-git-grep helm-descbinds helm-css-scss helm-company helm-comint helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitignore-templates git-timemachine git-modes git-messenger git-link flycheck-pos-tip flycheck-package flycheck-elsa flycheck-bashate flx-ido fish-mode fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-org evil-numbers evil-nerd-commenter evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-easymotion evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu emr emmet-mode elisp-slime-nav elisp-demos elisp-def editorconfig dumb-jump drag-stuff dotenv-mode disable-mouse dired-quick-sort diminish devdocs define-word dap-mode cython-mode company-web company-shell company-anaconda column-enforce-mode code-review code-cells clean-aindent-mode centered-cursor-mode blacken auto-yasnippet auto-highlight-symbol auto-compile all-the-icons aggressive-indent ace-link ace-jump-helm-line))) + '(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 + 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 + 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 + 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 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))) (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 ba9fc01..e9b27fd 100644 --- a/.ssh/config.oci +++ b/.ssh/config.oci @@ -1,2 +1,3 @@ Include ssh_configs/config +Include osd_configs/config Include user diff --git a/.ssh/config.solaris b/.ssh/config.solaris index ba70186..792e782 100644 --- a/.ssh/config.solaris +++ b/.ssh/config.solaris @@ -20,6 +20,12 @@ Host osdbld User opc IdentityFile ~/.ssh/id_nginxbuild +Host osd-calico-dev osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com + Hostname osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com + User opc + IdentityFile ~/.ssh/id_ed25519 + + # private m1 mac Host 192.168.2.81 User jetpac diff --git a/.zshenv b/.zshenv index 0c40480..cd701f0 100644 --- a/.zshenv +++ b/.zshenv @@ -2,10 +2,11 @@ set -o vi export LC_ALL=en_US.UTF-8 -export PATH=/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:/Users/jetpac/.asdf/shims/:$PATH +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' +alias mc='/opt/homebrew/bin/mc --nosubshell' alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME' alias -g N="2>&1 " alias pig='ping' @@ -68,7 +69,7 @@ export seznam6='2a02:598:2::1222' export OPENAI_API_KEY='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' # for flutter -export PATH=$PATH #:/Users/jetpac/Documents/flutter-dev-env/bin +# export PATH=$PATH:/Users/jetpac/Documents/flutter-dev-env/bin export NVM_DIR="$HOME/.nvm" # nvm initialization is commented out; it significantly slows down shell startup # [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" @@ -84,6 +85,8 @@ 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" + if [ -f "/Users/jetpac/.local/bin/k9s" ]; then alias k9s='/Users/jetpac/.local/bin/k9s --logoless' diff --git a/.zshrc b/.zshrc index 04edce2..1914dc2 100644 --- a/.zshrc +++ b/.zshrc @@ -217,10 +217,6 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=10" -### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT) -export PATH="/Users/jetpac/.rd/bin:$PATH" -### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT) - # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! __conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" @@ -236,7 +232,7 @@ fi unset __conda_setup # <<< conda initialize <<< -export PATH="/opt/homebrew/bin:$PATH" +# export PATH="/opt/homebrew/bin:$PATH" # for cocoapods export PATH=/opt/homebrew/opt/ruby/bin:$PATH