From 0e56b0e14a5e350b137b320d78dda74b3f6a63f3 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 26 Sep 2021 16:38:15 -0400
Subject: [PATCH] feat: clean up doom emacs configuration

---
 users/infinidoge/default.nix     | 18 ----------------
 users/profiles/emacs/default.nix | 36 ++++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 746557d..ef9bc68 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -48,24 +48,6 @@
     gnome3.adwaita-icon-theme
     adwaita-qt
     lxappearance
-
-    emacs
-    ripgrep
-    coreutils
-    cmake
-    fd
-    fzf
-    clang
-    mu
-    isync
-    tetex
-    jq
-    gnumake
-    shellcheck
-    nodejs
-    nodePackages.prettier
-
-    (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
   ];
 
   environment.shellAliases.ssh = "kitty +kitten ssh";
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix
index 16eddc7..4e52440 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs/default.nix
@@ -1,9 +1,33 @@
 { config, pkgs, ... }: {
-  services.emacs = {
-    enable = true;
-  };
+  services.emacs.enable = true;
 
-  home.sessionPath = [
-    "${config.xdg.configHome}/emacs/bin"
-  ];
+  home = {
+    sessionPath = [
+      "${config.xdg.configHome}/emacs/bin"
+    ];
+
+    sessionVariables = {
+      DOOMDIR = "/etc/nixos/users/profiles/emacs/doom/";
+    };
+
+    packages = with pkgs; [
+      emacs
+      ripgrep
+      coreutils
+      cmake
+      fd
+      fzf
+      clang
+      mu
+      isync
+      tetex
+      jq
+      gnumake
+      shellcheck
+      nodejs
+      nodePackages.prettier
+
+      (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
+    ];
+  };
 }