about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-11-25T17·54-0800
committerwpcarro <wpcarro@gmail.com>2022-11-25T18·44+0000
commitf5391efa17bc024e33f36532611cb13b16fa9a4f (patch)
treead8a41efd2b5f95efb916f4659b5a67c760d2937
parentbbad770cf2e569795715c9ec3c144812f126d870 (diff)
chore(wpcarro/emacs): Sort emacs dependencies r/5322
Also delete `add-node-modules-path`. I'll likely prune more of these
dependencies when I take a closer look at my `wpc-*.el` language config stuff.

Change-Id: I47053dbca03bcfb94e07dbf4cc1df4f91d2d4c37
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7409
Reviewed-by: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
-rw-r--r--users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el5
-rw-r--r--users/wpcarro/emacs/default.nix118
2 files changed, 56 insertions, 67 deletions
diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el
index 7c1816c561e6..9e137ad8803e 100644
--- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el
+++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-javascript.el
@@ -42,11 +42,6 @@
       js-indent-level 2
       css-indent-offset 2)
 
-;; Flow for Javascript
-(use-package add-node-modules-path
-  :config
-  (general-add-hook wpc-javascript--js-hooks #'add-node-modules-path))
-
 (use-package web-mode
   :mode "\\.html\\'"
   :config
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix
index c83934d6f063..145d267c22a7 100644
--- a/users/wpcarro/emacs/default.nix
+++ b/users/wpcarro/emacs/default.nix
@@ -67,91 +67,85 @@ let
     ]) ++
 
     (with epkgs.melpaPackages; [
+      alert
+      all-the-icons
+      all-the-icons-ivy
       avy
-      org-bullets
-      sly
-      notmuch
-      elm-mode
-      ts
-      vterm
       base16-theme
-      password-store
+      cider
+      clojure-mode
+      company
+      counsel
+      counsel-projectile
       csharp-mode
+      dap-mode
+      dash
+      deadgrep
+      deferred
+      diminish
+      direnv
       dockerfile-mode
+      doom-themes
+      eglot
+      elisp-slime-nav
+      elixir-mode
+      elm-mode
+      emojify
+      engine-mode
       evil
       evil-collection
       evil-commentary
       evil-surround
-      key-chord
-      # TODO(wpcarro): Assess whether or not I need this with Nix.
-      add-node-modules-path
-      web-mode
-      rjsx-mode
-      tide
-      prettier-js
+      f
+      fish-mode
       flycheck
-      diminish
-      doom-themes
-      telephone-line
-      which-key
-      all-the-icons
-      all-the-icons-ivy
+      flymake-shellcheck
+      general
+      go-mode
+      haskell-mode
+      helpful
       ivy
       ivy-clipmenu
       ivy-pass
       ivy-prescient
-      restclient
-      package-lint
-      parsec
+      key-chord
+      lispyville
+      lsp-ui
+      magit
       magit-popup
-      direnv
-      alert
+      markdown-mode
       nix-mode
-      rust-mode
-      rainbow-delimiters
-      racket-mode
-      lispyville
-      elisp-slime-nav
+      notmuch
+      org-bullets
+      package-lint
+      paradox
+      parsec
+      password-store
+      pcre2el
+      prettier-js
+      projectile
       py-yapf
+      racket-mode
+      rainbow-delimiters
       reason-mode
-      terraform-mode
-      elixir-mode
-      go-mode
-      company
-      markdown-mode
       refine
-      deferred
-      magit
       request
-      pcre2el
-      helpful
-      yasnippet
-      projectile
-      deadgrep
-      counsel
-      counsel-projectile
-      # TODO(wpcarro): Learn what this is.
-      engine-mode
-      eglot
-      dap-mode
-      lsp-ui
+      restclient
+      rjsx-mode
+      rust-mode
+      sly
       suggest
-      paradox
-      flymake-shellcheck
-      fish-mode
+      telephone-line
+      terraform-mode
+      tide
+      ts
       tuareg
-      haskell-mode
       use-package
-      general
-      clojure-mode
-      cider
-      f
-      dash
-      company
-      counsel
-      flycheck
-      emojify
+      vterm
+      web-mode
+      which-key
       yaml-mode
+      yasnippet
     ]));
 
   loadPath = concatStringsSep ":" [