Compare commits

..

1 commit

Author SHA1 Message Date
a5e88644b1 flake.lock: Update
Some checks failed
/ test (push) Failing after 6m42s
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/fd904f28fb1d3d3a3d87db312fac97cb4a146db4' (2024-06-25)
  → 'github:nix-community/emacs-overlay/3b4f8179de2b4950540d70161854e43fe1010eae' (2024-08-16)
• Updated input 'emacs-overlay/nixpkgs':
    'github:NixOS/nixpkgs/a71e967ef3694799d0c418c98332f7ff4cc5f6af' (2024-06-22)
  → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9' (2024-08-14)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/906320ae02f769d13a646eb3605a9821df0d6ea2' (2024-06-23)
  → 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0' (2024-08-15)
• Updated input 'extra-package-agenix-el':
    'github:t4ccer/agenix.el/b9c7ad33b534d80af207949cc06c0bcd1e60fd63' (2024-06-01)
  → 'github:t4ccer/agenix.el/1ef747135401ed4b905acc2b3ec3f909d9cb62e1' (2024-08-06)
• Updated input 'extra-package-copilot':
    'github:zerolfx/copilot.el/733bff26450255e092c10873580e9abfed8a81b8' (2024-05-01)
  → 'github:zerolfx/copilot.el/535ef61e82f09d744cd5b097b1fc99f08cce175c' (2024-08-16)
• Updated input 'extra-package-gptel':
    'github:karthink/gptel/a834adbcba46197f4a59b0208e48dd3e80f15c46' (2024-06-25)
  → 'github:karthink/gptel/17f39f6a8144496252eacc012ef7f1d6a2ac883a' (2024-08-14)
• Updated input 'extra-package-indent-bars':
    'github:jdtsmith/indent-bars/2d1d854ddaa5b0e19b69e73553675c2aaaed1641' (2024-06-07)
  → 'github:jdtsmith/indent-bars/209817a622e2fbf9201a6c756928c9f320431449' (2024-08-12)
• Updated input 'extra-package-meow-tree-sitter':
    'github:skissue/meow-tree-sitter/8b4e91de05e82fee3535be67d0e9cbd9239b73bb' (2024-06-25)
  → 'github:skissue/meow-tree-sitter/d8dce964fac631a6d44b650a733075e14854159c' (2024-07-01)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8' (2024-06-01)
  → 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'eb9ceca17d.tar.gz?narHash=sha256-lIbdfCsf8LMFloheeE6N31%2BBMIeixqyQWbSr2vk79EQ%3D' (2024-06-01)
  → 'a5d394176e.tar.gz?narHash=sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q%3D' (2024-08-01)
2024-08-16 12:53:33 +00:00
3 changed files with 38 additions and 24 deletions

6
flake.lock generated
View file

@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1723885890,
"narHash": "sha256-MNREOblaa/DcYkM2Az57JC+auv023k+93biSDP6tiGY=",
"lastModified": 1723799695,
"narHash": "sha256-8W/xxCpwQC9LOnwUO0Q7aGAF463ozaxcwQ6/toqtz0M=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "2dc18fd0621276a03b36e509d9271155d6e5ee19",
"rev": "3b4f8179de2b4950540d70161854e43fe1010eae",
"type": "github"
},
"original": {

47
init.el
View file

@ -436,6 +436,21 @@
[("D" "Difftastic diff (dwim)" difftastic-magit-diff)
("S" "Difftastic show" difftastic-magit-show)])))
(use-package sideline
:delight
:hook (flymake-mode . sideline-mode)
:custom
(sideline-flymake-display-mode 'line)
(sideline-backends-right '(sideline-flymake))
:config
;; FIXME https://github.com/emacs-sideline/sideline/issues/13
(require 'sideline)
(defun ccr-sideline--align (&rest lengths)
"Align sideline string by LENGTHS from the right of the window."
(list (* (window-font-width)
(+ (apply #'+ lengths) (if (display-graphic-p) 1 3)))))
(advice-add 'sideline--align :override #'ccr-sideline--align))
;; FIXME there is something deeply wrong about how nix is configured here
;; (use-package nix-mode
;; :delight nix-prettify-mode
@ -793,24 +808,24 @@ This is meant to be an helper to be called from the window manager."
(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)))))))
: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
(copilot-max-char -1)
(copilot-indent-offset-warning-disable 't)
:hook (prog-mode org-mode)
:bind (("C-<tab>" . copilot-accept-completion)))
;; (use-package copilot
;; :custom
;; (copilot-max-char -1)
;; (copilot-indent-offset-warning-disable 't)
;; :hook (prog-mode org-mode)
;; :bind (("C-<tab>" . copilot-accept-completion)))
(use-package pass
:config

View file

@ -117,9 +117,8 @@ mainPackages
++ (builtins.attrValues extraPackages)
# Playing with EAF
++ [
# Disabled because pymupdf was broken
# (pkgs.callPackage ./eaf.nix {
# inherit (epkgs) melpaBuild;
# inherit (melpaPackages) ctable deferred epc s;
# })
(pkgs.callPackage ./eaf.nix {
inherit (epkgs) melpaBuild;
inherit (melpaPackages) ctable deferred epc s;
})
]