diff --git a/flake.lock b/flake.lock index 38656b7..f1478bb 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717492092, - "narHash": "sha256-I1puxZKEMpPxQ5c5aQ4VLZ6mALtliks0j+t4EJVyZBs=", + "lastModified": 1717405832, + "narHash": "sha256-MTNKQYg07C3lGzdrP9jonWbLZXpwc2kuCtyw++HZSDw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "84d45decb6ee4cfee67c27e0237edaae2d95af79", + "rev": "088f3035f29f2de3cc2d666ff6cbcee248eb3d43", "type": "github" }, "original": { @@ -68,22 +68,6 @@ "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": { @@ -100,22 +84,6 @@ "type": "github" } }, - "extra-package-meow-tree-sitter": { - "flake": false, - "locked": { - "lastModified": 1717464301, - "narHash": "sha256-8x4FhYyh4G/fsVnSDUGZ8CBwJ4LVw55OIoBJoTHGt+c=", - "owner": "skissue", - "repo": "meow-tree-sitter", - "rev": "93bec23cb860cb7aea116d0d99be24776466940f", - "type": "github" - }, - "original": { - "owner": "skissue", - "repo": "meow-tree-sitter", - "type": "github" - } - }, "extra-package-nix-ts-mode": { "flake": false, "locked": { @@ -290,9 +258,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-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 13c05fc..a4bcddd 100644 --- a/flake.nix +++ b/flake.nix @@ -30,15 +30,6 @@ 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"; - flake = false; - }; }; outputs = inputs @ {flake-parts, ...}: diff --git a/init.el b/init.el index d2492e7..e486c4f 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 bcf4123..a9536cb 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -6,8 +6,6 @@ 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]; - meow-tree-sitter = [melpaPackages.meow]; }; overrideAttrsPerPackage = { }; @@ -95,7 +93,7 @@ pkgs: epkgs: let poly-org casual # org-re-reveal # FIXME very not nice hash mismatch when building - # gptel # TODO uncomment when there will be a new release including GPT-4o + gptel ]) ++ (with elpaPackages; [ delight kind-icon