diff --git a/flake.lock b/flake.lock index 09347fb..ebadc37 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/init.el b/init.el index cecf89b..d2492e7 100644 --- a/init.el +++ b/init.el @@ -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-" . 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 cfaad06..e4e04c7 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -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; + }) ]