From 700b3476bccf0bb15415bea6b467b43b676891f6 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 14 Apr 2023 13:32:48 -0400
Subject: [PATCH] Back to emacs

---
 flake.lock       | 22 +++++++++++++---------
 home/default.nix |  2 +-
 home/emacs.nix   |  7 +++++++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1ba52bf..f08c782 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,11 +53,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1672630914,
-        "narHash": "sha256-LVIJDR3gyk5RhBndzWuEhUz0OPKqtwyOnoSCSxY9mtw=",
+        "lastModified": 1681469204,
+        "narHash": "sha256-956ICeSR5FW42lphKWtE8YKDZtVD5GUjxjD6ogSCDT4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2fa6cca26891f696c13fe910bb659ecd69ed3842",
+        "rev": "c470756d69bc9195d0ddc1fcd70110376fc93473",
         "type": "github"
       },
       "original": {
@@ -580,14 +580,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-mZfzDyzojwj6I0wyooIjGIn81WtGVnx6+avU5Wv+VKU=",
-        "path": "/nix/store/2n3ykdi3lamr8gn2if8wkf0px0kg1bnp-source",
-        "type": "path"
+        "lastModified": 1673540789,
+        "narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf",
+        "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-lib": {
diff --git a/home/default.nix b/home/default.nix
index ddc240a..15d9317 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -26,7 +26,7 @@
           self.homeModules.common
           ./zsh.nix
           ./kitty.nix
-          # ./emacs.nix
+          ./emacs.nix
         ];
       };
     };
diff --git a/home/emacs.nix b/home/emacs.nix
index 3b0dae6..5cd30d4 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -8,6 +8,8 @@
     enable = true;
     package =
       let
+        # Pgtk won't be available until emacs 29; so we must use the nightly overlay
+        # cf. https://github.com/NixOS/nixpkgs/issues/192692#issuecomment-1256872679
         emacsPgtkWithXwidgets = flake.inputs.emacs-overlay.packages.${pkgs.system}.emacsPgtk.override {
           withXwidgets = true;
         };
@@ -20,4 +22,9 @@
         epkgs.vterm
       ]);
   };
+
+  home.packages = with pkgs; [
+    # For org-roam
+    graphviz
+  ];
 }