From f7463ef611354a568dfb00de98fbea88be78e41b Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <acicchetti@jellyfish.co>
Date: Fri, 19 May 2023 10:59:29 -0400
Subject: [PATCH] yeet doom-emacs-nix, doesn't seem to work

---
 nix/home-manager/flake.lock                   |  6 +++---
 nix/home-manager/modules/packages/default.nix |  7 ++++++-
 nix/home-manager/modules/packages/emacs.nix   | 11 +++--------
 nix/setup.sh                                  |  3 +++
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock
index a1850ae..837f4f3 100644
--- a/nix/home-manager/flake.lock
+++ b/nix/home-manager/flake.lock
@@ -279,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684442239,
-        "narHash": "sha256-8wD+fQpNULCF9a88E1Knw3MtXWqvyhn8u/859QSSoE4=",
+        "lastModified": 1684484967,
+        "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c10403a5739d6275334710903fe709bc8d587980",
+        "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715",
         "type": "github"
       },
       "original": {
diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix
index d80fcc7..9b3f547 100644
--- a/nix/home-manager/modules/packages/default.nix
+++ b/nix/home-manager/modules/packages/default.nix
@@ -5,7 +5,12 @@
   system,
   ...
 }: {
-  imports = [./emacs.nix ./git.nix ./starship.nix ./zellij.nix];
+  imports = [
+    ./emacs.nix
+    ./git.nix
+    ./starship.nix
+    ./zellij.nix
+  ];
   home.packages = with pkgs; [
     bandwhich
     bat
diff --git a/nix/home-manager/modules/packages/emacs.nix b/nix/home-manager/modules/packages/emacs.nix
index d470151..837b935 100644
--- a/nix/home-manager/modules/packages/emacs.nix
+++ b/nix/home-manager/modules/packages/emacs.nix
@@ -5,12 +5,7 @@
   system,
   ...
 }: {
-  programs.doom-emacs = {
-    enable = true;
-    doomPrivateDir = ../../../../emacs/emacs.doom;
-    # emacsPackage = pkgs.emacs;
-    # if "${system}" == "aarch64-darwin"
-    #then pkgs.emacsMacPort
-    #else pkgs.emacs;
-  };
+  home.file.".doom.d/init.el".source = ../../../../emacs/emacs.doom/init.el;
+  home.file.".doom.d/config.el".source = ../../../../emacs/emacs.doom/config.el;
+  home.file.".doom.d/packages.el".source = ../../../../emacs/emacs.doom/packages.el;
 }
diff --git a/nix/setup.sh b/nix/setup.sh
index d845872..2b6a991 100755
--- a/nix/setup.sh
+++ b/nix/setup.sh
@@ -16,3 +16,6 @@ else
     # we're linux
     home-manager switch --flake "$PWD/home-manager#x86_64-linux-acicchetti"
 fi
+
+git clone https://github.com/doomemacs/doomemacs ~/.emacs.d
+~/.emacs.d/bin/doom install