From 6f5e0498bbc5a70c87934fd1e4449551dc229e39 Mon Sep 17 00:00:00 2001 From: cashmere Date: Thu, 25 Dec 2025 04:43:38 +0100 Subject: sync --- config.el | 43 +++++++++++++++++++++++++++++-------------- config.org | 49 +++++++++++++++++++++++++++++++++++-------------- custom-vars.el | 4 ++-- 3 files changed, 66 insertions(+), 30 deletions(-) diff --git a/config.el b/config.el index e280ffb..82b1281 100644 --- a/config.el +++ b/config.el @@ -221,31 +221,30 @@ ("\\.\\(mp[34]\\|m4a\\|ogg\\|flac\\|webm\\|mkv\\)" "mpv" "xdg-open" "open") (".*" "open" "xdg-open"))) (dired-kill-when-opening-new-dired-buffer t) + (dired-create-destination-dirs 'always) :config + (setq dired-async-mode t) + (require 'mailcap) - ;; WICHTIG: Zwingt Emacs, Ihre Definitionen VOR den System-Einstellungen zu nutzen (setq mailcap-prefer-mailcap-viewers nil) - ;; Kitty als Viewer für Bildformate hinzufügen - ;; mailcap-add fügt den Eintrag ganz oben in die Liste ein (mailcap-add "image/png" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/jpeg" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/jpg" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/gif" "kitty --hold kitty +kitten icat %s") - ;; Tastenkombination 'E' für explizites Öffnen via Mailcap (define-key dired-mode-map (kbd "E") (lambda () (interactive) - (mailcap-view-file (dired-get-filename)))) (when (eq system-type 'darwin) + (mailcap-view-file (dired-get-filename)))) + + (when (eq system-type 'darwin) (let ((gls (executable-find "gls"))) (when gls (setq insert-directory-program gls))))) -(setq mailcap-user-mime-data - '(("image/png" (viewer . "kitty --hold kitty +kitten icat %s")) - ("image/jpeg" (viewer . "kitty --hold kitty +kitten icat %s")))) +(use-package async :ensure t) (use-package erc :straight nil @@ -529,7 +528,7 @@ :stream t :key #'my/openrouter-key :models '("deepseek/deepseek-v3.2:online" - "minimax/minimax-m2:online"))) + "minimax/minimax-m2.1:online"))) (setq gptel-backend my/openrouter-backend) (setq gptel-log-level 'debug) @@ -1136,6 +1135,13 @@ Works on the base filename (without extension), e.g. matches \"-task\", \":task: (corfu-history-mode) (corfu-popupinfo-mode)) +(defun my/suppress-corfu-terminal-warning (orig-fun type message &rest args) + (unless (and (eq type 'corfu) + (string-match-p "corfu-terminal.*not needed" message)) + (apply orig-fun type message args))) + +(advice-add 'display-warning :around #'my/suppress-corfu-terminal-warning) + (use-package corfu-terminal :ensure t :after corfu @@ -1313,6 +1319,14 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi :demand t :after python) +(use-package elm-mode + :ensure t + :mode "\\.py\\'" + :hook (elm-mode . eglot-ensure) + :config + (with-eval-after-load 'eglot-server-programs + '(elm-mode . ("elm-language-server")))) + (use-package rust-mode :ensure t :mode "\\.rs\\'" @@ -1401,8 +1415,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (use-package vterm :ensure t :config - (setq vterm-timer-delay 0.001) - (setq vterm-shell "nu")) + (setq vterm-timer-delay 0.001)) (use-package multi-vterm :ensure t @@ -1998,7 +2011,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (lambda-themes-set-italic-keywords t) (lambda-themes-set-variable-pitch t) :config - (load-theme 'lambda-dark-faded)) + (load-theme 'lambda-dark)) (use-package dirvish :straight t @@ -2300,8 +2313,8 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi (general-def 'normal 'override - "]d" 'flymake-goto-next-error - "[d" 'flymake-goto-prev-error + "]d" 'flycheck-next-error + "[d" 'flycheck-previous-error "]c" 'diff-hl-next-hunk "[c" 'diff-hl-previous-hunk "]b" 'switch-to-next-buffer @@ -2396,6 +2409,8 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi "gg" '(gptel :wk "open gptel") "ga" '(gptel-add :wk "add buffer to gptel") "gf" '(gptel-add-file :wk "add file to gptel") + "gA" '(gptel-abort :wk "abort response") + "gr" '(gptel-rewrite :wk "rewrite section") "gm" '(gptel-menu :wk "open gptel menu")) ;; (my-leader diff --git a/config.org b/config.org index 05598ad..02e99ee 100644 --- a/config.org +++ b/config.org @@ -251,31 +251,32 @@ ("\\.\\(mp[34]\\|m4a\\|ogg\\|flac\\|webm\\|mkv\\)" "mpv" "xdg-open" "open") (".*" "open" "xdg-open"))) (dired-kill-when-opening-new-dired-buffer t) + (dired-create-destination-dirs 'always) :config + (setq dired-async-mode t) + (require 'mailcap) - ;; WICHTIG: Zwingt Emacs, Ihre Definitionen VOR den System-Einstellungen zu nutzen (setq mailcap-prefer-mailcap-viewers nil) - ;; Kitty als Viewer für Bildformate hinzufügen - ;; mailcap-add fügt den Eintrag ganz oben in die Liste ein (mailcap-add "image/png" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/jpeg" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/jpg" "kitty --hold kitty +kitten icat %s") (mailcap-add "image/gif" "kitty --hold kitty +kitten icat %s") - ;; Tastenkombination 'E' für explizites Öffnen via Mailcap (define-key dired-mode-map (kbd "E") (lambda () (interactive) - (mailcap-view-file (dired-get-filename)))) (when (eq system-type 'darwin) + (mailcap-view-file (dired-get-filename)))) + + (when (eq system-type 'darwin) (let ((gls (executable-find "gls"))) (when gls (setq insert-directory-program gls))))) +#+end_src -(setq mailcap-user-mime-data - '(("image/png" (viewer . "kitty --hold kitty +kitten icat %s")) - ("image/jpeg" (viewer . "kitty --hold kitty +kitten icat %s")))) +#+begin_src emacs-lisp +(use-package async :ensure t) #+end_src * erc @@ -618,7 +619,7 @@ Not necessary but an eyecandy to look at! :stream t :key #'my/openrouter-key :models '("deepseek/deepseek-v3.2:online" - "minimax/minimax-m2:online"))) + "minimax/minimax-m2.1:online"))) (setq gptel-backend my/openrouter-backend) (setq gptel-log-level 'debug) @@ -1428,6 +1429,13 @@ Some goodies for better integration with org files. (corfu-history-mode) (corfu-popupinfo-mode)) +(defun my/suppress-corfu-terminal-warning (orig-fun type message &rest args) + (unless (and (eq type 'corfu) + (string-match-p "corfu-terminal.*not needed" message)) + (apply orig-fun type message args))) + +(advice-add 'display-warning :around #'my/suppress-corfu-terminal-warning) + (use-package corfu-terminal :ensure t :after corfu @@ -1680,6 +1688,18 @@ Because I have to and not want to. :after python) #+end_src +** elm-mode + +#+begin_src emacs-lisp +(use-package elm-mode + :ensure t + :mode "\\.py\\'" + :hook (elm-mode . eglot-ensure) + :config + (with-eval-after-load 'eglot-server-programs + '(elm-mode . ("elm-language-server")))) +#+end_src + ** Rust mode ily <3. @@ -1805,8 +1825,7 @@ ily <3. (use-package vterm :ensure t :config - (setq vterm-timer-delay 0.001) - (setq vterm-shell "nu")) + (setq vterm-timer-delay 0.001)) #+end_src ** multi-vterm @@ -2839,7 +2858,7 @@ ily <3. (lambda-themes-set-italic-keywords t) (lambda-themes-set-variable-pitch t) :config - (load-theme 'lambda-dark-faded)) + (load-theme 'lambda-dark)) #+end_src * dirvish @@ -3205,8 +3224,8 @@ ily <3. (general-def 'normal 'override - "]d" 'flymake-goto-next-error - "[d" 'flymake-goto-prev-error + "]d" 'flycheck-next-error + "[d" 'flycheck-previous-error "]c" 'diff-hl-next-hunk "[c" 'diff-hl-previous-hunk "]b" 'switch-to-next-buffer @@ -3320,6 +3339,8 @@ ily <3. "gg" '(gptel :wk "open gptel") "ga" '(gptel-add :wk "add buffer to gptel") "gf" '(gptel-add-file :wk "add file to gptel") + "gA" '(gptel-abort :wk "abort response") + "gr" '(gptel-rewrite :wk "rewrite section") "gm" '(gptel-menu :wk "open gptel menu")) #+end_src diff --git a/custom-vars.el b/custom-vars.el index fcc18d7..27ba452 100644 --- a/custom-vars.el +++ b/custom-vars.el @@ -5,11 +5,11 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("1b623b81f373d49bcf057315fe404b30c500c3b5a387cf86c699d83f2f5763f4" + '("d43860349c9f7a5b96a090ecf5f698ff23a8eb49cd1e5c8a83bb2068f24ea563" + "1b623b81f373d49bcf057315fe404b30c500c3b5a387cf86c699d83f2f5763f4" "5ec088e25ddfcfe37b6ae7712c9cb37fd283ea5df7ac609d007cafa27dab6c64" "0f220ea77c6355c411508e71225680ecb3e308b4858ef6c8326089d9ea94b86f" default)) - '(lambda-themes-set-italic-keywords nil) '(lambda-themes-set-vibrant t) '(zoom-size '(0.382 . 0.618))) (custom-set-faces -- cgit v1.3.1