update
This commit is contained in:
Martin Sukany
349
config.el
349
config.el
@@ -1,112 +1,107 @@
|
||||
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
;; Place your private configuration here! Remember, you do not need to run 'doom
|
||||
;; sync' after modifying this file!
|
||||
;; --------------------------------------------------
|
||||
;; Theme / UI
|
||||
;; --------------------------------------------------
|
||||
(setq doom-theme 'tango-dark
|
||||
display-line-numbers-type t
|
||||
doom-font (font-spec :family "JetBrains Mono" :size 14)
|
||||
doom-variable-pitch-font nil)
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; macOS / UX
|
||||
;; --------------------------------------------------
|
||||
(setq mouse-autoselect-window t
|
||||
focus-follows-mouse t
|
||||
select-enable-clipboard t
|
||||
select-enable-primary t
|
||||
inhibit-splash-screen t)
|
||||
|
||||
;; Some functionality uses this to identify you, e.g. GPG configuration, email
|
||||
;; clients, file templates and snippets. It is optional.
|
||||
;; (setq user-full-name "John Doe"
|
||||
;; user-mail-address "john@doe.com")
|
||||
;; --------------------------------------------------
|
||||
;; Completion (Company) – minimum, bezpečné
|
||||
;; --------------------------------------------------
|
||||
(after! company
|
||||
(setq company-idle-delay 0.1
|
||||
company-minimum-prefix-length 2
|
||||
company-selection-wrap-around t
|
||||
company-tooltip-limit 14
|
||||
company-show-numbers t
|
||||
company-require-match nil)
|
||||
|
||||
;; Doom exposes five (optional) variables for controlling fonts in Doom:
|
||||
;;
|
||||
;; - `doom-font' -- the primary font to use
|
||||
;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
|
||||
;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
|
||||
;; presentations or streaming.
|
||||
;; - `doom-symbol-font' -- for symbols
|
||||
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
|
||||
;;
|
||||
;; See 'C-h v doom-font' for documentation and more examples of what they
|
||||
;; accept. For example:
|
||||
;;
|
||||
;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
|
||||
;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
|
||||
;;
|
||||
;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
|
||||
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
|
||||
;; refresh your font settings. If Emacs still can't find your font, it likely
|
||||
;; wasn't installed correctly. Font issues are rarely Doom issues!
|
||||
;; Spolehlivé vyvolání v TTY
|
||||
(map! :i "C-." #'company-complete
|
||||
:n "C-." #'company-complete))
|
||||
|
||||
;; There are two ways to load a theme. Both assume the theme is installed and
|
||||
;; available. You can either set `doom-theme' or manually load a theme with the
|
||||
;; `load-theme' function. This is the default:
|
||||
(setq doom-theme 'doom-one)
|
||||
;; --------------------------------------------------
|
||||
;; Robustní file completion "kdekoliv pod kurzorem"
|
||||
;; Funguje i v Markdown odkazu [x](./tady), protože neřeší kontext – jen token okolo pointu.
|
||||
;; --------------------------------------------------
|
||||
(defun martin/complete-file-name-at-point ()
|
||||
"Doplň název souboru kolem kurzoru pomocí standardní file completion tabulky.
|
||||
|
||||
;; This determines the style of line numbers in effect. If set to `nil', line
|
||||
;; numbers are disabled. For relative line numbers, set this to `relative'.
|
||||
(setq display-line-numbers-type t)
|
||||
Funguje v libovolném textu, včetně Markdown linků (např. [x](./...))."
|
||||
(interactive)
|
||||
(let* ((stop-chars '(?\s ?\t ?\n ?\r ?\" ?\' ?\( ?\) ?\[ ?\] ?\< ?\> ?\{ ?\} ?, ?;))
|
||||
(start (save-excursion
|
||||
(while (and (> (point) (point-min))
|
||||
(let ((c (char-before)))
|
||||
(and c (not (memq c stop-chars)))))
|
||||
(backward-char))
|
||||
(point)))
|
||||
(end (save-excursion
|
||||
(while (and (< (point) (point-max))
|
||||
(let ((c (char-after)))
|
||||
(and c (not (memq c stop-chars)))))
|
||||
(forward-char))
|
||||
(point))))
|
||||
;; Pokud nejsme "na tokenu", vezmi aspoň start=end=point (doplň odtud)
|
||||
(when (= start end)
|
||||
(setq start (point) end (point)))
|
||||
(let ((completion-category-defaults nil)
|
||||
(completion-category-overrides '((file (styles basic partial-completion)))))
|
||||
(completion-in-region start end #'completion-file-name-table))))
|
||||
|
||||
;; If you use `org' and don't want your org files in the default location below,
|
||||
;; change `org-directory'. It must be set before org loads!
|
||||
(setq org-directory "~/org/")
|
||||
;; Globální klávesa (funguje všude, i v TTY)
|
||||
(map! :i "C-c f" #'martin/complete-file-name-at-point
|
||||
:n "C-c f" #'martin/complete-file-name-at-point)
|
||||
|
||||
;; V Markdownu snížíme prefix, ať to jde hned po `./`
|
||||
(after! markdown-mode
|
||||
(add-hook 'markdown-mode-hook (lambda () (setq-local company-minimum-prefix-length 1)))
|
||||
(add-hook 'gfm-mode-hook (lambda () (setq-local company-minimum-prefix-length 1))))
|
||||
|
||||
;; Whenever you reconfigure a package, make sure to wrap your config in an
|
||||
;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
|
||||
;;
|
||||
;; (after! PACKAGE
|
||||
;; (setq x y))
|
||||
;;
|
||||
;; The exceptions to this rule:
|
||||
;;
|
||||
;; - Setting file/directory variables (like `org-directory')
|
||||
;; - Setting variables which explicitly tell you to set them before their
|
||||
;; package is loaded (see 'C-h v VARIABLE' to look up their documentation).
|
||||
;; - Setting doom variables (which start with 'doom-' or '+').
|
||||
;;
|
||||
;; Here are some additional functions/macros that will help you configure Doom.
|
||||
;;
|
||||
;; - `load!' for loading external *.el files relative to this one
|
||||
;; - `use-package!' for configuring packages
|
||||
;; - `after!' for running code after a package has loaded
|
||||
;; - `add-load-path!' for adding directories to the `load-path', relative to
|
||||
;; this file. Emacs searches the `load-path' when you load packages with
|
||||
;; `require' or `use-package'.
|
||||
;; - `map!' for binding new keys
|
||||
;;
|
||||
;; To get information about any of these functions/macros, move the cursor over
|
||||
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
|
||||
;; This will open documentation for it, including demos of how they are used.
|
||||
;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
|
||||
;; etc).
|
||||
;;
|
||||
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
|
||||
;; they are implemented.
|
||||
|
||||
|
||||
;; Theme
|
||||
(setq doom-theme 'doom-moonlight)
|
||||
(setq doom-font (font-spec :family "JetBrains Mono" :size 14))
|
||||
(setq doom-variable-pitch-font nil)
|
||||
|
||||
|
||||
;; Accessibility
|
||||
;; macOS focus & mouse behavior
|
||||
(setq mouse-autoselect-window t)
|
||||
(setq focus-follows-mouse t)
|
||||
|
||||
;; smoother focus handling
|
||||
(setq select-enable-clipboard t)
|
||||
(setq select-enable-primary t)
|
||||
|
||||
;; prevent weird focus stealing
|
||||
(setq inhibit-splash-screen t)
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; Copilot
|
||||
;; accept completion from copilot and fallback to company
|
||||
;; --------------------------------------------------
|
||||
(use-package! copilot
|
||||
:hook (prog-mode . copilot-mode)
|
||||
:bind (:map copilot-completion-map
|
||||
("<tab>" . 'copilot-accept-completion)
|
||||
("TAB" . 'copilot-accept-completion)
|
||||
("C-TAB" . 'copilot-accept-completion-by-word)
|
||||
("C-<tab>" . 'copilot-accept-completion-by-word)))
|
||||
("<tab>" . copilot-accept-completion)
|
||||
("TAB" . copilot-accept-completion)
|
||||
("C-TAB" . copilot-accept-completion-by-word)
|
||||
("C-<tab>" . copilot-accept-completion-by-word)))
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; Org
|
||||
;; --------------------------------------------------
|
||||
(setq org-directory "~/org/")
|
||||
|
||||
;; Org mode
|
||||
(after! org
|
||||
(setq org-default-notes-file (expand-file-name "inbox.org" org-directory))
|
||||
|
||||
(setq org-agenda-files (list org-directory
|
||||
(expand-file-name "projects" org-directory)
|
||||
(expand-file-name "notes" org-directory)))
|
||||
|
||||
(setq org-todo-keywords
|
||||
'((sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELLED(c@)")))
|
||||
|
||||
(setq org-log-done 'time)
|
||||
|
||||
(setq org-refile-targets '((org-agenda-files :maxlevel . 5))
|
||||
org-outline-path-complete-in-steps nil
|
||||
org-refile-use-outline-path 'file)
|
||||
|
||||
(defun my/project-org-file ()
|
||||
"Return path to ./project.org in current Projectile project, if it exists."
|
||||
(when-let ((root (projectile-project-root)))
|
||||
@@ -118,36 +113,9 @@
|
||||
(interactive)
|
||||
(let ((org-agenda-files (delq nil (list (my/project-org-file)))))
|
||||
(if org-agenda-files
|
||||
(org-agenda nil "a") ;; standard agenda dispatcher
|
||||
(user-error "No project.org found in this project")))))
|
||||
(org-agenda nil "a")
|
||||
(user-error "No project.org found in this project"))))
|
||||
|
||||
;; Org mode
|
||||
(setq org-directory "~/org/")
|
||||
|
||||
(after! org
|
||||
;; Inbox jako default pro rychlé poznámky / capture
|
||||
(setq org-default-notes-file (expand-file-name "inbox.org" org-directory))
|
||||
|
||||
;; Agenda sbírá soubory i z adresářů (vezme všechny .org uvnitř)
|
||||
(setq org-agenda-files (list org-directory
|
||||
(expand-file-name "projects" org-directory)
|
||||
(expand-file-name "notes" org-directory)))
|
||||
|
||||
;; Doporučené “GTD-lite” stavy
|
||||
(setq org-todo-keywords
|
||||
'((sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d!)" "CANCELLED(c@)")))
|
||||
|
||||
;; Logování dokončení
|
||||
(setq org-log-done 'time)
|
||||
|
||||
;; Refile cíle (přesouvání z inboxu do projektů/notes)
|
||||
(setq org-refile-targets
|
||||
`((,(expand-file-name "projects" org-directory) :maxlevel . 3)
|
||||
(,(expand-file-name "notes" org-directory) :maxlevel . 3)
|
||||
(,(expand-file-name "agenda.org" org-directory):maxlevel . 3))))
|
||||
|
||||
;; Org - capture templates
|
||||
(after! org
|
||||
(setq org-capture-templates
|
||||
'(("i" "Inbox task" entry
|
||||
(file "inbox.org")
|
||||
@@ -159,67 +127,37 @@
|
||||
(file "inbox.org")
|
||||
"* TODO %? :project:\n%U\n%a\n"))))
|
||||
|
||||
(setq org-directory "~/org/")
|
||||
|
||||
(after! org
|
||||
(setq org-agenda-files (list org-directory
|
||||
(expand-file-name "projects" org-directory)
|
||||
(expand-file-name "notes" org-directory)))
|
||||
|
||||
;; Refile cíle = všechny soubory z org-agenda-files
|
||||
(setq org-refile-targets '((org-agenda-files :maxlevel . 5)))
|
||||
|
||||
;; Doporučené UX pro refile
|
||||
(setq org-outline-path-complete-in-steps nil
|
||||
org-refile-use-outline-path 'file))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; Dired
|
||||
;; --------------------------------------------------
|
||||
(after! dired
|
||||
;; povolit přepisování dired bufferu
|
||||
(put 'dired-find-alternate-file 'disabled nil)
|
||||
|
||||
;; RET = otevřít ve stejném bufferu
|
||||
(map!
|
||||
:map dired-mode-map
|
||||
"RET" #'dired-find-alternate-file
|
||||
"^" #'dired-up-directory))
|
||||
|
||||
;; --- plantuml přes oficiální server (Doom Emacs) ---
|
||||
(after! plantuml-mode
|
||||
(setq plantuml-default-exec-mode 'server) ;; použít server
|
||||
(setq plantuml-server-url "https://www.plantuml.com/plantuml") ;; správná base URL
|
||||
(setq plantuml-server-encode-mode 'deflate) ;; 'deflate nebo 'hex
|
||||
(setq plantuml-output-type "svg") ;; "svg" nebo "png"
|
||||
;; volitelné ladění - při problému koukni do *Messages*
|
||||
(setq plantuml-verbose t)
|
||||
)
|
||||
(map! :map dired-mode-map
|
||||
"RET" #'dired-find-alternate-file
|
||||
"^" #'dired-up-directory))
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; PlantUML server render (HEX encoding, macOS safe)
|
||||
;; PlantUML (server) — TVOJE PŮVODNÍ ČÁST
|
||||
;; --------------------------------------------------
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.puml\\'" . plantuml-mode))
|
||||
(add-to-list 'auto-mode-alist '("\\.plantuml\\'" . plantuml-mode))
|
||||
|
||||
(after! plantuml-mode
|
||||
(setq plantuml-default-exec-mode 'server)
|
||||
(setq plantuml-server-url "https://www.plantuml.com/plantuml"))
|
||||
(setq plantuml-default-exec-mode 'server
|
||||
plantuml-server-url "https://www.plantuml.com/plantuml"
|
||||
plantuml-output-type "svg"
|
||||
plantuml-verbose t))
|
||||
|
||||
(defun my/plantuml-encode-hex (text)
|
||||
"PlantUML HEX encoding: ~h + hex(UTF-8 bytes)."
|
||||
(let* ((utf8 (encode-coding-string text 'utf-8 t)))
|
||||
(concat
|
||||
"~h"
|
||||
(apply #'concat
|
||||
(mapcar (lambda (b) (format "%02x" b))
|
||||
(append utf8 nil))))))
|
||||
(concat "~h"
|
||||
(apply #'concat
|
||||
(mapcar (lambda (b) (format "%02x" b))
|
||||
(append utf8 nil))))))
|
||||
|
||||
(defun my/plantuml-fix-png-header (file)
|
||||
"Odstraní vše před PNG signaturou (řeší \n před 89 50 4E 47)."
|
||||
"Odstraní vše před PNG signaturou (řeší \\n před 89 50 4E 47)."
|
||||
(let ((sig (unibyte-string #x89 ?P ?N ?G ?\r ?\n #x1a ?\n)))
|
||||
(with-temp-buffer
|
||||
(set-buffer-multibyte nil)
|
||||
@@ -227,8 +165,7 @@
|
||||
(goto-char (point-min))
|
||||
(unless (looking-at (regexp-quote sig))
|
||||
(let ((pos (search-forward sig nil t)))
|
||||
(unless pos
|
||||
(user-error "PNG signature nenalezena"))
|
||||
(unless pos (user-error "PNG signature nenalezena"))
|
||||
(delete-region (point-min) (- pos (length sig)))
|
||||
(let ((coding-system-for-write 'binary))
|
||||
(write-region (point-min) (point-max) file nil 'silent)))))))
|
||||
@@ -236,16 +173,13 @@
|
||||
(defun my/plantuml-render-server (type)
|
||||
"Render aktuální .puml přes PlantUML server do PNG nebo SVG."
|
||||
(interactive (list (completing-read "Type: " '("png" "svg") nil t "png")))
|
||||
(unless buffer-file-name
|
||||
(user-error "Otevři .puml jako soubor"))
|
||||
(unless buffer-file-name (user-error "Otevři .puml jako soubor"))
|
||||
(let* ((text (buffer-substring-no-properties (point-min) (point-max)))
|
||||
(encoded (my/plantuml-encode-hex text))
|
||||
(server (string-remove-suffix "/" plantuml-server-url))
|
||||
(url (format "%s/%s/%s" server type encoded))
|
||||
(out (concat (file-name-sans-extension buffer-file-name) "." type)))
|
||||
;; stáhne binárně korektně
|
||||
(url-copy-file url out t)
|
||||
;; oprav PNG header (macOS + PlantUML server občas pošle LF)
|
||||
(when (string-equal type "png")
|
||||
(my/plantuml-fix-png-header out))
|
||||
(message "PlantUML uložen: %s" out)
|
||||
@@ -257,45 +191,48 @@
|
||||
(define-key plantuml-mode-map (kbd "C-c C-s")
|
||||
(lambda () (interactive) (my/plantuml-render-server "svg"))))
|
||||
|
||||
|
||||
;; ============================================================
|
||||
;; Markdown: file completion (images) using company
|
||||
;; ============================================================
|
||||
|
||||
(after! markdown-mode
|
||||
(add-hook 'markdown-mode-hook
|
||||
(lambda ()
|
||||
;; Enable file completion (images) in markdown
|
||||
(setq-local company-backends
|
||||
'((company-files company-capf company-dabbrev))))))
|
||||
|
||||
(after! company
|
||||
;; Make completion feel instant
|
||||
(setq company-idle-delay 0
|
||||
company-minimum-prefix-length 1))
|
||||
|
||||
|
||||
;; --- Markdown: file completion přes Corfu/CAPF (Variant A) ---
|
||||
(after! markdown-mode
|
||||
(add-hook 'markdown-mode-hook
|
||||
(lambda ()
|
||||
;; Přidá doplňování souborů pro cesty (např. )
|
||||
(add-hook 'completion-at-point-functions #'cape-file nil t))))
|
||||
|
||||
|
||||
|
||||
;; -- quick PATH fix for MacTeX --
|
||||
;; --------------------------------------------------
|
||||
;; PATH fix for MacTeX
|
||||
;; --------------------------------------------------
|
||||
(setenv "PATH" (concat "/Library/TeX/texbin:" (getenv "PATH")))
|
||||
(add-to-list 'exec-path "/Library/TeX/texbin")
|
||||
;; -- end quick PATH fix --
|
||||
|
||||
|
||||
|
||||
|
||||
;; vždy používej python3
|
||||
;; --------------------------------------------------
|
||||
;; Python
|
||||
;; --------------------------------------------------
|
||||
(setq python-shell-interpreter "python3")
|
||||
|
||||
(after! org
|
||||
(setq org-babel-python-command "python3")
|
||||
(require 'ob-python))
|
||||
|
||||
|
||||
|
||||
;; --------------------------------------------------
|
||||
;; Low-vision základ
|
||||
;; --------------------------------------------------
|
||||
|
||||
;; Větší font + pohodlnější řádkování
|
||||
(setq doom-font (font-spec :family "JetBrains Mono" :size 20) ;; zkus 18–24
|
||||
doom-variable-pitch-font (font-spec :family "SF Pro Text" :size 20))
|
||||
|
||||
(setq-default line-spacing 0.25) ;; 0.20–0.35 dle chuti
|
||||
|
||||
;; Jednoduché zvětšení/zmenšení textu kdykoliv
|
||||
(map! :n "C-=" #'text-scale-increase
|
||||
:n "C--" #'text-scale-decrease
|
||||
:n "C-0" #'text-scale-set
|
||||
:i "C-=" #'text-scale-increase
|
||||
:i "C--" #'text-scale-decrease
|
||||
:i "C-0" #'text-scale-set)
|
||||
|
||||
|
||||
;; Automaticky ukládej org soubory po refilingu a změnách
|
||||
(add-hook 'org-after-refile-insert-hook #'save-buffer)
|
||||
(add-hook 'org-after-todo-state-change-hook #'save-buffer)
|
||||
(add-hook 'org-capture-after-finalize-hook #'save-buffer)
|
||||
|
||||
(run-with-idle-timer
|
||||
300 t
|
||||
(lambda ()
|
||||
(save-some-buffers t (lambda ()
|
||||
(derived-mode-p 'org-mode)))))
|
||||
|
||||
Reference in New Issue
Block a user