diff options
author | Raúl Benencia <id@rbenencia.name> | 2023-07-20 07:53:35 -0700 |
---|---|---|
committer | Raúl Benencia <id@rbenencia.name> | 2023-07-22 10:45:18 -0700 |
commit | 5860445da55ac3abc3935c6ffd5e9bb4539225c9 (patch) | |
tree | 2de3124b4c0577245a0b7e1dec30732af7fcc191 | |
parent | fd0754be08f4b2f9ef58625c17544a238afefade (diff) |
emacs: move everything to ~/.emacs.d
-rw-r--r-- | .emacs | 39 | ||||
-rw-r--r-- | .emacs.d/early-init.el | 20 | ||||
-rw-r--r-- | .emacs.d/init.el | 178 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/auto-fill.el (renamed from .emacs.local.d/modes/auto-fill.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/company.el (renamed from .emacs.local.d/modes/company.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/dashboard.el (renamed from .emacs.local.d/modes/dashboard.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/doom-modeline.el (renamed from .emacs.local.d/modes/doom-modeline.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/flycheck.el (renamed from .emacs.local.d/modes/flycheck.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/flyspell.el (renamed from .emacs.local.d/modes/flyspell.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/fonts.el (renamed from .emacs.local.d/modes/fonts.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/go-lang.el (renamed from .emacs.local.d/modes/go-lang.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/hydra.el (renamed from .emacs.local.d/modes/hydra.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/ibuffer.el (renamed from .emacs.local.d/modes/ibuffer.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/imenu.el (renamed from .emacs.local.d/modes/imenu.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/ivy.el (renamed from .emacs.local.d/modes/ivy.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/latex.el (renamed from .emacs.local.d/modes/latex.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/logos.el (renamed from .emacs.local.d/modes/logos.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/lsp.el (renamed from .emacs.local.d/modes/lsp.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/magit.el (renamed from .emacs.local.d/modes/magit.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/mail-mode.el (renamed from .emacs.local.d/modes/mail-mode.el) | 5 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/markdown.el (renamed from .emacs.local.d/modes/markdown.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/mu4e.el (renamed from .emacs.local.d/modes/mu4e.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/notmuch.el (renamed from .emacs.local.d/modes/notmuch.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/projectile.el (renamed from .emacs.local.d/modes/projectile.el) | 1 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/python.el (renamed from .emacs.local.d/modes/python.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/sml.el (renamed from .emacs.local.d/modes/sml.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/staging.el (renamed from .emacs.local.d/staging.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/tabbar.el (renamed from .emacs.local.d/modes/tabbar.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/themes.el (renamed from .emacs.local.d/modes/themes.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/vterm.el (renamed from .emacs.local.d/modes/vterm.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/which-key.el (renamed from .emacs.local.d/modes/which-key.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-init.d/writeroom.el (renamed from .emacs.local.d/modes/writeroom.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/config/rul-config-elfeed.el (renamed from .emacs.local.d/lisp/config/rul-config-elfeed.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/config/rul-config-mail.el (renamed from .emacs.local.d/lisp/config/rul-config-mail.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/config/rul-config-org.el | 22 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-dart.el (renamed from .emacs.local.d/lisp/packages/rul-dart.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-elfeed.el (renamed from .emacs.local.d/lisp/packages/rul-elfeed.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-org-agenda.el (renamed from .emacs.local.d/lisp/packages/rul-org-agenda.el) | 3 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-org-journal.el | 11 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-org-notify.el (renamed from .emacs.local.d/lisp/packages/rul-org-notify.el) | 0 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-org-roam.el (renamed from .emacs.local.d/lisp/packages/rul-org-roam.el) | 2 | ||||
-rw-r--r-- | .emacs.d/rul-lisp/packages/rul-org.el (renamed from .emacs.local.d/lisp/packages/rul-org.el) | 18 | ||||
-rw-r--r-- | .emacs.local.d/general.el | 180 | ||||
-rw-r--r-- | .emacs.local.d/lisp/config/rul-config-org.el | 22 | ||||
-rw-r--r-- | .emacs.local.d/lisp/config/rul-config-projectile.el | 2 | ||||
-rw-r--r-- | .emacs.local.d/lisp/packages/rul-org-journal.el | 16 |
46 files changed, 244 insertions, 275 deletions
@@ -1,39 +0,0 @@ -(add-to-list 'load-path "~/.emacs.local.d/lisp/config") -(add-to-list 'load-path "~/.emacs.local.d/lisp/packages") - -;; Load up the general config -(load-file "~/.emacs.local.d/general.el") - -(load-file "~/.emacs.local.d/modes/fonts.el") -(load-file "~/.emacs.local.d/modes/themes.el") - -;; Modes -(load-file "~/.emacs.local.d/modes/auto-fill.el") -;(load-file "~/.emacs.local.d/modes/doom-modeline.el") -(load-file "~/.emacs.local.d/modes/flycheck.el") -(load-file "~/.emacs.local.d/modes/flyspell.el") -(load-file "~/.emacs.local.d/modes/go-lang.el") -(load-file "~/.emacs.local.d/modes/hydra.el") -(load-file "~/.emacs.local.d/modes/ibuffer.el") -(load-file "~/.emacs.local.d/modes/imenu.el") -;(load-file "~/.emacs.local.d/modes/ivy.el") -(load-file "~/.emacs.local.d/modes/latex.el") -(load-file "~/.emacs.local.d/modes/logos.el") -(load-file "~/.emacs.local.d/modes/mail-mode.el") -(load-file "~/.emacs.local.d/modes/markdown.el") -(load-file "~/.emacs.local.d/modes/magit.el") -(load-file "~/.emacs.local.d/modes/notmuch.el") -(load-file "~/.emacs.local.d/modes/projectile.el") -(load-file "~/.emacs.local.d/modes/tabbar.el") -(load-file "~/.emacs.local.d/modes/which-key.el") -(load-file "~/.emacs.local.d/modes/writeroom.el") -(load-file "~/.emacs.local.d/modes/vterm.el") - -(load-file "~/.emacs.local.d/staging.el") - -(require 'rul-org) -(require 'rul-org-roam) -(require 'rul-elfeed) -(require 'rul-dart) - -(provide '.emacs) diff --git a/.emacs.d/early-init.el b/.emacs.d/early-init.el new file mode 100644 index 0000000..495c277 --- /dev/null +++ b/.emacs.d/early-init.el @@ -0,0 +1,20 @@ +(menu-bar-mode -1) +(tool-bar-mode -1) +(scroll-bar-mode -1) + +;; Initialise installed packages +(setq package-enable-at-startup t) + +;; Do not report warning errors +(setq native-comp-async-report-warnings-errors 'silent) + +;; Truly maximize screen +(setq frame-resize-pixelwise t) + +;; Start maximized +(add-to-list 'default-frame-alist '(fullscreen . maximized)) + +;; No need for titlebar +(modify-frame-parameters nil '((undecorated . t))) + +;;; early-init.el ends here diff --git a/.emacs.d/init.el b/.emacs.d/init.el new file mode 100644 index 0000000..5d0996e --- /dev/null +++ b/.emacs.d/init.el @@ -0,0 +1,178 @@ +;; Debian packages: elpa-use-package elpa-fill-column-indicator fonts-hack + +(require 'package) +(require 'fill-column-indicator) + +;; This is only needed once, near the top of the file +(eval-when-compile + (require 'use-package)) + +(add-to-list 'package-archives + '("melpa-stable" . "https://stable.melpa.org/packages/") t) + +(add-to-list 'package-archives + '("melpa" . "https://melpa.org/packages/") t) + +;; Do not persist customizations +(setq custom-file (make-temp-file "emacs-custom-")) + +;; Place backups in ~/.backups/ directory, like a civilized program. +;; ------ +(if (file-directory-p "~/.backup") + (setq backup-directory-alist '(("." . "~/.backup"))) + (message "Directory does not exist: ~/.backup")) + +(filesets-init) + +(setq backup-by-copying t ; Don't delink hardlinks + delete-old-versions t ; Clean up the backups + version-control t ; Use version numbers on backups, + kept-new-versions 3 ; keep some new versions + kept-old-versions 2) ; and some old ones, too + +;; --------- +;; Generic keybindings +;; --------- +(global-set-key (kbd "C-c d") 'diff-buffer-with-file) +(global-set-key (kbd "C-c R") 'revert-buffer) + +;; compile +(global-set-key [f12] 'compile) + +(defun help/insert-em-dash () + "Inserts an EM-DASH (not a HYPEN, not an N-DASH)" + (interactive) + (insert "—")) + +(global-set-key (kbd "C--") #'help/insert-em-dash) + +;; ------ +;; General config +;; ------ + +(setq fill-column 79) + +;; Make sure that pressing middle mouse button pastes right at point, +;; not where the mouse cursor is. +(setq mouse-yank-at-point t) + +(setq column-number-mode 1) +(setq line-number-mode 1) +(setq-default indent-tabs-mode nil) +(setq-default tab-width 4) + +(setq-default c-basic-offset 4) + +;; ------ +;; Initialize environment +;; ------ + + +(setenv "TMPDIR" (concat (getenv "HOME") "/tmp")) +(server-start) + +;; ------ +;; Helper for compilation. +;; ------ +;; Close the compilation window if there was no error at all. +(defun compilation-exit-autoclose (status code msg) + ;; If M-x compile exists with a 0 + (when (and (eq status 'exit) (zerop code)) + ;; then bury the *compilation* buffer, so that C-x b doesn't go there + (bury-buffer) + ;; and delete the *compilation* window + (delete-window (get-buffer-window (get-buffer "*compilation*")))) + ;; Always return the anticipated result of compilation-exit-message-function + (cons msg code)) + +;; Specify my function (maybe I should have done a lambda function) +(setq compilation-exit-message-function 'compilation-exit-autoclose) +(setq compilation-read-command nil) + +;; Themes +(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") + +;; Remove scratch message +(setq initial-scratch-message "") + +;; Ask y or n instead of yes or no +(defalias 'yes-or-no-p 'y-or-n-p) + +;; Fancier buffer selection +(global-set-key (kbd "C-x C-b") 'bs-show) + +;;; Stefan Monnier <foo at acm.org>. It is the opposite of fill-paragraph +(defun unfill-paragraph (&optional region) + "Takes a multi-line paragraph and makes it into a single line of text." + (interactive (progn (barf-if-buffer-read-only) '(t))) + (let ((fill-column (point-max)) + ;; This would override `fill-column' if it's an integer. + (emacs-lisp-docstring-fill-column t)) + (fill-paragraph nil region))) + +;; Handy key definition +(define-key global-map "\M-Q" 'unfill-paragraph) + +;; Only flash the mode line +(setq ring-bell-function + (lambda () + (let ((orig-fg (face-foreground 'mode-line))) + (set-face-foreground 'mode-line "#F2804F") + (run-with-idle-timer 0.1 nil + (lambda (fg) (set-face-foreground 'mode-line fg)) + orig-fg)))) + +;; Highlight parens +(setq show-paren-delay 0) +(show-paren-mode 1) + +;; Save what you enter into minibuffer prompts +(setq history-length 25) +(savehist-mode 1) + +;; Remember and restore cursor information +(save-place-mode 1) + +;; Set this to t if you don't understand what it means +(setq vc-follow-symlinks nil) + +(dolist (path '("~/.emacs.d/rul-lisp/config" "~/.emacs.d/rul-lisp/packages")) + (add-to-list 'load-path path)) + +(require 'rul-org) +(require 'rul-org-roam) +(require 'rul-elfeed) +(require 'rul-dart) + +(load-file "~/.emacs.d/rul-init.d/fonts.el") +(load-file "~/.emacs.d/rul-init.d/themes.el") + +;; Init parts (will be deprecated in favor of packages) +(load-file "~/.emacs.d/rul-init.d/auto-fill.el") +;(load-file "~/.emacs.d/rul-init.d/doom-modeline.el") +(load-file "~/.emacs.d/rul-init.d/flycheck.el") +(load-file "~/.emacs.d/rul-init.d/flyspell.el") +(load-file "~/.emacs.d/rul-init.d/go-lang.el") +(load-file "~/.emacs.d/rul-init.d/hydra.el") +(load-file "~/.emacs.d/rul-init.d/ibuffer.el") +(load-file "~/.emacs.d/rul-init.d/imenu.el") +;(load-file "~/.emacs.d/rul-init.d/ivy.el") +(load-file "~/.emacs.d/rul-init.d/latex.el") +(load-file "~/.emacs.d/rul-init.d/logos.el") +(load-file "~/.emacs.d/rul-init.d/mail-mode.el") +(load-file "~/.emacs.d/rul-init.d/markdown.el") +(load-file "~/.emacs.d/rul-init.d/magit.el") +(load-file "~/.emacs.d/rul-init.d/notmuch.el") +(load-file "~/.emacs.d/rul-init.d/projectile.el") +(load-file "~/.emacs.d/rul-init.d/tabbar.el") +(load-file "~/.emacs.d/rul-init.d/which-key.el") +(load-file "~/.emacs.d/rul-init.d/writeroom.el") +(load-file "~/.emacs.d/rul-init.d/vterm.el") + +(load-file "~/.emacs.d/rul-init.d/staging.el") + +(when-let* ((file (locate-user-emacs-file "rul-pre-init.el")) + ((file-exists-p file))) + (load-file file)) + +;; init.el ends here diff --git a/.emacs.local.d/modes/auto-fill.el b/.emacs.d/rul-init.d/auto-fill.el index dad2831..dad2831 100644 --- a/.emacs.local.d/modes/auto-fill.el +++ b/.emacs.d/rul-init.d/auto-fill.el diff --git a/.emacs.local.d/modes/company.el b/.emacs.d/rul-init.d/company.el index d52000e..d52000e 100644 --- a/.emacs.local.d/modes/company.el +++ b/.emacs.d/rul-init.d/company.el diff --git a/.emacs.local.d/modes/dashboard.el b/.emacs.d/rul-init.d/dashboard.el index 7bf51a9..7bf51a9 100644 --- a/.emacs.local.d/modes/dashboard.el +++ b/.emacs.d/rul-init.d/dashboard.el diff --git a/.emacs.local.d/modes/doom-modeline.el b/.emacs.d/rul-init.d/doom-modeline.el index b212652..b212652 100644 --- a/.emacs.local.d/modes/doom-modeline.el +++ b/.emacs.d/rul-init.d/doom-modeline.el diff --git a/.emacs.local.d/modes/flycheck.el b/.emacs.d/rul-init.d/flycheck.el index 6662c06..6662c06 100644 --- a/.emacs.local.d/modes/flycheck.el +++ b/.emacs.d/rul-init.d/flycheck.el diff --git a/.emacs.local.d/modes/flyspell.el b/.emacs.d/rul-init.d/flyspell.el index 8cf27b8..8cf27b8 100644 --- a/.emacs.local.d/modes/flyspell.el +++ b/.emacs.d/rul-init.d/flyspell.el diff --git a/.emacs.local.d/modes/fonts.el b/.emacs.d/rul-init.d/fonts.el index 69eb304..69eb304 100644 --- a/.emacs.local.d/modes/fonts.el +++ b/.emacs.d/rul-init.d/fonts.el diff --git a/.emacs.local.d/modes/go-lang.el b/.emacs.d/rul-init.d/go-lang.el index 8ec678b..8ec678b 100644 --- a/.emacs.local.d/modes/go-lang.el +++ b/.emacs.d/rul-init.d/go-lang.el diff --git a/.emacs.local.d/modes/hydra.el b/.emacs.d/rul-init.d/hydra.el index 8afe86f..8afe86f 100644 --- a/.emacs.local.d/modes/hydra.el +++ b/.emacs.d/rul-init.d/hydra.el diff --git a/.emacs.local.d/modes/ibuffer.el b/.emacs.d/rul-init.d/ibuffer.el index d5198d8..d5198d8 100644 --- a/.emacs.local.d/modes/ibuffer.el +++ b/.emacs.d/rul-init.d/ibuffer.el diff --git a/.emacs.local.d/modes/imenu.el b/.emacs.d/rul-init.d/imenu.el index 1a2b29b..1a2b29b 100644 --- a/.emacs.local.d/modes/imenu.el +++ b/.emacs.d/rul-init.d/imenu.el diff --git a/.emacs.local.d/modes/ivy.el b/.emacs.d/rul-init.d/ivy.el index fcf69ca..fcf69ca 100644 --- a/.emacs.local.d/modes/ivy.el +++ b/.emacs.d/rul-init.d/ivy.el diff --git a/.emacs.local.d/modes/latex.el b/.emacs.d/rul-init.d/latex.el index de4de1f..de4de1f 100644 --- a/.emacs.local.d/modes/latex.el +++ b/.emacs.d/rul-init.d/latex.el diff --git a/.emacs.local.d/modes/logos.el b/.emacs.d/rul-init.d/logos.el index 23d9937..23d9937 100644 --- a/.emacs.local.d/modes/logos.el +++ b/.emacs.d/rul-init.d/logos.el diff --git a/.emacs.local.d/modes/lsp.el b/.emacs.d/rul-init.d/lsp.el index a565b03..a565b03 100644 --- a/.emacs.local.d/modes/lsp.el +++ b/.emacs.d/rul-init.d/lsp.el diff --git a/.emacs.local.d/modes/magit.el b/.emacs.d/rul-init.d/magit.el index cd52e67..cd52e67 100644 --- a/.emacs.local.d/modes/magit.el +++ b/.emacs.d/rul-init.d/magit.el diff --git a/.emacs.local.d/modes/mail-mode.el b/.emacs.d/rul-init.d/mail-mode.el index 4969f0a..09b04f9 100644 --- a/.emacs.local.d/modes/mail-mode.el +++ b/.emacs.d/rul-init.d/mail-mode.el @@ -1,6 +1,9 @@ +(setq auto-mode-alist (append '((".*tmp/mutt.*" . message-mode)) auto-mode-alist)) +(setq auto-mode-alist (append '((".*tmp/neomutt.*" . message-mode)) auto-mode-alist)) +(add-to-list 'auto-mode-alist '("/mutt" . mail-mode)) + (setq mml-secure-openpgp-sign-with-sender t) -(add-to-list 'auto-mode-alist '("/mutt" . mail-mode)) (add-hook 'mail-mode-hook (lambda () (font-lock-add-keywords nil diff --git a/.emacs.local.d/modes/markdown.el b/.emacs.d/rul-init.d/markdown.el index f035509..f035509 100644 --- a/.emacs.local.d/modes/markdown.el +++ b/.emacs.d/rul-init.d/markdown.el diff --git a/.emacs.local.d/modes/mu4e.el b/.emacs.d/rul-init.d/mu4e.el index da8b7c8..da8b7c8 100644 --- a/.emacs.local.d/modes/mu4e.el +++ b/.emacs.d/rul-init.d/mu4e.el diff --git a/.emacs.local.d/modes/notmuch.el b/.emacs.d/rul-init.d/notmuch.el index 19ea823..19ea823 100644 --- a/.emacs.local.d/modes/notmuch.el +++ b/.emacs.d/rul-init.d/notmuch.el diff --git a/.emacs.local.d/modes/projectile.el b/.emacs.d/rul-init.d/projectile.el index df85aec..ed95775 100644 --- a/.emacs.local.d/modes/projectile.el +++ b/.emacs.d/rul-init.d/projectile.el @@ -4,6 +4,5 @@ :hook (after-init . projectile-global-mode) :config - (require 'rul-config-projectile) (setq projectile-completion-system 'ivy) ) diff --git a/.emacs.local.d/modes/python.el b/.emacs.d/rul-init.d/python.el index 3186c72..3186c72 100644 --- a/.emacs.local.d/modes/python.el +++ b/.emacs.d/rul-init.d/python.el diff --git a/.emacs.local.d/modes/sml.el b/.emacs.d/rul-init.d/sml.el index 247d9b2..247d9b2 100644 --- a/.emacs.local.d/modes/sml.el +++ b/.emacs.d/rul-init.d/sml.el diff --git a/.emacs.local.d/staging.el b/.emacs.d/rul-init.d/staging.el index 7134fc3..7134fc3 100644 --- a/.emacs.local.d/staging.el +++ b/.emacs.d/rul-init.d/staging.el diff --git a/.emacs.local.d/modes/tabbar.el b/.emacs.d/rul-init.d/tabbar.el index a492e85..a492e85 100644 --- a/.emacs.local.d/modes/tabbar.el +++ b/.emacs.d/rul-init.d/tabbar.el diff --git a/.emacs.local.d/modes/themes.el b/.emacs.d/rul-init.d/themes.el index c94d4a1..c94d4a1 100644 --- a/.emacs.local.d/modes/themes.el +++ b/.emacs.d/rul-init.d/themes.el diff --git a/.emacs.local.d/modes/vterm.el b/.emacs.d/rul-init.d/vterm.el index 54abbbf..54abbbf 100644 --- a/.emacs.local.d/modes/vterm.el +++ b/.emacs.d/rul-init.d/vterm.el diff --git a/.emacs.local.d/modes/which-key.el b/.emacs.d/rul-init.d/which-key.el index 1d8fd8d..1d8fd8d 100644 --- a/.emacs.local.d/modes/which-key.el +++ b/.emacs.d/rul-init.d/which-key.el diff --git a/.emacs.local.d/modes/writeroom.el b/.emacs.d/rul-init.d/writeroom.el index 50780cc..50780cc 100644 --- a/.emacs.local.d/modes/writeroom.el +++ b/.emacs.d/rul-init.d/writeroom.el diff --git a/.emacs.local.d/lisp/config/rul-config-elfeed.el b/.emacs.d/rul-lisp/config/rul-config-elfeed.el index 026c325..026c325 100644 --- a/.emacs.local.d/lisp/config/rul-config-elfeed.el +++ b/.emacs.d/rul-lisp/config/rul-config-elfeed.el diff --git a/.emacs.local.d/lisp/config/rul-config-mail.el b/.emacs.d/rul-lisp/config/rul-config-mail.el index 240f8be..240f8be 100644 --- a/.emacs.local.d/lisp/config/rul-config-mail.el +++ b/.emacs.d/rul-lisp/config/rul-config-mail.el diff --git a/.emacs.d/rul-lisp/config/rul-config-org.el b/.emacs.d/rul-lisp/config/rul-config-org.el new file mode 100644 index 0000000..bf538dc --- /dev/null +++ b/.emacs.d/rul-lisp/config/rul-config-org.el @@ -0,0 +1,22 @@ +(setq + org-agenda-files '("~/org/") + org-agenda-custom-commands + '(("x" agenda) + ("y" agenda*) + ("w" todo "WAITING") + ("W" todo-tree "WAITING") + ) + org-journal-file-type 'yearly + org-journal-dir "~/org/journal/" + org-journal-file-format "%Y.org" + org-journal-time-prefix "* " + org-journal-time-format "" + org-refile-path "~/refile.org" + org-roam-directory "~/org/roam/" + + org-agenda-private-local-path "/tmp/example.ics" + org-agenda-private-remote-path "/sshx:user@host:example.ics" + ) + +(provide 'rul-config-org) + diff --git a/.emacs.local.d/lisp/packages/rul-dart.el b/.emacs.d/rul-lisp/packages/rul-dart.el index 36bfd47..36bfd47 100644 --- a/.emacs.local.d/lisp/packages/rul-dart.el +++ b/.emacs.d/rul-lisp/packages/rul-dart.el diff --git a/.emacs.local.d/lisp/packages/rul-elfeed.el b/.emacs.d/rul-lisp/packages/rul-elfeed.el index 34713db..34713db 100644 --- a/.emacs.local.d/lisp/packages/rul-elfeed.el +++ b/.emacs.d/rul-lisp/packages/rul-elfeed.el diff --git a/.emacs.local.d/lisp/packages/rul-org-agenda.el b/.emacs.d/rul-lisp/packages/rul-org-agenda.el index 8122afb..7b6c4b4 100644 --- a/.emacs.local.d/lisp/packages/rul-org-agenda.el +++ b/.emacs.d/rul-lisp/packages/rul-org-agenda.el @@ -398,9 +398,6 @@ If OTHERS is true, skip all entries that do not correspond to TAG." ;; AGENDA VIEW ;; -(setq org-agenda-files my-org-agenda-files) -(setq org-agenda-custom-commands my-org-agenda-custom-commands) - ;; Do not dim blocked tasks (setq org-agenda-compact-blocks nil) (setq org-agenda-dim-blocked-tasks nil) diff --git a/.emacs.d/rul-lisp/packages/rul-org-journal.el b/.emacs.d/rul-lisp/packages/rul-org-journal.el new file mode 100644 index 0000000..9d30e00 --- /dev/null +++ b/.emacs.d/rul-lisp/packages/rul-org-journal.el @@ -0,0 +1,11 @@ +(use-package org-journal + :ensure t + :init + ;; Change default prefix key; needs to be set before loading org-journal + (setq org-journal-prefix-key "C-c j ") + (setq org-journal-enable-agenda-integration t) + :config + (require 'rul-config-org) + (setq org-journal-date-format "%A, %d %B %Y")) + +(provide 'rul-org-journal) diff --git a/.emacs.local.d/lisp/packages/rul-org-notify.el b/.emacs.d/rul-lisp/packages/rul-org-notify.el index 50c35a0..50c35a0 100644 --- a/.emacs.local.d/lisp/packages/rul-org-notify.el +++ b/.emacs.d/rul-lisp/packages/rul-org-notify.el diff --git a/.emacs.local.d/lisp/packages/rul-org-roam.el b/.emacs.d/rul-lisp/packages/rul-org-roam.el index 0184459..f30e86e 100644 --- a/.emacs.local.d/lisp/packages/rul-org-roam.el +++ b/.emacs.d/rul-lisp/packages/rul-org-roam.el @@ -1,8 +1,6 @@ (use-package org-roam :ensure t :after rul-org - :custom - (org-roam-directory my-org-roam-directory) :init (setq org-roam-v2-ack t) :bind (("C-c n l" . org-roam-buffer-toggle) diff --git a/.emacs.local.d/lisp/packages/rul-org.el b/.emacs.d/rul-lisp/packages/rul-org.el index 97b4b5a..0727239 100644 --- a/.emacs.local.d/lisp/packages/rul-org.el +++ b/.emacs.d/rul-lisp/packages/rul-org.el @@ -57,36 +57,36 @@ (setq org-log-reschedule (quote time)) ;; CAPTURE ;; -(setq org-default-notes-file my-org-refile-path) +(setq org-default-notes-file org-refile-path) (setq org-capture-templates (quote ( - ("w" "Todo" entry (file+headline my-org-refile-path "Tasks") + ("w" "Todo" entry (file+headline org-refile-path "Tasks") "* TODO " :empty-lines 1) ("m" "Capture incoming email" entry - (file+headline my-org-refile-path "Incoming") + (file+headline org-refile-path "Incoming") "* TODO Re: %:description\n\n Source: %u, %a\n" :empty-lines 1) ))) (add-hook 'org-capture-mode-hook 'delete-other-windows) -(setq my-org-protocol-flag nil) +(setq org-protocol-flag nil) (defadvice org-capture-finalize (after delete-frame-at-end activate) "Delete frame at remember finalization" - (progn (if my-org-protocol-flag (delete-frame)) - (setq my-org-protocol-flag nil))) + (progn (if org-protocol-flag (delete-frame)) + (setq org-protocol-flag nil))) (defadvice org-capture-kill (after delete-frame-at-end activate) "Delete frame at remember abort" - (progn (if my-org-protocol-flag (delete-frame)) - (setq my-org-protocol-flag nil))) + (progn (if org-protocol-flag (delete-frame)) + (setq org-protocol-flag nil))) (defadvice org-protocol-capture (before set-org-protocol-flag activate) - (setq my-org-protocol-flag t)) + (setq org-protocol-flag t)) ;; REFILE ;; diff --git a/.emacs.local.d/general.el b/.emacs.local.d/general.el index 4e1ad01..e69de29 100644 --- a/.emacs.local.d/general.el +++ b/.emacs.local.d/general.el @@ -1,180 +0,0 @@ -;; Debian packages: elpa-use-package elpa-fill-column-indicator fonts-hack - -(require 'package) - -;; This is only needed once, near the top of the file -(eval-when-compile - (require 'use-package)) - -(add-to-list 'package-archives - '("melpa-stable" . "https://stable.melpa.org/packages/") t) - -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/") t) - -;; ------ -;; Require misc stuff -;; ------ -(require 'fill-column-indicator) - -;; Place backups in ~/.backups/ directory, like a civilized program. -;; ------ -(if (file-directory-p "~/.backup") - (setq backup-directory-alist '(("." . "~/.backup"))) - (message "Directory does not exist: ~/.backup")) - -(filesets-init) - -(setq backup-by-copying t ; Don't delink hardlinks - delete-old-versions t ; Clean up the backups - version-control t ; Use version numbers on backups, - kept-new-versions 3 ; keep some new versions - kept-old-versions 2) ; and some old ones, too - -;;; backup/autosave - old studd, just in case -;; (defvar backup-dir (expand-file-name "~/.emacs.d/backup/")) -;; (defvar autosave-dir (expand-file-name "~/.emacs.d/autosave/")) -;; (setq backup-directory-alist (list (cons ".*" backup-dir))) -;; (setq auto-save-list-file-prefix autosave-dir) -;; (setq auto-save-file-name-transforms `((".*" ,autosave-dir t))) - - -;; --------- -;; Generic keybindings -;; --------- -(global-set-key (kbd "C-c d") 'diff-buffer-with-file) -(global-set-key (kbd "C-c R") 'revert-buffer) - -;; compile -(global-set-key [f12] 'compile) - -(defun help/insert-em-dash () - "Inserts an EM-DASH (not a HYPEN, not an N-DASH)" - (interactive) - (insert "—")) - -(global-set-key (kbd "C--") #'help/insert-em-dash) - -;; ------ -;; General config BS -;; ------ - -(setq fill-column 79) - -;; Make sure that pressing middle mouse button pastes right at point, -;; not where the mouse cursor is. -(setq mouse-yank-at-point t) -(setq column-number-mode 1) -(setq line-number-mode 1) -(setq-default indent-tabs-mode nil) -(setq-default tab-width 4) - -(setq-default c-basic-offset 4) - -;; ------ -;; Initialize some things -;; ------ - - -(setenv "TMPDIR" (concat (getenv "HOME") "/tmp")) -(server-start) - -;; ------ -;; Terminal / window specific stuff -;; ------ - -;; Don't minimize my emacs! Honestly wtf -(when window-system - (progn - (global-unset-key (kbd "C-z")) - (setq scroll-bar-mode nil) - (tool-bar-mode nil) - (menu-bar-mode nil))) - -;; ------ -;; Helper for compilation. -;; ------ -;; Close the compilation window if there was no error at all. -(defun compilation-exit-autoclose (status code msg) - ;; If M-x compile exists with a 0 - (when (and (eq status 'exit) (zerop code)) - ;; then bury the *compilation* buffer, so that C-x b doesn't go there - (bury-buffer) - ;; and delete the *compilation* window - (delete-window (get-buffer-window (get-buffer "*compilation*")))) - ;; Always return the anticipated result of compilation-exit-message-function - (cons msg code)) -;; Specify my function (maybe I should have done a lambda function) -(setq compilation-exit-message-function 'compilation-exit-autoclose) -(setq compilation-read-command nil) - -;; Themes -(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") - -;; Remove scratch message -(setq initial-scratch-message "") - -;; Turn of scroll bar -(when (featurep 'scroll-bar) (scroll-bar-mode -1)) - -;; Ask y or n instead of yes or no -(defalias 'yes-or-no-p 'y-or-n-p) - -;; Fancier buffer selection -(global-set-key (kbd "C-x C-b") 'bs-show) - -;;; Stefan Monnier <foo at acm.org>. It is the opposite of fill-paragraph -(defun unfill-paragraph (&optional region) - "Takes a multi-line paragraph and makes it into a single line of text." - (interactive (progn (barf-if-buffer-read-only) '(t))) - (let ((fill-column (point-max)) - ;; This would override `fill-column' if it's an integer. - (emacs-lisp-docstring-fill-column t)) - (fill-paragraph nil region))) - -;; Handy key definition -(define-key global-map "\M-Q" 'unfill-paragraph) - -;; Do not persist customizations -(setq custom-file (make-temp-file "emacs-custom-")) - -(menu-bar-mode -1) -(tool-bar-mode -1) - -;; Truly maximize screen -(setq frame-resize-pixelwise t) - -;; Start maximized -(add-to-list 'default-frame-alist '(fullscreen . maximized)) - -;; Only flash the mode line -(setq ring-bell-function - (lambda () - (let ((orig-fg (face-foreground 'mode-line))) - (set-face-foreground 'mode-line "#F2804F") - (run-with-idle-timer 0.1 nil - (lambda (fg) (set-face-foreground 'mode-line fg)) - orig-fg)))) - -;; Highlight parens -(setq show-paren-delay 0) -(show-paren-mode 1) - -;; Use default brwoser -;;(setq browse-url-browser-function 'browse-url-generic browse-url-generic-program "chromium") - -;; Save what you enter into minibuffer prompts -(setq history-length 25) -(savehist-mode 1) - -;; Remember and restore cursor information -(save-place-mode 1) - -;; No need for titlebar -(modify-frame-parameters nil '((undecorated . t))) - -;; Do not pop-up warnings in every buffer -(setq native-comp-async-report-warnings-errors 'silent) - -;; Set this to t if you don't understand what it means -(setq vc-follow-symlinks nil) diff --git a/.emacs.local.d/lisp/config/rul-config-org.el b/.emacs.local.d/lisp/config/rul-config-org.el deleted file mode 100644 index a16e525..0000000 --- a/.emacs.local.d/lisp/config/rul-config-org.el +++ /dev/null @@ -1,22 +0,0 @@ -(setq - my-org-agenda-files '("~/org/") - my-org-agenda-custom-commands - '(("x" agenda) - ("y" agenda*) - ("w" todo "WAITING") - ("W" todo-tree "WAITING") - ) - my-org-journal-file-type 'yearly - my-org-journal-dir "~/org/journal/" - my-org-journal-file-format "%Y.org" - my-org-journal-time-prefix "* " - my-org-journal-time-format "" - my-org-refile-path "~/refile.org" - my-org-roam-directory "~/org/roam/" - - my-org-agenda-private-local-path "/tmp/example.ics" - my-org-agenda-private-remote-path "/sshx:user@host:example.ics" - ) - -(provide 'rul-config-org) - diff --git a/.emacs.local.d/lisp/config/rul-config-projectile.el b/.emacs.local.d/lisp/config/rul-config-projectile.el deleted file mode 100644 index 3922c8f..0000000 --- a/.emacs.local.d/lisp/config/rul-config-projectile.el +++ /dev/null @@ -1,2 +0,0 @@ -(setq my-projectile-project-search-path '("~/src/")) -(provide 'rul-config-projectile) diff --git a/.emacs.local.d/lisp/packages/rul-org-journal.el b/.emacs.local.d/lisp/packages/rul-org-journal.el deleted file mode 100644 index ab07a19..0000000 --- a/.emacs.local.d/lisp/packages/rul-org-journal.el +++ /dev/null @@ -1,16 +0,0 @@ -(use-package org-journal - :ensure t - :init - ;; Change default prefix key; needs to be set before loading org-journal - (setq org-journal-prefix-key "C-c j ") - (setq org-journal-file-format my-org-journal-file-format) - (setq org-journal-enable-agenda-integration t) - :config - (require 'rul-config-org) - (setq org-journal-dir my-org-journal-dir - org-journal-file-type my-org-journal-file-type - org-journal-time-prefix my-org-journal-time-prefix - org-journal-time-format my-org-journal-time-format - org-journal-date-format "%A, %d %B %Y")) - -(provide 'rul-org-journal) |