Add doom-emacs using nix directly

Keep config as separate repo for rapid iteration
Restore Makefile

Makefile

@@ -0,0 +1,7 @@
+.PHONY: test build
+
+test:
+	sudo nixos-rebuild test --flake .
+
+build:
+	sudo nixos-rebuild build --flake .

flake.lock

@@ -112,6 +112,22 @@
         "type": "github"
       }
     },
+    "doom-emacs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1694469381,
+        "narHash": "sha256-W2igPoy27chZrM8DYtnQ3d8WavrdHMYuX+Ez4DXdMZs=",
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "a44e8d6bfd06e8746030eb1f2e6d3a200a2f4682",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -206,6 +222,7 @@
         "catppuccin-hyprland": "catppuccin-hyprland",
         "catppuccin-zathura": "catppuccin-zathura",
         "catppuccin-zsh": "catppuccin-zsh",
+        "doom-emacs": "doom-emacs",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs",

flake.nix

@@ -13,6 +13,10 @@
     };
 
     # Non-flake inputs
+    doom-emacs = {
+      url = "github:doomemacs/doomemacs";
+      flake = false;
+    };
     wallpapers = {
       url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
       flake = false;

home/emacs/default.nix

@@ -1,9 +1,18 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
-
+let
-{
+  sessionVariables = {
+    DOOMLOCALDIR = "$HOME/.local/share/doomemacs";
+    DOOMPROFILELOADFILE = "$HOME/.local/share/doomemacs/profiles/load.el";
+  };
+in {
   imports = [ ../accounts/default.nix ../git/default.nix ];
+  xdg.configFile.emacs.source = inputs.doom-emacs;
+  systemd.user = { inherit sessionVariables; };
   programs.emacs.enable = true;
-  home.packages = with pkgs; [
+  home = {
+    inherit sessionVariables;
+    sessionPath = [ "${inputs.doom-emacs}/bin" ];
+    packages = with pkgs; [
       # Emacs dependencies
       ripgrep
       coreutils
@@ -57,4 +66,5 @@
       nodePackages.vscode-json-languageserver-bin
       nodePackages.dockerfile-language-server-nodejs
     ];
+  };
 }