[emacs] minor tweaks, move things to ~/.config

4 files changed, 24 insertions, 21 deletions

diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 5c3d584..5a6222b 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2025-01-21 14h49 GMT (27b328bd)>
+;; Time-stamp: <2025-06-06 12h05 BST (262d71f0)>
 
 ;; -----------------------------------------------------------------------------
 ;; Interface
@@ -35,9 +35,9 @@
 
 (if (display-graphic-p)
     (progn
-      (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
-      ;; (load-theme 'acme t)
-      (load-theme 'challenger-deep t)
+      (add-to-list 'custom-theme-load-path "~/.config/emacs/themes/")
+      (load-theme 'acme t)
+      ;; (load-theme 'challenger-deep t)
 
       (defun my-disable-bold-fonts ()
         (interactive)
@@ -47,12 +47,16 @@
          (face-list)))
 
       (progn
-        (setq my-font "PxPlus IBM VGA 9x16-24")
+        (setq my-font "Sudo-26")
+        (setq my-font "PxPlus IBM VGA 9x16-26")
         (setq my-font "Commit Mono-24")
-        (setq my-font "Sudo-22")
         (setq my-font "Berkeley Mono-24")
+        (setq my-font "Monaspace Krypton-26")
+        (setq my-font "BQN386 Unicode DZ-24")
+        ;; (setq line-spacing 4)
         (set-frame-font my-font)
-        (set-face-attribute 'font-lock-comment-face nil :slant 'italic)))
+        (set-face-attribute 'font-lock-comment-face nil :slant 'italic))
+      )
   (load-theme 'challenger-deep t))
 
 (setq-default line-spacing nil)
@@ -97,7 +101,8 @@
 
 (setq enable-dir-local-variables nil)
 
-(setq shell-file-name "bash")
+;; (setq shell-file-name "/usr/bin/bash"
+;;       explicit-shell-file-name "/usr/bin/bash")
 
 ;; -----------------------------------------------------------------------------
 ;; Basic packages
@@ -116,9 +121,9 @@
   :defer
   :config
   (setq tramp-use-ssh-controlmaster-options nil)
+  (setq tramp-ssh-controlmaster-options "-o ControlMaster=no -tt")
   (add-to-list 'tramp-connection-properties
-               (list "/ssh:.*-vm:" "remote-shell" "/usr/bin/dash"))
-  )
+               (list "/ssh:.*-vm:" "remote-shell" "/usr/bin/dash")))
 
 (require 'saveplace)
 (save-place-mode)
diff --git a/emacs/inits/03-miscload.el b/emacs/inits/03-miscload.el
index 64e3ab3..69ceb7f 100644
--- a/emacs/inits/03-miscload.el
+++ b/emacs/inits/03-miscload.el
@@ -1,10 +1,10 @@
 ;; Time-stamp: <2023-12-31 17h36 CET (436eb713)>
 
 (use-package siege-mode
-  :load-path "~/.emacs.d/scripts/siege-mode/")
+  :load-path "~/.config/emacs/scripts/siege-mode/")
 
 (use-package copilot
-  :load-path "~/.emacs.d/scripts/")
+  :load-path "~/.config/emacs/scripts/")
 
 ;; (use-package maxima
 ;;   :defer t
diff --git a/emacs/inits/22-lisp.el b/emacs/inits/22-lisp.el
index 186d18d..dcbff69 100644
--- a/emacs/inits/22-lisp.el
+++ b/emacs/inits/22-lisp.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2023-12-01 20h44 CET (oranje)>
+;; Time-stamp: <2025-03-25 20h09 GMT (3238da39)>
 
 ;; ----------------------------------------------------------------------------
 ;; Lisp helpers
@@ -59,6 +59,7 @@
   (interactive)
   (avy-goto-char ?\) ))
 
+;; TODO: this doesn't work anymore?
 (use-package corral :ensure t)
 (defun make-lisp-bindings ()
   (let ((map (eval (read (format "%s-map" major-mode)))))
@@ -103,10 +104,7 @@
             (make-lisp-bindings)))
 
 (use-package caps-lock-mode
-  :load-path "~/.emacs.d/scripts/")
-
-;; (use-package slime-company
-;;   :ensure t :defer t)
+  :load-path "~/.config/emacs/scripts/")
 
 (use-package slime
   :ensure t
@@ -120,7 +118,6 @@
                                        slime-asdf
                                        slime-banner
                                        slime-scratch
-                                       ;; slime-company
                                        slime-autodoc))
                         (slime-mode)
                         (require 'caps-lock-mode)
diff --git a/emacs/inits/24-latex.el b/emacs/inits/24-latex.el
index 6c2b617..4f53e9f 100644
--- a/emacs/inits/24-latex.el
+++ b/emacs/inits/24-latex.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2024-06-22 12h27 CEST (ed9189e9)>
+;; Time-stamp: <2025-02-27 12h19 GMT (b2a2dfad)>
 
 (defvar latex-template-dir (expand-file-name "~/typeset/latex-templates"))
 (defun prompt-latex-file-template ()
@@ -20,9 +20,10 @@ populated from the directory *latex-template-dir*"
         (save-buffer)))))
 
 (use-package cdm-mode
-  :load-path "~/.emacs.d/scripts/")
+  :load-path "~/.config/emacs/scripts/")
 
-(use-package unfill :ensure t)
+;; TODO: this doesn't work anymore?
+;; (use-package unfill :ensure t)
 
 (use-package latex
   :ensure auctex