summaryrefslogtreecommitdiff
path: root/accounts
diff options
context:
space:
mode:
Diffstat (limited to 'accounts')
-rw-r--r--accounts/gkleen@sif/default.nix4
-rw-r--r--accounts/gkleen@sif/emacs.el12
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 {
23 evil evil-dvorak evil-magit undo-tree magit haskell-mode 23 evil evil-dvorak evil-magit undo-tree magit haskell-mode
24 nix-mode yaml-mode json-mode shakespeare-mode 24 nix-mode yaml-mode json-mode shakespeare-mode
25 smart-mode-line highlight-parentheses highlight-symbol 25 smart-mode-line highlight-parentheses highlight-symbol
26 notmuch ag sass-mode lua-mode 26 notmuch ag sass-mode lua-mode fira-code-mode
27 ]; 27 ];
28 }; 28 };
29 firefox = { 29 firefox = {
@@ -161,7 +161,7 @@ in {
161 google-play-music-desktop-player qt5ct playerctl evince 161 google-play-music-desktop-player qt5ct playerctl evince
162 thunderbird zulip zoom-us steam steam-run wireshark skype 162 thunderbird zulip zoom-us steam steam-run wireshark skype
163 virt-manager rclone cached-nix-shell xournal discord xmonad 163 virt-manager rclone cached-nix-shell xournal discord xmonad
164 worktime 164 worktime fira-code-symbols
165 ]; 165 ];
166 166
167 file = { 167 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 @@
6 6
7(require 'evil) 7(require 'evil)
8(evil-mode 1) 8(evil-mode 1)
9(setq evil-undo-system 'undo-tree)
9 10
10(global-subword-mode) 11(global-subword-mode)
11(global-undo-tree-mode) 12(global-undo-tree-mode)
13(global-fira-code-mode)
12 14
13(global-set-key (kbd "RET") 'newline-and-indent) 15(global-set-key (kbd "RET") 'newline-and-indent)
14(global-set-key (kbd "M-g") 'magit-status) 16(global-set-key (kbd "M-g") 'magit-status)
@@ -20,6 +22,14 @@
20 kept-old-versions 2 22 kept-old-versions 2
21 version-control t) 23 version-control t)
22 24
25(setq undo-tree-visualizer-timestamps t
26 undo-tree-visualizer-diff t
27 ;; 10X bump of the undo limits to avoid issues with premature
28 ;; Emacs GC which truncages the undo history very aggresively
29 undo-limit 800000
30 undo-strong-limit 12000000
31 undo-outer-limit 120000000)
32
23(add-hook 'haskell-mode-hook 'haskell-indentation-mode) 33(add-hook 'haskell-mode-hook 'haskell-indentation-mode)
24(add-hook 'haskell-mode-hook 'subword-mode) 34(add-hook 'haskell-mode-hook 'subword-mode)
25(add-hook 'haskell-mode-hook 'highlight-symbol-mode) 35(add-hook 'haskell-mode-hook 'highlight-symbol-mode)
@@ -33,6 +43,8 @@
33 ) 43 )
34(add-hook 'js-mode-hook 'my-js-mode-hook) 44(add-hook 'js-mode-hook 'my-js-mode-hook)
35 45
46(setq undo-tree-auto-save-history t)
47
36(setq notmuch-address-internal-completion '(received nil)) 48(setq notmuch-address-internal-completion '(received nil))
37(setq notmuch-always-prompt-for-sender t) 49(setq notmuch-always-prompt-for-sender t)
38(setq notmuch-command "notmuch-ssh") 50(setq notmuch-command "notmuch-ssh")