From 7cf0aa41f51cf0d2c76bf1c49f12f65eee871c0b Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Mon, 14 Aug 2023 13:18:42 -0500
Subject: [PATCH] Testing nix-doom-emacs fork with simple pgtk patch

---
 flake.lock                   | 22 ++++++++++++----------
 flake.nix                    |  2 +-
 user/app/doom-emacs/doom.nix |  2 +-
 user/app/doom-emacs/doom.org |  4 ++--
 user/app/doom-emacs/init.el  |  2 +-
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 865d59b..78b9f6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -384,15 +384,16 @@
         "ws-butler": "ws-butler"
       },
       "locked": {
-        "lastModified": 1689075996,
-        "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=",
-        "owner": "nix-community",
+        "lastModified": 1692036829,
+        "narHash": "sha256-C7VR/g4d8kUvbedqHi5gOKnMTAhti1ZlRkcWbHso/BA=",
+        "owner": "librephoenix",
         "repo": "nix-doom-emacs",
-        "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471",
+        "rev": "66f75fae616d8e36c901bbb594225d1c630fbceb",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "librephoenix",
+        "ref": "pgtk-patch",
         "repo": "nix-doom-emacs",
         "type": "github"
       }
@@ -400,15 +401,16 @@
     "nix-straight": {
       "flake": false,
       "locked": {
-        "lastModified": 1666982610,
-        "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=",
-        "owner": "nix-community",
+        "lastModified": 1692033740,
+        "narHash": "sha256-oCd0yJiMArPr20nYVz/HGU1bmZnmiS30n9Z4MKZUHj0=",
+        "owner": "librephoenix",
         "repo": "nix-straight.el",
-        "rev": "ad10364d64f472c904115fd38d194efe1c3f1226",
+        "rev": "1e4a1375b04acb8a88d123a91585734410192d42",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "librephoenix",
+        "ref": "pgtk-patch",
         "repo": "nix-straight.el",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6d45d83..0742bf5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,7 +96,7 @@
     nixpkgs.url = "nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
+    nix-doom-emacs.url = "github:librephoenix/nix-doom-emacs?ref=pgtk-patch";
     stylix.url = "github:danth/stylix";
     rust-overlay.url = "github:oxalica/rust-overlay";
     eaf = {
diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix
index 5cb984b..cd905b0 100644
--- a/user/app/doom-emacs/doom.nix
+++ b/user/app/doom-emacs/doom.nix
@@ -7,7 +7,7 @@ in
   services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
-    emacsPackage = pkgs.emacs28-gtk2;
+    emacsPackage = pkgs.emacs29-pgtk;
     doomPrivateDir = ./.;
     # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
     # Only init/packages so we only rebuild when those change.
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index e80e291..b61fb60 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1349,7 +1349,7 @@ This section is the [[./init.el][init.el]] section, which controls which Doom mo
        :lang
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
-       cc                ; C > C++ == 1
+       ;;cc                ; C > C++ == 1
        ;;clojure           ; java with a lisp
        common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs
@@ -1480,7 +1480,7 @@ in
   services.emacs.enable = true;
   programs.doom-emacs = {
     enable = true;
-    emacsPackage = pkgs.emacs28-gtk2;
+    emacsPackage = pkgs.emacs29-pgtk;
     doomPrivateDir = ./.;
     # This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
     # Only init/packages so we only rebuild when those change.
diff --git a/user/app/doom-emacs/init.el b/user/app/doom-emacs/init.el
index 55a99d2..2024ae6 100644
--- a/user/app/doom-emacs/init.el
+++ b/user/app/doom-emacs/init.el
@@ -97,7 +97,7 @@
        :lang
        ;;agda              ; types of types of types of types...
        ;;beancount         ; mind the GAAP
-       cc                ; C > C++ == 1
+       ;;cc                ; C > C++ == 1
        ;;clojure           ; java with a lisp
        common-lisp       ; if you've seen one lisp, you've seen them all
        ;;coq               ; proofs-as-programs