From 5a8601bc6e48b100d1e4390d9458503877504a66 Mon Sep 17 00:00:00 2001
From: niten <niten@fudo.org>
Date: Tue, 7 Sep 2021 15:50:40 -0700
Subject: [PATCH] Add working doom packages file

---
 doom-emacs-package.nix | 44 +++++++++++++++++++++++-------------------
 home.nix               | 12 ++++++------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/doom-emacs-package.nix b/doom-emacs-package.nix
index 4660c92..74ae771 100644
--- a/doom-emacs-package.nix
+++ b/doom-emacs-package.nix
@@ -12,26 +12,30 @@
     sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6";
   };
 
-in pkgs.callPackage doom-emacs-pkg {
-  doomPrivateDir = doom-emacs-config;
-  extraPackages = with pkgs.emacsPackages; [
-    elpher
-    use-package
-  ];
-  emacsPackagesOverlay = final: prev: {
-    irony = prev.irony.overrideAttrs (esuper: {
-      buildInputs = esuper.buildInputs
-                    ++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
-    });
-    spinner = let version = "1.7.4";
-              in prev.trivialBuild {
-                inherit version;
-                pname = "spinner";
-                src = builtins.fetchTarball {
-                  url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
-                  sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
+in {
+  doom-emacs-package = pkgs.callPackage doom-emacs-pkg {
+    doomPrivateDir = doom-emacs-config;
+    extraPackages = with pkgs.emacsPackages; [
+      elpher
+      use-package
+    ];
+    emacsPackagesOverlay = final: prev: {
+      irony = prev.irony.overrideAttrs (esuper: {
+        buildInputs = esuper.buildInputs
+                      ++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
+      });
+      spinner = let version = "1.7.4";
+                in prev.trivialBuild {
+                  inherit version;
+                  pname = "spinner";
+                  src = builtins.fetchTarball {
+                    url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
+                    sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
+                  };
+                  buildPhase = ":";
                 };
-                buildPhase = ":";
-              };
+    };
   };
+
+  doom-emacs-config = doom-emacs-config;
 }
diff --git a/home.nix b/home.nix
index 39279c0..772e22e 100644
--- a/home.nix
+++ b/home.nix
@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 { username, user-email, home-dir }:
-{ enable-gui ? true, ... }:
+{ enable-gui ? false, ... }:
 
 with lib;
 let
 
-  doom-emacs-package = pkgs.callPackage ./doom-emacs-package.nix {};
+  doom-emacs-packages = pkgs.callPackage ./doom-emacs-package.nix {};
   
   gui-packages = with pkgs;
     let
@@ -51,7 +51,7 @@ let
     enca
     file
     fortune
-    doom-emacs-package
+    doom-emacs-packages.doom-emacs-package
     git
     gnutls
     gnupg
@@ -116,7 +116,7 @@ in {
   xresources.properties = mkIf enable-gui {
     "Xft.antialias" = 1;
     "Xft.autohint" = 0;
-    "Xft.dpi" = 192;
+    # "Xft.dpi" = 192;
     "Xft.hinting" = 1;
     "Xft.hintstyle" = "hintfull";
     "Xft.lcdfilter" = "lcddefault";
@@ -125,7 +125,7 @@ in {
   services = {
     emacs = {
       enable = true;
-      package = doom-emacs-package;
+      package = doom-emacs-packages.doom-emacs-package;
       client = {
         enable = true;
         arguments = [ "-t" ];
@@ -173,7 +173,7 @@ in {
       # EDITOR = "${doom-emacs}/bin/emacsclient -t";
       ALTERNATE_EDITOR = "";
 
-      DOOM_EMACS_SITE_PATH = "${doom-emacs-config}/site.d";
+      DOOM_EMACS_SITE_PATH = "${doom-emacs-packages.doom-emacs-config}/site.d";
 
       HISTCONTROL = "ignoredups:ignorespace";
     };