aciceri/emacs
Archived
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: aciceri:35cdeff2cc42f2bf7993bd6632328942bb57c0ab
Branches Tags
aciceri:master
aciceri:update-flake-lock
..
compare: aciceri:90ad1a97edc31b22ce7fab77fc2220042aa02281
Branches Tags
aciceri:master
aciceri:update-flake-lock

1 commit
35cdeff2cc ... 90ad1a97ed

Author SHA1 Message Date
Seven of Nine
90ad1a97ed flake.lock: Update
Some checks failed
/ test (push) Failing after 5m41s
Details 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c' (2024-03-13)
  → 'github:nix-community/emacs-overlay/bf94159254c238a379f54bd4c3d11a50322e6469' (2024-04-30)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12)
  → 'github:NixOS/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/ddcd7598b2184008c97e6c9c6a21c5f37590b8d2' (2024-03-11)
  → 'github:NixOS/nixpkgs/12430e43bd9b81a6b4e79e64f87c624ade701eaf' (2024-04-28)
• Updated input 'extra-package-copilot':
    'github:zerolfx/copilot.el/57d5e670786ca8156772c6dcb38e6ff67c5efd62' (2024-03-13)
  → 'github:zerolfx/copilot.el/edf517a57f539eb41eaa2f92c6752538f3a62b72' (2024-04-15)
• Updated input 'extra-package-indent-bars':
    'github:jdtsmith/indent-bars/88261051823961f0fc60c3c76b0cf2bae4ab32e4' (2024-04-16)
  → 'github:jdtsmith/indent-bars/4974f6c16c7fcc8bbe53fbcd93c74794877287a1' (2024-04-21)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
  → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib' (2024-02-29)
  → 'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089?dir=lib' (2024-03-29)
• Updated input 'hercules-ci-effects':
    'github:hercules-ci/hercules-ci-effects/9cc7ed20043adf381f1b8354c54ba667b527d538' (2024-03-13)
  → 'github:hercules-ci/hercules-ci-effects/c0302ec12d569532a6b6bd218f698bc402e93adc' (2024-04-23)
• Updated input 'hercules-ci-effects/flake-parts':
    'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
  → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
• Updated input 'hercules-ci-effects/nixpkgs':
    'github:NixOS/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09)
  → 'github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932' (2024-04-21)
 2024-04-30 13:28:35 +00:00
4 changed files with 50 additions and 39 deletions
Show stats Expand all files Collapse all files

35
flake.lock generated
View file

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

4
flake.nix
View file

@ -22,6 +22,10 @@
url = "github:t4ccer/agenix.el"; url = "github:t4ccer/agenix.el";
flake = false; flake = false;
}; };
extra-package-chatgpt = {
url = "github:joshcho/ChatGPT.el";
flake = false;
};
extra-package-copilot = { extra-package-copilot = {
url = "github:zerolfx/copilot.el"; url = "github:zerolfx/copilot.el";
flake = false; flake = false;

36
init.el
View file

@ -48,8 +48,7 @@
(backup-directory-alist `(("." . ,temporary-file-directory))) (backup-directory-alist `(("." . ,temporary-file-directory)))
(auto-save-files-name-transforms `((".*" ,temporary-file-directory t))) (auto-save-files-name-transforms `((".*" ,temporary-file-directory t)))
(backup-by-copying t) (backup-by-copying t)
(focus-follows-mouse t) (focus-follows-mouse 't)
(mouse-autoselect-window t)
:config :config
(set-face-background 'vertical-border (face-background 'default)) (set-face-background 'vertical-border (face-background 'default))
(set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃)) (set-display-table-slot standard-display-table 'vertical-border (make-glyph-code ?┃))
@ -465,7 +464,7 @@
(nix-ts-mode . (lambda () (nix-ts-mode . (lambda ()
(require 'eglot) (require 'eglot)
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
'(nix-ts-mode . ("nixd"))) '(nix-ts-mode . ("nil")))
;; FIXME `nixd' completion not working, will give it a second try in the future ;; FIXME `nixd' completion not working, will give it a second try in the future
;; '(nix-ts-mode . ("nixd" :initializationOptions (:eval (:depth 10 :workers 4) ;; '(nix-ts-mode . ("nixd" :initializationOptions (:eval (:depth 10 :workers 4)
;; :formatting (:command "alejandra") ;; :formatting (:command "alejandra")
@ -794,29 +793,14 @@ 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 l" . consult-org-roam-forward-links)
("C-c n r" . consult-org-roam-search)) ("C-c n r" . consult-org-roam-search))
(use-package gptel (use-package chatgpt
:custom
(gptel-api-key (getenv "OPENAI_API_KEY"))
:config :config
(defun ccr/suggest-eshell-command () (dolist (e '(("spiega" . "Spiega il seguente")
(interactive) ("documenta" . "Documenta il seguente usando la sintassi appropriata in modo che possa essere inserito nel codice")
(save-excursion ))
(eshell-bol) (push e chatgpt-code-query-map))
(let ((start-pos (point)) :bind
(end-pos (line-end-position))) ("C-c i" . chatgpt-query))
(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 (use-package copilot
:custom :custom
@ -827,7 +811,7 @@ This is meant to be an helper to be called from the window manager."
(use-package pass (use-package pass
:config :config
(require 'password-store-otp) ;; FIXME use `use-pacakge' idiomatic way (require 'password-store-otp) ;; FIXME use `use-pacakges' idiomatic way
:bind (("C-c p p" . password-store-copy) :bind (("C-c p p" . password-store-copy)
("C-c p o" . password-store-otp-token-copy) ("C-c p o" . password-store-otp-token-copy)

14
packages/packages.nix
View file

@ -4,11 +4,18 @@ pkgs: epkgs: let
depsPerPackage = { depsPerPackage = {
indent-bars = [elpaPackages.compat]; indent-bars = [elpaPackages.compat];
chatgpt = [melpaPackages.polymode];
copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f]; copilot = [melpaPackages.editorconfig melpaPackages.dash melpaPackages.s melpaPackages.f];
notmuch-notify = [melpaPackages.alert melpaPackages.notmuch]; notmuch-notify = [melpaPackages.alert melpaPackages.notmuch];
}; };
overrideAttrsPerPackage = { }; overrideAttrsPerPackage = {
copilot = old: {
postInstall = ''
cp -r "$src/dist" "$LISPDIR"
'';
};
};
# *Attrset* containig extra emacs packages from flake inputs # *Attrset* containig extra emacs packages from flake inputs
extraPackages = lib.mapAttrs (inputName: input: let extraPackages = lib.mapAttrs (inputName: input: let
@ -89,9 +96,8 @@ pkgs: epkgs: let
notmuch notmuch
consult-notmuch consult-notmuch
poly-org poly-org
casual # casual
# org-re-reveal # FIXME very not nice hash mismatch when building org-re-reveal
gptel
]) ++ (with elpaPackages; [ ]) ++ (with elpaPackages; [
delight delight
kind-icon kind-icon