before upgrade

This commit is contained in:
Petr Nyc
2025-11-18 08:57:41 +01:00
parent 5715fd5577
commit 56a36622c1
3 changed files with 37 additions and 1 deletions

View File

@@ -683,6 +683,7 @@ before packages are loaded."
(global-set-key (kbd "<f9> s") 'jp/set-dotfiles-environment) (global-set-key (kbd "<f9> s") 'jp/set-dotfiles-environment)
(global-set-key (kbd "<f9> u") 'jp/unset-dotfiles-environment) (global-set-key (kbd "<f9> u") 'jp/unset-dotfiles-environment)
(defun jp/set-scm-git() (defun jp/set-scm-git()
(interactive) (interactive)
(setq magit-git-executable "/usr/local/bin/scm-git")) (setq magit-git-executable "/usr/local/bin/scm-git"))
@@ -708,6 +709,23 @@ before packages are loaded."
;; test from https://superuser.com/questions/452649/org-mode-to-markdown-converter ;; test from https://superuser.com/questions/452649/org-mode-to-markdown-converter
(require 'ox-md nil t) (require 'ox-md nil t)
;; org mode should not use tabs
;; work-around for 'tab width in org files must be 8, not 2. please adjust your tab-width settings for org mode'
(defun jp/org-mode-tab-setup ()
;; Don't use real TAB characters in Org
(setq-local indent-tabs-mode nil)
;; But keep tab-width at 8 so Org's parser is happy
(setq-local tab-width 8))
(add-hook 'org-mode-hook #'pn/org-mode-tab-setup)
;; end of tabs work-around
(setq org-directory "~/Documents/org") (setq org-directory "~/Documents/org")
(setq org-default-notes-file "~/Documents/org/inbox.org") (setq org-default-notes-file "~/Documents/org/inbox.org")

18
.zshrc
View File

@@ -264,6 +264,24 @@ fi
unset __conda_setup unset __conda_setup
# <<< conda initialize <<< # <<< conda initialize <<<
#### <BEGIN conda zsh completion>
# --- Enable conda autocompletion ---
if command -v conda &>/dev/null; then
# Ensure Conda hook is loaded
eval "$(conda shell.zsh hook)"
# Add Conda's completion functions to zsh's function path
_conda_zsh_completions_dir="$(conda info --base)/etc/profile.d"
if [ -d "$_conda_zsh_completions_dir" ]; then
fpath+=("$_conda_zsh_completions_dir")
fi
fi
autoload -U compinit && compinit
#### <END conda zsh completion>
# export PATH="/opt/homebrew/bin:$PATH" # export PATH="/opt/homebrew/bin:$PATH"
# for cocoapods # for cocoapods

View File

@@ -13,7 +13,7 @@ CURL=/usr/bin/curl
source "${BINDIR}/lib/logging.sh" source "${BINDIR}/lib/logging.sh"
TARGET="${1-11.4.87.0.1.207.1}" TARGET="${1-11.4.87.0.1.207.2}"
log::info "TARGET:${TARGET}" log::info "TARGET:${TARGET}"