From 8f7f5a5cce28ee9027ba8d6133ec2f96214acf87 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 4 Jan 2020 00:14:19 -0500
Subject: [PATCH] Expand & refactor editor/emacs module

---
 modules/dev/rust.nix      |  1 -
 modules/editors/emacs.nix | 29 +++++++++++++++++++++--------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/modules/dev/rust.nix b/modules/dev/rust.nix
index 7b37ba0b..f7013b63 100644
--- a/modules/dev/rust.nix
+++ b/modules/dev/rust.nix
@@ -3,7 +3,6 @@
 {
   environment.systemPackages = with pkgs; [
     rustup
-    rls
   ];
 
   home.xdg.configFile = {
diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 97b60c3e..587263b2 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -1,21 +1,34 @@
-{ config, lib, pkgs, ... }:
+# Emacs is my main driver. I'm the author of Doom Emacs
+# <https://github.com/hlissner/doom-emacs>. This module sets it up to meed my
+# particular Doomy needs.
 
+{ config, lib, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    (lib.mkIf (config.programs.gnupg.agent.enable) pinentry_emacs)
-
-    zstd
-    editorconfig-core-c
-    (ripgrep.override {withPCRE2 = true;})
-    # Doom Emacs + dependencies
+    # Doom dependencies
     emacs
+    git
+    (ripgrep.override {withPCRE2 = true;})
+    # Optional dependencies
+    editorconfig-core-c # per-project style config
+    fd                  # faster projectile indexing
+    imagemagick         # for image-dired
+    gnutls              # for TLS connectivity
+    (lib.mkIf (config.programs.gnupg.agent.enable)
+      pinentry_emacs)   # in-emacs gnupg prompts
+    zstd                # for undo-tree compression
+    ffmpeg              # for screen recording emacs
+    # Module dependencies
     sqlite                          # :tools (lookup +docsets)
     texlive.combined.scheme-medium  # :lang org -- for latex previews
     ccls                            # :lang (cc +lsp)
     nodePackages.javascript-typescript-langserver # :lang (javascript +lsp)
+    rls                             # :lang (rust +lsp)
   ];
 
-  fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
+  fonts.fonts = [
+    pkgs.emacs-all-the-icons-fonts
+  ];
 
   home.xdg.configFile = {
     "zsh/rc.d/aliases.emacs.zsh".source = <config/emacs/aliases.zsh>;