2 files changed, 14 insertions, 2 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index d6e91447..545d40b5 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -23,7 +23,7 @@ in {
           evil evil-dvorak evil-magit undo-tree magit haskell-mode
           nix-mode yaml-mode json-mode shakespeare-mode
           smart-mode-line highlight-parentheses highlight-symbol
-          notmuch ag sass-mode lua-mode
+          notmuch ag sass-mode lua-mode fira-code-mode
         ];
       };
       firefox = {
@@ -161,7 +161,7 @@ in {
         google-play-music-desktop-player qt5ct playerctl evince
         thunderbird zulip zoom-us steam steam-run wireshark skype
         virt-manager rclone cached-nix-shell xournal discord xmonad
-        worktime
+        worktime fira-code-symbols
       ];
 
       file = {
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index ce97c81b..92a79910 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -6,9 +6,11 @@
 
 (require 'evil)
 (evil-mode 1)
+(setq evil-undo-system 'undo-tree)
 
 (global-subword-mode)
 (global-undo-tree-mode)
+(global-fira-code-mode)
 
 (global-set-key (kbd "RET") 'newline-and-indent)
 (global-set-key (kbd "M-g") 'magit-status)
@@ -20,6 +22,14 @@
       kept-old-versions 2
       version-control t)
 
+(setq undo-tree-visualizer-timestamps t
+      undo-tree-visualizer-diff t
+      ;; 10X bump of the undo limits to avoid issues with premature
+      ;; Emacs GC which truncages the undo history very aggresively
+      undo-limit 800000
+      undo-strong-limit 12000000
+      undo-outer-limit 120000000)
+
 (add-hook 'haskell-mode-hook 'haskell-indentation-mode)
 (add-hook 'haskell-mode-hook 'subword-mode)
 (add-hook 'haskell-mode-hook 'highlight-symbol-mode)
@@ -33,6 +43,8 @@
   )
 (add-hook 'js-mode-hook 'my-js-mode-hook)
 
+(setq undo-tree-auto-save-history t)
+
 (setq notmuch-address-internal-completion '(received nil))
 (setq notmuch-always-prompt-for-sender t)
 (setq notmuch-command "notmuch-ssh")