From 16cbc5aff7523e843c7c1da48fc5abc571d89513 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Mon, 9 Oct 2023 12:39:29 +0200 Subject: [PATCH] More Emacs config tweaks for Android --- .emacs.d/init.el | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 02368cb..ae90ef0 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -148,8 +148,6 @@ (elpaca mastodon) (elpaca ob-prolog) (elpaca orderless) -(elpaca org) -(elpaca org-transclusion) (elpaca (marginalia :pre-build (("emacs" "--batch" "-l" "ox-texinfo" "README.org" "--eval" "(setq org-babel-confirm-evaluate-answer-no t)" @@ -167,10 +165,6 @@ (elpaca rainbow-mode) (elpaca rg) (elpaca sqlformat) -(elpaca (sweeprolog - :repo "~/checkouts/sweep/" - :files ("*.org" "*.texi" "sweep.pl" - "sweeprolog-pce-theme.el" "sweeprolog.el"))) (elpaca terraform-mode) (elpaca (vterm :files ("*") @@ -184,9 +178,6 @@ "--entry" "* vterm::" "--section=Emacs" "--dir=dir" "vterm.info")))) (elpaca whitespace-cleanup-mode) -(elpaca (do-at-point - :repo "https://git.sr.ht/~pkal/do-at-point" - :pre-build (("pandoc" "-o" "do-at-point.texi" "README.md")))) (elpaca rfc-mode) (elpaca (auctex :files ("*.el" "*.info*") @@ -201,6 +192,14 @@ "-f" "org-texinfo-export-to-texinfo") ("mv" "README.texi" "pdf-tools.texi")))) +(unless (eq system-type 'android) + (elpaca org) + (elpaca org-transclusion) + (elpaca (sweeprolog + :repo "~/checkouts/sweep/" + :files ("*.org" "*.texi" "sweep.pl" + "sweeprolog-pce-theme.el" "sweeprolog.el")))) + (elpaca-wait) (defvar-keymap esy/elpaca-prefix-map @@ -464,9 +463,10 @@ (when (eq system-type 'darwin) (set-face-attribute 'default nil :height 130)) -(set-face-attribute 'default nil :family "Iosevka") -(set-face-attribute 'fixed-pitch nil :family "Iosevka") -(set-face-attribute 'variable-pitch nil :family "Iosevka Etoile") +(unless (eq system-type 'android) + (set-face-attribute 'default nil :family "Iosevka") + (set-face-attribute 'fixed-pitch nil :family "Iosevka") + (set-face-attribute 'variable-pitch nil :family "Iosevka Etoile")) (set-face-attribute 'mode-line nil :box nil :background nil :overline nil) (set-face-attribute 'mode-line-active nil :overline "black" @@ -499,13 +499,14 @@ (add-to-list 'load-path (expand-file-name "lisp/" user-emacs-directory)) (autoload 'some-button "some-button" nil t) -(add-to-list 'load-path "~/checkouts/esy-publish/") -(autoload 'esy-publish-setup "esy-publish" nil t) -(autoload 'esy-publish "esy-publish" nil t) -(autoload 'esy-publish-local-server "esy-publish" nil t) -(autoload 'esy-publish-create-post "esy-publish" nil t) -(with-eval-after-load 'recentf - (add-to-list 'recentf-exclude "~/checkouts/esy-publish/local/.*\.html")) +(unless (eq system-type 'android) + (add-to-list 'load-path "~/checkouts/esy-publish/") + (autoload 'esy-publish-setup "esy-publish" nil t) + (autoload 'esy-publish "esy-publish" nil t) + (autoload 'esy-publish-local-server "esy-publish" nil t) + (autoload 'esy-publish-create-post "esy-publish" nil t) + (with-eval-after-load 'recentf + (add-to-list 'recentf-exclude "~/checkouts/esy-publish/local/.*\.html"))) (require 'esy-comm) @@ -918,7 +919,6 @@ Interactively, POINT is point and KILL is the prefix argument." (keymap-global-set "M-#" #'dictionary-search) (keymap-global-set "M-o" #'previous-buffer) (keymap-global-set "M-O" #'next-buffer) -(keymap-global-set "C-'" #'do-at-point) (keymap-global-set "C-," #'backward-delete-char) (keymap-global-set "C-." #'embark-act) (keymap-global-set "C-;" #'avy-goto-char-timer) @@ -1072,7 +1072,8 @@ as the initial input for completion, and return that directory." (with-eval-after-load 'org (keymap-unset org-mode-map "C-," t) - (esy-publish-setup)) + (unless (eq system-type 'android) + (esy-publish-setup))) (with-eval-after-load 'org-agenda (add-to-list 'org-agenda-custom-commands -- 2.39.2