diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/emacs/default.nix | 17 | ||||
| -rw-r--r-- | modules/emacs/doom/config.el | 8 | ||||
| -rw-r--r-- | modules/emacs/doom/init.el | 21 | ||||
| -rw-r--r-- | modules/emacs/doom/packages.el | 10 |
4 files changed, 36 insertions, 20 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") diff --git a/modules/emacs/doom/config.el b/modules/emacs/doom/config.el index fe3b5b4..85fe4a9 100644 --- a/modules/emacs/doom/config.el +++ b/modules/emacs/doom/config.el @@ -33,12 +33,6 @@ doom-modeline-height 30) ;; -;;; TVL -;; - -(use-package! tvl) - -;; ;;; Editorconfig ;; @@ -87,7 +81,7 @@ ;;; Org ;; -(setq org-directory "~/doc/org/") +(setq! org-directory "~/doc/org/") ;; For some reason only using `after!' work here. `setq-hook!' and etc doesn't ;; produce expected results. diff --git a/modules/emacs/doom/init.el b/modules/emacs/doom/init.el index b031880..8575c3f 100644 --- a/modules/emacs/doom/init.el +++ b/modules/emacs/doom/init.el @@ -2,10 +2,12 @@ japanese :completion - company + ;; company + (corfu +icons +orderless +dabbrev) vertico :ui + deft doom (emoji +unicode) hl-todo @@ -23,14 +25,19 @@ (evil +everywhere) file-templates fold - format + (format +onsave) + lispy + ;; multiple-cursors + ;; objed parinfer + ;; rotate-text snippets word-wrap :emacs dired electric + eww ibuffer undo vc @@ -41,7 +48,7 @@ :checkers syntax - (spell +aspell +everywhere) + (spell +everywhere +icons) grammar :tools @@ -57,12 +64,12 @@ make (pass +auth) pdf + prodigy (terraform +lsp) tree-sitter upload :os - (:if (featurep :system 'macos) macos) tty :lang @@ -70,6 +77,7 @@ data emacs-lisp (go +lsp +tree-sitter) + (graphql +lsp +tree-sitter) (haskell +lsp +tree-sitter) javascript (json +lsp +tree-sitter) @@ -78,8 +86,12 @@ (nix +lsp +tree-sitter) (org +pandoc +roam2) plantuml + graphviz (python +poetry +pyright +lsp +tree-sitter) + ;; (racket +lsp +tree-sitter +xp +hash-lang) + rest (rust +lsp +tree-sitter) + ;; (scheme +chicken +guile +racket) (sh +lsp +tree-sitter) web (yaml +lsp +tree-sitter) @@ -89,6 +101,7 @@ :app calendar + emms irc (rss +org) diff --git a/modules/emacs/doom/packages.el b/modules/emacs/doom/packages.el index 0f908df..fb521bc 100644 --- a/modules/emacs/doom/packages.el +++ b/modules/emacs/doom/packages.el @@ -2,6 +2,8 @@ (unpin! (:editor parinfer)) +(unpin! evil-collection) + (package! xclip) (package! org-roam-ui) @@ -19,7 +21,7 @@ :recipe (:host gitlab :repo "emacs-ansible/emacs-ansible")) -(package! tvl - :recipe (:host nil - :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git" - :build nil)) +;; (package! tvl +;; :recipe (:host nil +;; :repo "https://code.tvl.fyi/depot.git:/tools/emacs-pkgs/tvl.git" +;; :build nil)) |