From cd53b6485f5994d0ca30883a7f0ab00b5e5460af Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 3 Jun 2024 16:18:26 +0200 Subject: [PATCH 1/3] 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-" . copilot-accept-completion))) +;; (use-package copilot +;; :custom +;; (copilot-max-char -1) +;; (copilot-indent-offset-warning-disable 't) +;; :hook (prog-mode org-mode) +;; :bind (("C-" . 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 From c31fac25cbff26580b5252cde7e96a5364c71b28 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Tue, 4 Jun 2024 00:42:07 +0200 Subject: [PATCH 2/3] `meow-tree-sitter` --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ packages/packages.nix | 1 + 3 files changed, 22 insertions(+) diff --git a/flake.lock b/flake.lock index 30b2d01..8eebfba 100644 --- a/flake.lock +++ b/flake.lock @@ -100,6 +100,22 @@ "type": "github" } }, + "extra-package-meow-tree-sitter": { + "flake": false, + "locked": { + "lastModified": 1717451530, + "narHash": "sha256-hke2CGOY8x43snrr6bDY+SnQjgRLSMcmWfA1oItXAeE=", + "owner": "skissue", + "repo": "meow-tree-sitter", + "rev": "c23a499abac797b64bc458f370237a1d6b140a2e", + "type": "github" + }, + "original": { + "owner": "skissue", + "repo": "meow-tree-sitter", + "type": "github" + } + }, "extra-package-nix-ts-mode": { "flake": false, "locked": { @@ -282,6 +298,7 @@ "extra-package-copilot": "extra-package-copilot", "extra-package-gptel": "extra-package-gptel", "extra-package-indent-bars": "extra-package-indent-bars", + "extra-package-meow-tree-sitter": "extra-package-meow-tree-sitter", "extra-package-nix-ts-mode": "extra-package-nix-ts-mode", "extra-package-notmuch-notify": "extra-package-notmuch-notify", "flake-parts": "flake-parts", diff --git a/flake.nix b/flake.nix index 861d6cb..13c05fc 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,10 @@ url = "github:firmart/notmuch-notify"; flake = false; }; + extra-package-meow-tree-sitter = { + url = "github:skissue/meow-tree-sitter"; + flake = false; + }; # TODO remove when there will be a new release including GPT-4o extra-package-gptel = { url = "github:karthink/gptel"; diff --git a/packages/packages.nix b/packages/packages.nix index 43304b9..bcf4123 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -7,6 +7,7 @@ pkgs: epkgs: let copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f]; notmuch-notify = [melpaPackages.alert melpaPackages.notmuch]; gptel = [pkgs.emacsPackages.transient elpaPackages.compat]; + meow-tree-sitter = [melpaPackages.meow]; }; overrideAttrsPerPackage = { }; From ce7631929112a097f100d5ce18cf35e361c36489 Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Tue, 4 Jun 2024 12:31:06 +0000 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/2a294b099b479a62a5e37964dfe5ceb75e74fdd8' (2024-05-01) → 'github:nix-community/emacs-overlay/84d45decb6ee4cfee67c27e0237edaae2d95af79' (2024-06-04) • Updated input 'emacs-overlay/nixpkgs': 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27) → 'github:NixOS/nixpkgs/57610d2f8f0937f39dbd72251e9614b1561942d8' (2024-05-31) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/576ecd43d3b864966b4423a853412d6177775e8b' (2024-04-29) → 'github:NixOS/nixpkgs/a62e6edd6d5e1fa0329b8653c801147986f8d446' (2024-05-31) • Updated input 'extra-package-agenix-el': 'github:t4ccer/agenix.el/2ff26a3eb7fe347f45c4ea7ef9751721716144bc' (2023-10-16) → 'github:t4ccer/agenix.el/b9c7ad33b534d80af207949cc06c0bcd1e60fd63' (2024-06-01) • Updated input 'extra-package-copilot': 'github:zerolfx/copilot.el/edf517a57f539eb41eaa2f92c6752538f3a62b72' (2024-04-15) → 'github:zerolfx/copilot.el/733bff26450255e092c10873580e9abfed8a81b8' (2024-05-01) • Updated input 'extra-package-indent-bars': 'github:jdtsmith/indent-bars/4974f6c16c7fcc8bbe53fbcd93c74794877287a1' (2024-04-21) → 'github:jdtsmith/indent-bars/2216793de857cc21a1faba95361446dacdc8f3f5' (2024-05-30) • Updated input 'extra-package-meow-tree-sitter': 'github:skissue/meow-tree-sitter/c23a499abac797b64bc458f370237a1d6b140a2e' (2024-06-03) → 'github:skissue/meow-tree-sitter/93bec23cb860cb7aea116d0d99be24776466940f' (2024-06-04) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01) → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?dir=lib' (2024-03-29) → 'https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz?narHash=sha256-lIbdfCsf8LMFloheeE6N31%2BBMIeixqyQWbSr2vk79EQ%3D' (2024-06-01) --- flake.lock | 66 +++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 8eebfba..38656b7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714528291, - "narHash": "sha256-eZe8RbeCwvBU4MO9tyIGBZ0TPUeBuqH0zvjyT0ANAo4=", + "lastModified": 1717492092, + "narHash": "sha256-I1puxZKEMpPxQ5c5aQ4VLZ6mALtliks0j+t4EJVyZBs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2a294b099b479a62a5e37964dfe5ceb75e74fdd8", + "rev": "84d45decb6ee4cfee67c27e0237edaae2d95af79", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "extra-package-agenix-el": { "flake": false, "locked": { - "lastModified": 1697437470, - "narHash": "sha256-LEUtB4Et3zOFxnNq7bDZ1j4JDCCdARP3b+FnMp3b0W0=", + "lastModified": 1717247083, + "narHash": "sha256-PexGtluh0V8WVTaDJJurt2xAYfTEJPN5L+bUZomfK14=", "owner": "t4ccer", "repo": "agenix.el", - "rev": "2ff26a3eb7fe347f45c4ea7ef9751721716144bc", + "rev": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "extra-package-copilot": { "flake": false, "locked": { - "lastModified": 1713189314, - "narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=", + "lastModified": 1714572852, + "narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=", "owner": "zerolfx", "repo": "copilot.el", - "rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72", + "rev": "733bff26450255e092c10873580e9abfed8a81b8", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1713707934, - "narHash": "sha256-KGqP80JC0/uPol6diU8XcuHfK7i0hlKY6NoqAZh4QFY=", + "lastModified": 1717080421, + "narHash": "sha256-I+W3zXk7lza8XTuw/O7sXlXfn8wALtO6kMlj+nF5nfE=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "4974f6c16c7fcc8bbe53fbcd93c74794877287a1", + "rev": "2216793de857cc21a1faba95361446dacdc8f3f5", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "extra-package-meow-tree-sitter": { "flake": false, "locked": { - "lastModified": 1717451530, - "narHash": "sha256-hke2CGOY8x43snrr6bDY+SnQjgRLSMcmWfA1oItXAeE=", + "lastModified": 1717464301, + "narHash": "sha256-8x4FhYyh4G/fsVnSDUGZ8CBwJ4LVw55OIoBJoTHGt+c=", "owner": "skissue", "repo": "meow-tree-sitter", - "rev": "c23a499abac797b64bc458f370237a1d6b140a2e", + "rev": "93bec23cb860cb7aea116d0d99be24776466940f", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -242,29 +242,23 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": {