From 26913bece670c5676fc37515e9c878f732281bc2 Mon Sep 17 00:00:00 2001 From: iamtoaster Date: Fri, 19 Dec 2025 10:32:01 +0900 Subject: [PATCH] Adapt to better work on other systems. --- .config.d/05-basic.el | 7 +++++-- .config.d/07-org.el | 4 +++- .config.d/15-lsp.el | 4 ++-- post-init.el | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.config.d/05-basic.el b/.config.d/05-basic.el index 9dbde66..93c0b8a 100644 --- a/.config.d/05-basic.el +++ b/.config.d/05-basic.el @@ -17,7 +17,8 @@ (which-key-mode)) ;; Pixel perfect scrolling -(pixel-scroll-precision-mode) +(unless (version< emacs-version "29.0") + (pixel-scroll-precision-mode)) ;; Display time (display-time-mode) @@ -116,6 +117,8 @@ ;; stopped loading it automatically. So, to remedy that, we load it if it was ;; not already loaded. (unless (memq 'vterm features) - (load "vterm" nil t)) + (load "vterm" t) + (unless (memq 'vterm features) + (message "Failed to load vterm. It is probably not installed."))) ;;; 05-basic.el ends here diff --git a/.config.d/07-org.el b/.config.d/07-org.el index 4c114db..da7167f 100644 --- a/.config.d/07-org.el +++ b/.config.d/07-org.el @@ -48,7 +48,9 @@ (setq org-roam-directory (file-truename "~/data2/Notes")) ;; This tells org-roam to sync notes with its index in the background. -(org-roam-db-autosync-mode) +(if (file-directory-p org-roam-directory) + (org-roam-db-autosync-mode) + (message "Org Roam directory (%s) does not exist. Autosync disabled." org-roam-directory)) (setq global-roam-map (make-sparse-keymap "Roam Keys")) (global-set-key "\C-cr" global-roam-map) diff --git a/.config.d/15-lsp.el b/.config.d/15-lsp.el index 2340669..5772b8f 100644 --- a/.config.d/15-lsp.el +++ b/.config.d/15-lsp.el @@ -110,10 +110,10 @@ ;; Lispy provides structural editing to lisp modes. (use-package lispy - :ensure t :defer t) -(add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1))) +(if (memq 'lispy-autoloads features) + (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))) ;; This package adds indent bars. Currently only configured for rust and python. (use-package indent-bars diff --git a/post-init.el b/post-init.el index 965bc49..b5b8d50 100644 --- a/post-init.el +++ b/post-init.el @@ -19,6 +19,9 @@ (eval-print-last-sexp))) (load bootstrap-file nil 'nomessage)) +(unless (memq 'use-package-autoloads features) + (straight-use-package 'use-package)) + ;; The compile-angel package automatically byte-compiles and ;; native-compiles Emacs Lisp libraries. It should be loaded before ;; any other package.