diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/conf/init.el | 6 | ||||
| -rw-r--r-- | gui/emacs.nix | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gui/conf/init.el b/gui/conf/init.el index b516ceb..4187f92 100644 --- a/gui/conf/init.el +++ b/gui/conf/init.el @@ -107,7 +107,7 @@ :after evil :ensure t :config - (setq evil-collection-mode-list '(dired eshell eww pdf)) + (setq evil-collection-mode-list '(dired eshell eww pdf magit)) (evil-collection-init)) (use-package which-key @@ -319,6 +319,7 @@ ("l" org-toggle-link-display "Toggle links" :column "View") ("s" org-time-stamp-inactive "Timestamp (inactive)" :column "Fragments") + ("S" org-time-stamp "Timestamp (active)" :column "Fragments") ("h" org-html-export-to-html "HTML export" :column "Export") @@ -447,9 +448,6 @@ :config (evil-leader/set-key "pg" 'magit)) -(use-package evil-magit - :ensure t) - (use-package projectile :ensure t :config diff --git a/gui/emacs.nix b/gui/emacs.nix index 2e7fc14..2c253f1 100644 --- a/gui/emacs.nix +++ b/gui/emacs.nix @@ -52,6 +52,7 @@ in { package = pkgs-unstable.emacsWithPackagesFromUsePackage { config = ./conf/init.el; + alwaysEnsure = false; # remove builtin org as in https://github.com/chrisbarrett/.emacs.d/blob/6efd82c8e328e677dbef84331ed54763b89667a3/default.nix # this is a workaround until I find a better way to force usage of a non-builtin up-to-date org version package = pkgs-unstable.emacsGcc.overrideAttrs (old: { |