flake.lock: Update

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

@@ -7,11 +7,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1714467992,
+        "lastModified": 1714580308,
-        "narHash": "sha256-+JT8h7EDcIRmM1qOxSHcKENruIyDOJ502haTFqnQ+74=",
+        "narHash": "sha256-D9sx3irluJ7qjmKSORgwFIT7+woMBaUdik1g3AzvWK0=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "bf94159254c238a379f54bd4c3d11a50322e6469",
+        "rev": "ce14ca664285a33988892c485f12d20fcb792d49",
         "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": 1713189314,
+        "lastModified": 1714572852,
-        "narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=",
+        "narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=",
         "owner": "zerolfx",
         "repo": "copilot.el",
-        "rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72",
+        "rev": "733bff26450255e092c10873580e9abfed8a81b8",
         "type": "github"
       },
       "original": {
@@ -244,11 +228,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714272655,
+        "lastModified": 1714409183,
-        "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
+        "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
+        "rev": "576ecd43d3b864966b4423a853412d6177775e8b",
         "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",

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;

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 ?┃))
@@ -464,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")
@@ -793,14 +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 chatgpt
+(use-package gptel
+  :custom
+  (gptel-api-key (getenv "OPENAI_API_KEY"))
   :config
-  (dolist (e '(("spiega" . "Spiega il seguente")
+  (defun ccr/suggest-eshell-command ()
-	       ("documenta" . "Documenta il seguente usando la sintassi appropriata in modo che possa essere inserito nel codice")
+    (interactive)
-	       ))
+    (save-excursion
-    (push e chatgpt-code-query-map))
+      (eshell-bol)
-  :bind
+      (let ((start-pos (point))
-  ("C-c i" . chatgpt-query))
+	    (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
@@ -811,7 +827,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)

packages/packages.nix

@@ -4,18 +4,11 @@ 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];
   };
 
-  overrideAttrsPerPackage = {
+  overrideAttrsPerPackage = { };
-    copilot = old: {
-      postInstall = ''
-        cp -r "$src/dist" "$LISPDIR"
-      '';
-    };
-  };
 
   # *Attrset* containig extra emacs packages from flake inputs
   extraPackages = lib.mapAttrs (inputName: input: let
@@ -96,8 +89,9 @@ pkgs: epkgs: let
       notmuch
       consult-notmuch
       poly-org
-      # casual
+      casual 
-      org-re-reveal
+      # org-re-reveal # FIXME very not nice hash mismatch when building
+      gptel
     ]) ++ (with elpaPackages; [
       delight
       kind-icon