From 8d10865115f8dfb4cb8f835d88ff1b6b0e3b2c3d Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Wed, 14 Feb 2024 05:40:47 -0500
Subject: [PATCH] Enable emacs

---
 flake.lock       | 34 +++++++++++++++++++---------------
 flake.nix        |  6 ++++++
 home/default.nix |  2 +-
 home/emacs.nix   |  6 +++---
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 94cb772..01459dc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -252,11 +252,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1705481628,
-        "narHash": "sha256-9u+bD9lEzZoNxdQhTapaumcIUzA9Ej4aBk1KdZ1jevk=",
+        "lastModified": 1707901582,
+        "narHash": "sha256-/u7TGrMRoT/h360iHThg1cumIJ9l2+xw51w4qi+cgFA=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "7e2ecc3654c3daa74a1f72826cac9b8fd13a7f06",
+        "rev": "763c614a4cce4296941b44dece54390dd108b781",
         "type": "github"
       },
       "original": {
@@ -1103,7 +1103,9 @@
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_5",
         "format-all": "format-all",
-        "nix-straight": "nix-straight",
+        "nix-straight": [
+          "nix-straight"
+        ],
         "nixpkgs": "nixpkgs_8",
         "nose": "nose",
         "ob-racket": "ob-racket",
@@ -1176,15 +1178,16 @@
     "nix-straight": {
       "flake": false,
       "locked": {
-        "lastModified": 1694361489,
-        "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=",
-        "owner": "nix-community",
+        "lastModified": 1696948727,
+        "narHash": "sha256-6fQamWVIyeLoFSJl1WKcIl+LUdZluzFla4H+4Z5Cv2E=",
+        "owner": "codingkoi",
         "repo": "nix-straight.el",
-        "rev": "748be99b84be0b130e946288099806a0f16d6e57",
+        "rev": "c64edbf49598453bd85dae1acef9a0f9d294185d",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "codingkoi",
+        "ref": "codingkoi/apply-librephoenixs-fix",
         "repo": "nix-straight.el",
         "type": "github"
       }
@@ -1303,11 +1306,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1705316053,
-        "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
+        "lastModified": 1707689078,
+        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
+        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
         "type": "github"
       },
       "original": {
@@ -1482,11 +1485,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1705331948,
-        "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
+        "lastModified": 1707786466,
+        "narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
+        "rev": "01885a071465e223f8f68971f864b15829988504",
         "type": "github"
       },
       "original": {
@@ -2038,6 +2041,7 @@
         "nix-doom-emacs": "nix-doom-emacs",
         "nix-index-database": "nix-index-database",
         "nix-serve-ng": "nix-serve-ng",
+        "nix-straight": "nix-straight",
         "nixci": "nixci",
         "nixd": "nixd",
         "nixos-flake": "nixos-flake",
diff --git a/flake.nix b/flake.nix
index c43c4c9..52d2298 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,12 @@
     # Emacs
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
+    # https://github.com/nix-community/nix-doom-emacs/issues/409#issuecomment-1753412481
+    nix-straight = {
+      url = "github:codingkoi/nix-straight.el?ref=codingkoi/apply-librephoenixs-fix";
+      flake = false;
+    };
+    nix-doom-emacs.inputs.nix-straight.follows = "nix-straight";
 
     # Vim & its plugins (not in nixpkgs)
     zk-nvim.url = "github:mickael-menu/zk-nvim";
diff --git a/home/default.nix b/home/default.nix
index c773429..433b8eb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -35,7 +35,7 @@
           ./zsh.nix
           ./bash.nix
           # ./kitty.nix
-          # ./emacs.nix
+          ./emacs.nix
         ];
       };
     };
diff --git a/home/emacs.nix b/home/emacs.nix
index bdad3aa..85e841d 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -9,20 +9,20 @@
 
   # If using doom emacs ...
   programs.doom-emacs = {
-    # enable = true;
+    enable = true;
     emacsPackage = pkgs.emacs29-pgtk;
     doomPrivateDir = ./emacs/doom;
   };
 
   # If using vanilla emacs ...
-  programs.emacs = {
+  /* programs.emacs = {
     enable = true;
     package = pkgs.emacs29-pgtk;
     extraPackages = epkgs: [
       epkgs.org-roam
       epkgs.vterm
     ];
-  };
+  }; */
 
   home.packages = with pkgs; [
     # For org-roam