about summary refs log tree commit diff
path: root/modules/emacs/default.nix
diff options
context:
space:
mode:
authorazahi <azat@bahawi.net>2024-10-21 14:22:29 +0300
committerazahi <azat@bahawi.net>2024-10-21 14:22:29 +0300
commit5c92aab0c7dde0729484f8878a8ebf05e5fc79ab (patch)
treeb76a1ce5c577d28d4a69738d3213fcf1ee0e3394 /modules/emacs/default.nix
parent2024-10-17 (diff)
2024-10-21
Diffstat (limited to '')
-rw-r--r--modules/emacs/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index a182d4c..455f710 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -61,11 +61,11 @@ in
                 if [[ -x "$EMACSDIR/bin/doom" ]]; then
                   if [[ ! -d "$EMACSDIR/.local" ]]; then
                     PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" \
-                      "$EMACSDIR/bin/doom" install --force --verbose
+                      "$EMACSDIR/bin/doom" install --aot --force --verbose
                   fi
 
                   PATH="''${PATH:-/bin:}:${emacs.package}/bin:${git.package}/bin" \
-                    "$EMACSDIR/bin/doom" sync -e --gc --force --verbose
+                    "$EMACSDIR/bin/doom" sync -e --gc --aot --force --verbose
                 fi
               '';
             }
@@ -166,17 +166,24 @@ in
                     (setq exec-path (append exec-path '(${concatMapStringsSep " " (x: ''"${x}/bin"'') extraBins})))
                     (setenv "PATH" (concat (getenv "PATH") ":${concatMapStringsSep ":" (x: "${x}/bin") extraBins}"))
 
+                    (appendq! auth-sources '(("${config.secrets.authinfo.path}")))
+
                     ;; HACK Explicitly load specific Emacs packages from Nixpkgs.
                     ;; For some reason providing them as "extraPackages" doesn't
                     ;; work.
                     (add-to-list 'load-path "${pkgs.mu.mu4e}/share/emacs/site-lisp/mu4e")
                     (add-to-list 'load-path "${pkgs.emacsPackages.vterm}/share/emacs/site-lisp/elpa/vterm-${pkgs.emacsPackages.vterm.version}")
-
-                    (appendq! auth-sources '(("${config.secrets.authinfo.path}")))
+                    (load "${
+                      pkgs.fetchurl {
+                        name = "tvl.el";
+                        url = "https://code.tvl.fyi/plain/tools/emacs-pkgs/tvl/tvl.el?id=84a82f6f41b422f7f76e44e3705ee509b6c6eaf6";
+                        hash = "sha256-vJsV7w4aMV9Y9zbXLHMIR53xAsXdUVBIXrxUTjdvty0=";
+                      }
+                    }")
 
                     ;; :input japanese
                     (setq migemo-dictionary "${pkgs.cmigemo}/share/migemo/utf-8/migemo-dict"
-                          skk-large-jisyo "${pkgs.skk-dicts}/share/SKK-JISYO.L")
+                          skk-large-jisyo "${pkgs.skkDictionaries.l}/share/skk/SKK-JISYO.L")
 
                     ;; :editor parinfer
                     (setq parinfer-rust-library "${pkgs.parinfer-rust-emacs}/lib/libparinfer_rust.so")

Consider giving Nix/NixOS a try! <3