From cd53b6485f5994d0ca30883a7f0ab00b5e5460af Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 3 Jun 2024 16:18:26 +0200
Subject: [PATCH] Use `gptel` directly from GitHub

---
 flake.lock            | 17 +++++++++++++++++
 flake.nix             |  5 +++++
 init.el               | 12 ++++++------
 packages/packages.nix |  3 ++-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 151020f..30b2d01 100644
--- a/flake.lock
+++ b/flake.lock
@@ -68,6 +68,22 @@
         "type": "github"
       }
     },
+    "extra-package-gptel": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1716768306,
+        "narHash": "sha256-7tgBSPZDxW0RDUqJpJn9849iS4yeQtchNPk7CSbblk0=",
+        "owner": "karthink",
+        "repo": "gptel",
+        "rev": "c0603cb973d160f3e450a0dec49dc5ae948f614c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "karthink",
+        "repo": "gptel",
+        "type": "github"
+      }
+    },
     "extra-package-indent-bars": {
       "flake": false,
       "locked": {
@@ -264,6 +280,7 @@
         "extra-package-agenix-el": "extra-package-agenix-el",
         "extra-package-combobulate": "extra-package-combobulate",
         "extra-package-copilot": "extra-package-copilot",
+        "extra-package-gptel": "extra-package-gptel",
         "extra-package-indent-bars": "extra-package-indent-bars",
         "extra-package-nix-ts-mode": "extra-package-nix-ts-mode",
         "extra-package-notmuch-notify": "extra-package-notmuch-notify",
diff --git a/flake.nix b/flake.nix
index a4bcddd..861d6cb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
       url = "github:firmart/notmuch-notify";
       flake = false;
     };
+    # TODO remove when there will be a new release including GPT-4o 
+    extra-package-gptel = {
+      url = "github:karthink/gptel";
+      flake = false;
+    };
   };
 
   outputs = inputs @ {flake-parts, ...}:
diff --git a/init.el b/init.el
index e486c4f..d2492e7 100644
--- a/init.el
+++ b/init.el
@@ -820,12 +820,12 @@ This is meant to be an helper to be called from the window manager."
 	    (insert response)))))))
   )
 
-(use-package copilot
-  :custom
-  (copilot-max-char -1)
-  (copilot-indent-offset-warning-disable 't)
-  :hook (prog-mode org-mode)
-  :bind (("C-<tab>" . copilot-accept-completion)))
+;; (use-package copilot
+;;  :custom
+;;  (copilot-max-char -1)
+;;  (copilot-indent-offset-warning-disable 't)
+;;  :hook (prog-mode org-mode)
+;;  :bind (("C-<tab>" . copilot-accept-completion)))
 
 (use-package pass
   :config
diff --git a/packages/packages.nix b/packages/packages.nix
index a9536cb..43304b9 100644
--- a/packages/packages.nix
+++ b/packages/packages.nix
@@ -6,6 +6,7 @@ pkgs: epkgs: let
     indent-bars = [elpaPackages.compat];
     copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f];
     notmuch-notify = [melpaPackages.alert melpaPackages.notmuch];
+    gptel = [pkgs.emacsPackages.transient elpaPackages.compat];
   };
 
   overrideAttrsPerPackage = { };
@@ -93,7 +94,7 @@ pkgs: epkgs: let
       poly-org
       casual 
       # org-re-reveal # FIXME very not nice hash mismatch when building
-      gptel
+      # gptel # TODO uncomment when there will be a new release including GPT-4o 
     ]) ++ (with elpaPackages; [
       delight
       kind-icon