ws/emacs: Debugging themes and ergoemacs

2 files changed, 15 insertions, 7 deletions

diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index 828caa940bb..706284f5fcf 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -8,8 +8,8 @@ let
           cp ${./init.el} $out/share/emacs/site-lisp/default.el
         '')
 
-      # Custom patched mode
-      pkgs.emacs-ergoemacs-mode
+      # TODO: Add custom patched mode
+      ergoemacs-mode
 
       # Language support
       fish-mode
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index 69e43d5445e..083edcb5d8e 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -19,13 +19,19 @@
 (setq inhibit-startup-message 1) 
 (setq initial-scratch-message nil)
 
-;; Swap/Backup files are annoying AF
-(setq make-backup-files nil)
-(setq auto-save-default nil)
+(autoload 'notmuch "notmuch" "notmuch mail" t)
+(setq notmuch-search-oldest-first nil)
+
+;; Change the swap/autosave directory
+(let ((backup-dir (concat user-emacs-directory "backups")))
+  (make-directory backup-dir t)
+  (setq backup-directory-alist (list (cons "." backup-dir)))
+  (setq message-auto-save-directory backup-dir))
 
 ;; Some editing niceties
 (delete-selection-mode 1)
 (show-paren-mode 1)
+(setq-default truncate-lines t)
 
 ;; Explicitly enable lsp-mode for certain languages
 (add-hook 'rust-mode-hook #'lsp)
@@ -52,8 +58,10 @@
 (setq ergoemacs-keyboard-layout "us")
 (ergoemacs-mode 1)
 
-;; VTerm integration
-(require 'vterm)
+;; Better jumping behaviour - bound to major mode changes
+(add-hook 'after-change-major-mode
+          #'((local-unset-key (kbd "C-M-i"))
+             (local-set-key (kbd "C-M-i") 'backward-paragraph)))
 
 ;; Distraction free mode and minimap
 (require 'sublimity)