From 11f8526aa22bed185756ac522a7fdc9bfbf484c4 Mon Sep 17 00:00:00 2001
From: Kiana Sheibani <kiana.a.sheibani@gmail.com>
Date: Sun, 29 May 2022 20:08:22 -0400
Subject: [PATCH] Switch to GTK Native Comp Emacs

---
 common/config/packages.nix |  2 +-
 flake.lock                 | 57 +++++++++++++++++++++++++-------------
 flake.nix                  |  1 +
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/common/config/packages.nix b/common/config/packages.nix
index 629fc50..9002592 100644
--- a/common/config/packages.nix
+++ b/common/config/packages.nix
@@ -38,7 +38,7 @@ in {
 
   nixpkgs.overlays = [ emacs-overlay.overlay ];
   services.emacs.enable = true;
-  services.emacs.package = pkgs.emacsUnstable;
+  services.emacs.package = pkgs.emacsPgtkNativeComp;
 
   # direnv setup
 
diff --git a/flake.lock b/flake.lock
index 7b23783..feb125b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,41 @@
 {
   "nodes": {
+    "emacs-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1653852240,
+        "narHash": "sha256-VmAbVC5s8OgNJ2GoSmdccMTDDRFtezo5sH+R4vcV7r0=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "8d1ee06daa51522db5efd5308d85106197f6ffb0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1652776076,
+        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -69,28 +105,11 @@
     },
     "root": {
       "inputs": {
+        "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nur": "nur",
-        "spacemacs": "spacemacs"
-      }
-    },
-    "spacemacs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1649959018,
-        "narHash": "sha256-q+LYBpHyiqe1kmLUlgewjxys94O1okfnhrcYYFHCB8Q=",
-        "owner": "syl20bnr",
-        "repo": "spacemacs",
-        "rev": "b3e67aafe2451ca91e2d310d29879616e10981d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "syl20bnr",
-        "ref": "develop",
-        "repo": "spacemacs",
-        "type": "github"
+        "nur": "nur"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 6c5ce9c..c8786e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@ inputs = rec {
   home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
   emacs-overlay.url = "github:nix-community/emacs-overlay";
+  emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";
 };
 outputs = { self,
             nixpkgs,