From e187e15b85770488d5ebcac2a6ced95d32610e36 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 09:48:28 +0200 Subject: [PATCH 1/9] Remove `chatgpt` --- flake.nix | 4 ---- init.el | 9 +-------- packages/packages.nix | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 26e860c..a4bcddd 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,6 @@ url = "github:t4ccer/agenix.el"; flake = false; }; - extra-package-chatgpt = { - url = "github:joshcho/ChatGPT.el"; - flake = false; - }; extra-package-copilot = { url = "github:zerolfx/copilot.el"; flake = false; diff --git a/init.el b/init.el index 7ba6700..95f04f8 100644 --- a/init.el +++ b/init.el @@ -793,14 +793,7 @@ This is meant to be an helper to be called from the window manager." ("C-c n l" . consult-org-roam-forward-links) ("C-c n r" . consult-org-roam-search)) -(use-package chatgpt :config - (dolist (e '(("spiega" . "Spiega il seguente") - ("documenta" . "Documenta il seguente usando la sintassi appropriata in modo che possa essere inserito nel codice") - )) - (push e chatgpt-code-query-map)) - :bind - ("C-c i" . chatgpt-query)) (use-package copilot :custom @@ -811,7 +804,7 @@ This is meant to be an helper to be called from the window manager." (use-package pass :config - (require 'password-store-otp) ;; FIXME use `use-pacakges' idiomatic way + (require 'password-store-otp) ;; FIXME use `use-pacakge' idiomatic way :bind (("C-c p p" . password-store-copy) ("C-c p o" . password-store-otp-token-copy) diff --git a/packages/packages.nix b/packages/packages.nix index fb309eb..a8aa22f 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -4,7 +4,6 @@ pkgs: epkgs: let depsPerPackage = { indent-bars = [elpaPackages.compat]; - chatgpt = [melpaPackages.polymode]; copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f]; notmuch-notify = [melpaPackages.alert melpaPackages.notmuch]; }; @@ -98,6 +97,7 @@ pkgs: epkgs: let poly-org # casual org-re-reveal + gptel ]) ++ (with elpaPackages; [ delight kind-icon From a8622fd7d5b050b795701dce30075183d28eb690 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 09:48:40 +0200 Subject: [PATCH 2/9] Follow mouse --- init.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init.el b/init.el index 95f04f8..96f4ced 100644 --- a/init.el +++ b/init.el @@ -48,7 +48,8 @@ (backup-directory-alist `(("." . ,temporary-file-directory))) (auto-save-files-name-transforms `((".*" ,temporary-file-directory t))) (backup-by-copying t) - (focus-follows-mouse 't) + (focus-follows-mouse t) + (mouse-autoselect-window t) :config (set-face-background 'vertical-border (face-background 'default)) (set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃)) From 74e0f203bbd179aae0d4fc5433c8b38140527be7 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 09:48:51 +0200 Subject: [PATCH 3/9] Use `nixd` instead of `nil` --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 96f4ced..8557a69 100644 --- a/init.el +++ b/init.el @@ -465,7 +465,7 @@ (nix-ts-mode . (lambda () (require 'eglot) (add-to-list 'eglot-server-programs - '(nix-ts-mode . ("nil"))) + '(nix-ts-mode . ("nixd"))) ;; FIXME `nixd' completion not working, will give it a second try in the future ;; '(nix-ts-mode . ("nixd" :initializationOptions (:eval (:depth 10 :workers 4) ;; :formatting (:command "alejandra") From b8d1c727a1109628e4cb7090a5e697df07eb20e3 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 09:49:02 +0200 Subject: [PATCH 4/9] Use `gptel` --- init.el | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/init.el b/init.el index 8557a69..f33b0a5 100644 --- a/init.el +++ b/init.el @@ -794,7 +794,29 @@ This is meant to be an helper to be called from the window manager." ("C-c n l" . consult-org-roam-forward-links) ("C-c n r" . consult-org-roam-search)) +(use-package gptel + :custom + (gptel-api-key (getenv "OPENAI_API_KEY")) :config + (defun ccr/suggest-eshell-command () + (interactive) + (save-excursion + (eshell-bol) + (let ((start-pos (point)) + (end-pos (line-end-position))) + (gptel-request + (buffer-substring-no-properties start-pos end-pos) ;the prompt + :system "You are proficient with emacs shell (eshell), translate the following to something I could directly prompt to the shell. Your responses should only be code, without explanation or formatting." + :buffer (current-buffer) + :context (cons (set-marker (make-marker) start-pos) + (set-marker (make-marker) end-pos)) + :callback + (lambda (response info) + (if (not response) + (message "ChatGPT response failed with: %s" (plist-get info :status)) + (kill-region start-pos end-pos) + (insert response))))))) + ) (use-package copilot :custom From d69eca9772fdb3c710963d393e2a4b282ee3cbf8 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 10:43:20 +0200 Subject: [PATCH 5/9] Remove `chatgpt` --- flake.lock | 77 +++++++++++++++++++++--------------------------------- 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index f2a1d09..151020f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710320774, - "narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=", + "lastModified": 1714528291, + "narHash": "sha256-eZe8RbeCwvBU4MO9tyIGBZ0TPUeBuqH0zvjyT0ANAo4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c", + "rev": "2a294b099b479a62a5e37964dfe5ceb75e74fdd8", "type": "github" }, "original": { @@ -36,22 +36,6 @@ "type": "github" } }, - "extra-package-chatgpt": { - "flake": false, - "locked": { - "lastModified": 1698792517, - "narHash": "sha256-sh/O36RN34osWLaNVNM3mWKE7mJUdom/ZrBoO2U+Yr8=", - "owner": "joshcho", - "repo": "ChatGPT.el", - "rev": "51c658aa40a106a4ee3afe4376f5ed3d6024c8a9", - "type": "github" - }, - "original": { - "owner": "joshcho", - "repo": "ChatGPT.el", - "type": "github" - } - }, "extra-package-combobulate": { "flake": false, "locked": { @@ -71,11 +55,11 @@ "extra-package-copilot": { "flake": false, "locked": { - "lastModified": 1710320315, - "narHash": "sha256-YY/6vODg2MSPMi+61Ii5aQiDQS5B6YPMP1VP1dDNOLs=", + "lastModified": 1713189314, + "narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=", "owner": "zerolfx", "repo": "copilot.el", - "rev": "57d5e670786ca8156772c6dcb38e6ff67c5efd62", + "rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72", "type": "github" }, "original": { @@ -87,11 +71,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1713279232, - "narHash": "sha256-usa8xpg2dvXwFcQf8gKSZ+kOy6EGJ+e2mkvGAjEX66o=", + "lastModified": 1713707934, + "narHash": "sha256-KGqP80JC0/uPol6diU8XcuHfK7i0hlKY6NoqAZh4QFY=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "88261051823961f0fc60c3c76b0cf2bae4ab32e4", + "rev": "4974f6c16c7fcc8bbe53fbcd93c74794877287a1", "type": "github" }, "original": { @@ -138,11 +122,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -159,11 +143,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -195,11 +179,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710309369, - "narHash": "sha256-pQo1vDEEyULfvTQeqZixryrDVpGICzGBtj4uIfP4cs0=", + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "9cc7ed20043adf381f1b8354c54ba667b527d538", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", "type": "github" }, "original": { @@ -210,11 +194,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -227,11 +211,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -244,11 +228,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710162809, - "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=", + "lastModified": 1714409183, + "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2", + "rev": "576ecd43d3b864966b4423a853412d6177775e8b", "type": "github" }, "original": { @@ -260,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -278,7 +262,6 @@ "inputs": { "emacs-overlay": "emacs-overlay", "extra-package-agenix-el": "extra-package-agenix-el", - "extra-package-chatgpt": "extra-package-chatgpt", "extra-package-combobulate": "extra-package-combobulate", "extra-package-copilot": "extra-package-copilot", "extra-package-indent-bars": "extra-package-indent-bars", From d20d45493901d45eadca00ffe69e5ecbb75522f1 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 10:44:19 +0200 Subject: [PATCH 6/9] Remove `copilot` overrides --- packages/packages.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/packages.nix b/packages/packages.nix index a8aa22f..21f1c12 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -8,13 +8,7 @@ pkgs: epkgs: let notmuch-notify = [melpaPackages.alert melpaPackages.notmuch]; }; - overrideAttrsPerPackage = { - copilot = old: { - postInstall = '' - cp -r "$src/dist" "$LISPDIR" - ''; - }; - }; + overrideAttrsPerPackage = { }; # *Attrset* containig extra emacs packages from flake inputs extraPackages = lib.mapAttrs (inputName: input: let From a59a8b82e53d7fd3fbc21c03846a6a1584b4b267 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 10:44:37 +0200 Subject: [PATCH 7/9] Add `casual` --- packages/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packages.nix b/packages/packages.nix index 21f1c12..4341eed 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -89,8 +89,8 @@ pkgs: epkgs: let notmuch consult-notmuch poly-org - # casual org-re-reveal + casual gptel ]) ++ (with elpaPackages; [ delight From 113f4faa4fe71673256558323e24e5d87b10a22e Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Wed, 1 May 2024 10:44:46 +0200 Subject: [PATCH 8/9] Disable `org-re-reveal` --- packages/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packages.nix b/packages/packages.nix index 4341eed..10ebdbc 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -89,8 +89,8 @@ pkgs: epkgs: let notmuch consult-notmuch poly-org - org-re-reveal casual + # org-re-reveal # FIXME very not nice hash mismatch when building gptel ]) ++ (with elpaPackages; [ delight From 35cdeff2cc42f2bf7993bd6632328942bb57c0ab Mon Sep 17 00:00:00 2001 From: Seven of Nine Date: Wed, 1 May 2024 16:26:11 +0000 Subject: [PATCH 9/9] 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/ce14ca664285a33988892c485f12d20fcb792d49' (2024-05-01) • Updated input 'extra-package-copilot': 'github:zerolfx/copilot.el/edf517a57f539eb41eaa2f92c6752538f3a62b72' (2024-04-15) → 'github:zerolfx/copilot.el/733bff26450255e092c10873580e9abfed8a81b8' (2024-05-01) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 151020f..26cd07f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714528291, - "narHash": "sha256-eZe8RbeCwvBU4MO9tyIGBZ0TPUeBuqH0zvjyT0ANAo4=", + "lastModified": 1714580308, + "narHash": "sha256-D9sx3irluJ7qjmKSORgwFIT7+woMBaUdik1g3AzvWK0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2a294b099b479a62a5e37964dfe5ceb75e74fdd8", + "rev": "ce14ca664285a33988892c485f12d20fcb792d49", "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": {