[emacs] cleanup

13 files changed, 71 insertions, 111 deletions

diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 6ef1d47..6f0df8e 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-02-06 19h56 CET (1b415aec)>
+;; Time-stamp: <2024-07-13 14h57 CEST (471b3659)>
 
 ;; -----------------------------------------------------------------------------
 ;; Interface
@@ -44,15 +44,14 @@
      (set-face-attribute face nil :weight 'normal))
    (face-list)))
 
-(when 't
-  (setq my-font "Sudo-22")
-  (setq my-font "Commit Mono-24")
+(progn
   (setq my-font "PxPlus IBM VGA 9x16-24")
+  (setq my-font "Commit Mono-24")
+  (setq my-font "Sudo-22")
   (setq my-font "Berkeley Mono-24")
   (set-frame-font my-font)
   (set-face-attribute 'font-lock-comment-face nil :slant 'italic))
 
-
 (setq-default line-spacing nil)
 
 (blink-cursor-mode 0)
@@ -112,6 +111,7 @@
 
 (use-package tramp
   :config
+  :defer
   (setq tramp-use-ssh-controlmaster-options nil))
 
 (require 'saveplace)
diff --git a/emacs/inits/04-input_method.el b/emacs/inits/04-input_method.el
deleted file mode 100644
index 0cdd9de..0000000
--- a/emacs/inits/04-input_method.el
+++ /dev/null
@@ -1,29 +0,0 @@
-;; Time-stamp: <2021-09-27 08h47 EDT (hobbies)>
-
-;;(use-package agda-input
-;;  :load-path "~/.emacs.d/scripts/"
-;;  :config
-;;  (dolist (sym '(("chimney" "╝")
-;;                 ("==>" "⟹")
-;;                 ("amalg" "⨿")
-;;                 ("bG" "𝔾")
-;;                 ("bB" "𝔹")
-;;                 ("bU" "𝕌")))
-;;    (add-to-list 'agda-input-user-translations sym))
-;;  (agda-input-setup))
-
-(setq-default default-input-method "TeX")
-
-(defvar use-default-input-method nil)
-
-(make-variable-buffer-local 'use-default-input-method)
-
-(defun activate-default-input-method ()
-  (interactive)
-  (if use-default-input-method
-      (activate-input-method default-input-method)
-    (inactivate-input-method)))
-
-;; (add-hook 'text-mode-hook #'activate-default-input-method)
-;; (add-hook 'mail-mode-hook #'activate-default-input-method)
-;; (add-hook 'isearch-mode-hook #'activate-default-input-method)
diff --git a/emacs/inits/11-completion.el b/emacs/inits/11-completion.el
index cc6f339..f9d0ed2 100644
--- a/emacs/inits/11-completion.el
+++ b/emacs/inits/11-completion.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-01-14 12h49 CET (anker)>
+;; Time-stamp: <2024-01-14 19h10 CET (068b8e3d)>
 
 (use-package savehist
   :ensure t
diff --git a/emacs/inits/15-project-mgmt.el b/emacs/inits/15-project-mgmt.el
index fcb1539..1136364 100644
--- a/emacs/inits/15-project-mgmt.el
+++ b/emacs/inits/15-project-mgmt.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-07-07 13h44 BST (0fb87241)>
+;; Time-stamp: <2024-07-13 15h01 CEST (471b3659)>
 
 (defun revert-all-file-buffers ()
   "Refresh all open file buffers without confirmation"
@@ -13,11 +13,4 @@
             (message "Killed non-existing/unreadable file bufffer: %s" filename))))))
   (message "Finished reverting buffers containing unmodified files."))
 
