diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 996083e..c703b7c 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -23,6 +23,10 @@ (setq my/is-termux (string-match-p (rx (* nonl) "com.termux" (* nonl)) (getenv "HOME"))) +(defun my/system-name () + (or (getenv "ANDROID_NAME") + (system-name))) + (setq my/nested-emacs (and (getenv "IS_EMACS") t)) (setenv "IS_EMACS" "true") @@ -43,7 +47,7 @@ gcs-done) (setq my/emacs-started t))) -;; (setq use-package-verbose t) +(setq use-package-verbose t) (setq gc-cons-threshold 80000000) (setq read-process-output-max (* 1024 1024)) @@ -375,6 +379,13 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (global-set-key (kbd "C-+") 'my/zoom-in) (global-set-key (kbd "C-=") 'my/zoom-out) +(when my/is-termux + (define-key key-translation-map (kbd "`") (kbd "")) + (define-key key-translation-map (kbd "") (kbd "`"))) + +(when my/is-termux + (setq split-width-threshold 90)) + (unless (or my/remote-server my/nested-emacs) (add-hook 'after-init-hook #'server-start)) @@ -946,7 +957,11 @@ Obeys `widen-automatically', which see." :if (not (or my/remote-server)) :config (setq wakatime-ignore-exit-codes '(0 1 102 112)) - (advice-add 'wakatime-init :after (lambda () (setq wakatime-cli-path (expand-file-name "~/bin/wakatime-cli")))) + (advice-add 'wakatime-init :after + (lambda () + (setq wakatime-cli-path (or + (executable-find "wakatime-cli") + (expand-file-name "~/bin/wakatime-cli"))))) (when (file-exists-p "~/.wakatime.cfg") (setq wakatime-api-key (string-trim @@ -2970,12 +2985,13 @@ Returns ( . ) or nil." (my/set-smartparens-indent 'lua-mode) +(setq org-directory (expand-file-name "~/30-39 Life/32 org-mode")) + (use-package org :straight (:type built-in) :if (not my/remote-server) :defer t :init - (setq org-directory (expand-file-name "~/30-39 Life/32 org-mode")) (unless (file-exists-p org-directory) (mkdir org-directory t)) :config @@ -3521,13 +3537,15 @@ With ARG, repeats or can move backward if negative." f)) (seq-filter (lambda (f) (not (file-directory-p f))) - (directory-files - (concat org-directory "/projects")))))) + (when (file-directory-p (concat org-directory "/projects")) + (directory-files + (concat org-directory "/projects"))))))) (setq org-agenda-files - `("inbox.org" - "misc/habit.org" - "contacts.org" - ,@project-files)) + (seq-filter #'file-exists-p + `("inbox.org" + "misc/habit.org" + "contacts.org" + ,@project-files))) (setq org-refile-targets `(,@(mapcar (lambda (f) `(,f . (:tag . "refile"))) @@ -3539,8 +3557,9 @@ With ARG, repeats or can move backward if negative." (load-file (concat org-directory "/scripts/refile.el")) (run-hooks 'my/org-refile-hooks)))) +(setq org-roam-directory (concat org-directory "/roam")) (with-eval-after-load-norem 'org - (setq org-roam-directory (concat org-directory "/roam")) + (require 'seq) (my/update-org-agenda)) (setq org-refile-use-outline-path 'file) @@ -4114,21 +4133,22 @@ KEYS is a list of cons cells like (