-(use-package project
-  :defer nil)
-
-(use-package magit
-  :ensure t
-  :bind (("C-x g" . magit-status))
-  :config
-  (setq magit-process-find-password-functions '(magit-process-password-auth-source)))
+(require 'project)
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 01d3c18..02f95ed 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-07-07 13h51 BST (0fb87241)>
+;; Time-stamp: <2024-07-13 15h00 CEST (471b3659)>
 
 ;; -----------------------------------------------------------------------------
 ;; General setup
@@ -21,18 +21,22 @@
   (align-regexp begin end "\\(\\s-*\\)=" 1 1 ))
 
 (use-package eglot
+  :defer
   :config
   (add-to-list 'eglot-server-programs
                '(bqn-mode . ("bqnlsp"))))
 
 (use-package centered-window
-  :ensure t)
+  :defer
+  :ensure)
 
 (use-package hideshow
+  :defer
   :bind (("C-c C-f C-f" . hs-toggle-hiding)))
 
 (use-package dtrt-indent
-  :ensure t
+  :ensure
+  :defer
   :config
   (dtrt-indent-global-mode t))
 
@@ -48,7 +52,7 @@
   (setq auto-hscroll-mode t)
   (when (not (eq major-mode 'python-mode))
     (keymap-set (current-local-map) "M-/" 'completion-at-point))
-  (yas-minor-mode-on))
+  )
 
 (add-hook 'prog-mode-hook #'programming-setup)
 
@@ -56,24 +60,20 @@
 ;; Specific packages
 
 (use-package comment-dwim-2
-  :ensure t
+  :ensure
+  :defer
   :bind (("M-;" . comment-dwim-2))
   :config (setq comment-multi-line t
                 comment-style 'extra-line))
 
 (use-package aggressive-indent
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :config
   (setq aggressive-indent-sit-for-time 1))
 
-(use-package yasnippet
-  :ensure t
-  :defer t
-  :commands yas-minor-mode-on)
-
 (use-package elec-pair
-  :defer t
+  :defer
   :config
   (setq electric-pair-delete-adjacent-pairs t
         electric-pair-skip-self 'electric-pair-default-skip-self
@@ -85,13 +85,13 @@
 ;; C
 
 (use-package clang-format
-  :ensure t
+  :ensure
   :defer
   :config
   (setq clang-format-style "file"))
 
 (use-package cc-mode
-  :defer t
+  :defer
   :bind (:map c-mode-map
               ("M-m" . lh-matching-delim))
   :hook ((c-mode c++-mode) . (lambda ()
@@ -189,7 +189,7 @@
 ;; Python
 
 (use-package python-black
-  :ensure t
+  :defer
   :after python
   :config
   (setq python-black-extra-args '("-l120"))
@@ -197,8 +197,8 @@
   )
 
 (use-package highlight-indent-guides
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :config
   (setq highlight-indent-guides-auto-odd-face-perc 3
         highlight-indent-guides-auto-even-face-perc 5))
@@ -215,12 +215,12 @@
 ;; Rust
 
 (use-package cargo
-  :ensure t
-  :defer t)
+  :ensure
+  :defer)
 
 (use-package rust-mode
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :bind (:map rust-mode-map
               ("M-," . lh-backward-delim)
               ("M-." . lh-forward-delim)
@@ -245,16 +245,9 @@
 ;; -------------------------------------------------------------------
 ;; Misc languages
 
-(add-to-list 'auto-mode-alist
-             '("\\.jinja\\'" . (lambda ()
-                                 (text-mode)
-                                 (auto-fill-mode -1)
-                                 (programming-setup))))
-
 (use-package json-mode
-  :ensure t
-  :defer t
-  :mode (("\\.json\\.jinja\\'" . json-mode))
+  :ensure
+  :defer
   :hook (json-mode . (lambda ()
                        (programming-setup)
                        (setq standard-indent 2)
@@ -266,7 +259,7 @@
 
 (use-package zig-mode
   :ensure t
-  :defer t
+  :defer
   :hook (zig-mode . (lambda () (eglot-ensure)))
   :init
   (defun my-zig-run ()
@@ -283,11 +276,11 @@
               ("C-c C-r" . my-zig-run)))
 
 (use-package uiua-ts-mode
-  :ensure t
+  :ensure
   :defer)
 
 (use-package bqn-mode
-  :ensure t
+  :ensure
   :defer
   :bind (:map bqn-mode-map
               ("M-TAB" . expand-abbrev)
diff --git a/emacs/inits/22-lisp.el b/emacs/inits/22-lisp.el
index fb1304e..186d18d 100644
--- a/emacs/inits/22-lisp.el
+++ b/emacs/inits/22-lisp.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2021-09-27 08h48 EDT (hobbies)>
+;; Time-stamp: <2023-12-01 20h44 CET (oranje)>
 
 ;; ----------------------------------------------------------------------------
 ;; Lisp helpers
diff --git a/emacs/inits/23-text-related.el b/emacs/inits/23-text-related.el
index 162c29f..79b4da7 100644
--- a/emacs/inits/23-text-related.el
+++ b/emacs/inits/23-text-related.el
@@ -1,10 +1,11 @@
-;; Time-stamp: <2024-07-08 10h18 CEST (anker)>
+;; Time-stamp: <2024-07-13 15h08 CEST (471b3659)>
 
 ;; -----------------------------------------------------------------------------
 ;; Spelling
 
 (use-package spell-fu
-  :ensure t
+  :ensure
+  :defer
   :config
   (setq ispell-dictionary "en_GB-ise-w_accents"
         ispell-personal-dictionary "~/.aspell.en.pws")
@@ -27,14 +28,14 @@
                             (siege-mode 1)
                             (spell-fu-mode 1)))
 
-(use-package dictionary :ensure t :defer t)
+(use-package dictionary :ensure :defer)
 
 ;; -----------------------------------------------------------------------------
 ;; Markdown
 
 (use-package markdown-mode
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :hook (markdown-mode . (lambda ()
                            (auto-fill-mode -1)
                            (visual-line-mode))))
@@ -43,7 +44,7 @@
 ;; Org
 
 (use-package org
-  :defer t
+  :defer
   :bind (:map org-mode-map
               ("M-h" . nil))
   ;; :hook (org-mode . (lambda ()
diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el
index 4b9e908..6c2b617 100644
--- a/emacs/inits/24-latex.el
+++ b/emacs/inits/24-latex.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-05-27 20h16 CEST (83a9252e)>
+;; Time-stamp: <2024-06-22 12h27 CEST (ed9189e9)>
 
 (defvar latex-template-dir (expand-file-name "~/typeset/latex-templates"))
 (defun prompt-latex-file-template ()
@@ -126,6 +126,7 @@ populated from the directory *latex-template-dir*"
   ;; (add-hook 'TeX-after-compilation-finished-functions #'TeX-revert-document-buffer)
   )
 
+;; TODO investigate tex-parens
 
 (use-package cdlatex
   :ensure t
diff --git a/emacs/inits/25-theorems.el b/emacs/inits/25-theorems.el
index fda7ed5..51426b3 100644
--- a/emacs/inits/25-theorems.el
+++ b/emacs/inits/25-theorems.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-02-19 18h48 CET (anker)>
+;; Time-stamp: <2024-07-13 15h02 CEST (471b3659)>
 
 ;; -----------------------------------------------------------------------------
 ;; Coq
@@ -111,8 +111,8 @@
   )
 
 (use-package proof-general
-  :ensure t
-  :defer t
+  :ensure
+  :defer
   :functions coq-local-environment
   :init (setq proof-splash-enable nil
               proof-follow-mode 'followdown)
@@ -132,19 +132,19 @@
 ;; -----------------------------------------------------------------------------
 ;; Agda
 
-(load-file (let ((coding-system-for-read 'utf-8))
-             (shell-command-to-string "agda-mode locate")))
+;; (load-file (let ((coding-system-for-read 'utf-8))
+;;              (shell-command-to-string "agda-mode locate")))
 
-(add-hook 'agda2-mode
-          (lambda ()
-            (subword-mode 1)
-            (auto-fill-mode)
-            (aggressive-indent-mode -1)))
+;; (add-hook 'agda2-mode
+;;           (lambda ()
+;;             (subword-mode 1)
+;;             (auto-fill-mode)
+;;             (aggressive-indent-mode -1)))
 
 ;; -----------------------------------------------------------------------------
 ;; Lean
 
-(use-package lean4-mode
-  :load-path "~/.emacs.d/lean4-mode"
-  :defer t
-  :mode ("\\.lean$" . lean4-mode))
+;; (use-package lean-mode
+;;   :ensure t
+;;   :defer t
+;;   :mode ("\\.lean$" . lean-mode))
diff --git a/emacs/inits/27-gemini.el b/emacs/inits/27-gemini.el
index 7a2a1ae..85b8851 100644
--- a/emacs/inits/27-gemini.el
+++ b/emacs/inits/27-gemini.el
@@ -1,13 +1,13 @@
-;; Time-stamp: <2024-05-27 20h18 CEST (83a9252e)>
+;; Time-stamp: <2024-07-13 15h03 CEST (471b3659)>
 
 (use-package elpher
-  :ensure t
-  :demand
+  :ensure
+  :defer
   :config
   (setq elpher-default-url-type "gemini"))
 
 (use-package visual-fill-column
-  :ensure t
+  :ensure
   :defer)
 
 (defvar gemlog-directory (expand-file-name "~/hobbies/l-3.space/"))
@@ -54,8 +54,8 @@
       (insert symb " "))))
 
 (use-package gemini-mode
-  :ensure t
-  :demand
+  :ensure
+  :defer
   :bind (:map gemini-mode-map
               ("C-c C-f" . gemini-insert-footnote))
   :hook (gemini-mode . (lambda ()
diff --git a/emacs/inits/70-global-keybinds.el b/emacs/inits/70-global-keybinds.el
index 045e62f..866cdd2 100644
--- a/emacs/inits/70-global-keybinds.el
+++ b/emacs/inits/70-global-keybinds.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-07-08 10h27 CEST (anker)>
+;; Time-stamp: <2024-07-13 15h08 CEST (471b3659)>
 
 (setq time-stamp-active t
       time-stamp-line-limit 3
@@ -26,7 +26,8 @@
 (global-set-key (kbd "C-z") 'nil)
 
 (use-package eterm-256color
-  :ensure t
+  :ensure
+  :defer
   :config
   (add-hook 'term-mode-hook #'eterm-256color-mode)
   (global-set-key (kbd "C-c c") 'ansi-term))
@@ -46,7 +47,7 @@
   (if (region-active-p) (kill-region 0 0 t)
     (backward-kill-word arg)))
 
-(global-set-key (kdb "M-h") 'better-backward-kill-word)
+(global-set-key (kbd "M-h") 'better-backward-kill-word)
 (global-set-key (kbd "M-<Backspace>") 'better-backward-kill-word)
 
 ;; -----------------------------------------------------------------------------
diff --git a/emacs/inits/99-last.el b/emacs/inits/99-last.el
index 1bcec66..9f62f15 100644
--- a/emacs/inits/99-last.el
+++ b/emacs/inits/99-last.el
@@ -1,8 +1,8 @@
-;; Time-stamp: <2020-08-12 22:05:48 (user@hobbies)>
+;; Time-stamp: <2024-03-18 09h51 CET (0c109a04)>
 
 (add-hook 'after-init-hook
           (lambda ()
-            (run-with-idle-timer 20 nil (lambda () (setq gc-cons-threshold 80000000)))))
+            (run-with-idle-timer 20 nil (lambda () (setq gc-cons-threshold 40000000)))))
 
 (setq read-process-output-max (* 1024 1024))
 (setq file-name-handler-alist old-file-name-handler-alist)
diff --git a/emacs/inits/30-irc.el b/emacs/inits/NO-30-irc.el
index 7e20970..7e20970 100644
--- a/emacs/inits/30-irc.el
+++ b/emacs/inits/NO-30-irc.el