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

Compare commits

base: aciceri:a5e88644b1af46d41f993b56b2d0e297e7fcc923
Branches Tags
aciceri:master
aciceri:update-flake-lock
...
compare: aciceri:f4b44ddd3065452d7ee761e5f9a9ba0597f78bcc
Branches Tags
aciceri:master
aciceri:update-flake-lock

4 commits
a5e88644b1 ... f4b44ddd30

Author SHA1 Message Date
Seven of Nine
f4b44ddd30 flake.lock: Update
All checks were successful
/ test (push) Successful in 6m36s
Details 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/3b4f8179de2b4950540d70161854e43fe1010eae' (2024-08-16)
  → 'github:nix-community/emacs-overlay/2dc18fd0621276a03b36e509d9271155d6e5ee19' (2024-08-17)
 2024-08-17 12:42:21 +00:00
Andrea Ciceri
0afba6526f
Bump deps
All checks were successful
/ test (push) Successful in 16s
Details
2024-08-16 17:12:23 +02:00
Andrea Ciceri
386a004a1c
Disabled EAF 2024-08-16 17:12:15 +02:00
Andrea Ciceri
524b38e744
Things
All checks were successful
/ test (push) Successful in 27s
Details
2024-08-16 17:08:16 +02:00
3 changed files with 53 additions and 67 deletions
Show stats Expand all files Collapse all files

64
flake.lock generated
View file

@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1719303695, "lastModified": 1723885890,
"narHash": "sha256-SqJTGKtJEzkQdHEUWeMHwQ5vyAg4wE1kRbjTRjzfAUI=", "narHash": "sha256-MNREOblaa/DcYkM2Az57JC+auv023k+93biSDP6tiGY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "fd904f28fb1d3d3a3d87db312fac97cb4a146db4", "rev": "2dc18fd0621276a03b36e509d9271155d6e5ee19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"extra-package-agenix-el": { "extra-package-agenix-el": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717247083, "lastModified": 1722968702,
"narHash": "sha256-PexGtluh0V8WVTaDJJurt2xAYfTEJPN5L+bUZomfK14=", "narHash": "sha256-npdFsig2UmLcyTg6gaoPfpBfFjaTJ5vhbhx2zeDJ6B8=",
"owner": "t4ccer", "owner": "t4ccer",
"repo": "agenix.el", "repo": "agenix.el",
"rev": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", "rev": "1ef747135401ed4b905acc2b3ec3f909d9cb62e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
"extra-package-copilot": { "extra-package-copilot": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714572852, "lastModified": 1723778577,
"narHash": "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0=", "narHash": "sha256-/ZDnEZWUFcKnUtFrd/4C7LX16GAdUQncU8ZnYzntKS0=",
"owner": "zerolfx", "owner": "zerolfx",
"repo": "copilot.el", "repo": "copilot.el",
"rev": "733bff26450255e092c10873580e9abfed8a81b8", "rev": "535ef61e82f09d744cd5b097b1fc99f08cce175c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
"extra-package-gptel": { "extra-package-gptel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719293003, "lastModified": 1723651088,
"narHash": "sha256-2UArv9fvZEMC6lf3HE6c9onXkRroX0HgX5C/kTHM/ls=", "narHash": "sha256-5uu9v8vqadAhFldMnMSyE5FUF5QNN5LlU++hLq34Mvg=",
"owner": "karthink", "owner": "karthink",
"repo": "gptel", "repo": "gptel",
"rev": "a834adbcba46197f4a59b0208e48dd3e80f15c46", "rev": "17f39f6a8144496252eacc012ef7f1d6a2ac883a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,11 +87,11 @@
"extra-package-indent-bars": { "extra-package-indent-bars": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1717788473, "lastModified": 1723492886,
"narHash": "sha256-gcqFMjgWktfGFKeiW6uwWbBtEM1Om2ezMI7W/ZGUFkE=", "narHash": "sha256-U/rzvl2EKT/ia0hvoy0c9muPvJ/5UXhsrO4yiOaaJQI=",
"owner": "jdtsmith", "owner": "jdtsmith",
"repo": "indent-bars", "repo": "indent-bars",
"rev": "2d1d854ddaa5b0e19b69e73553675c2aaaed1641", "rev": "209817a622e2fbf9201a6c756928c9f320431449",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
"extra-package-meow-tree-sitter": { "extra-package-meow-tree-sitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719316197, "lastModified": 1719843724,
"narHash": "sha256-PJotdHWmnBlfQfVSZQAfwxhQfXM/U338wl5QZu/RWMI=", "narHash": "sha256-XdTeUq1J/zKoYaIDbl86LYuhJZJbaLFEpz7i5CxE8js=",
"owner": "skissue", "owner": "skissue",
"repo": "meow-tree-sitter", "repo": "meow-tree-sitter",
"rev": "8b4e91de05e82fee3535be67d0e9cbd9239b73bb", "rev": "d8dce964fac631a6d44b650a733075e14854159c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1722555600,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +226,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1723637854,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,28 +242,28 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1717284937, "lastModified": 1722555339,
"narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719122173, "lastModified": 1723688146,
"narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=", "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "906320ae02f769d13a646eb3605a9821df0d6ea2", "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

47
init.el
View file

@ -436,21 +436,6 @@
[("D" "Difftastic diff (dwim)" difftastic-magit-diff) [("D" "Difftastic diff (dwim)" difftastic-magit-diff)
("S" "Difftastic show" difftastic-magit-show)]))) ("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 ;; FIXME there is something deeply wrong about how nix is configured here
;; (use-package nix-mode ;; (use-package nix-mode
;; :delight nix-prettify-mode ;; :delight nix-prettify-mode
@ -808,24 +793,24 @@ This is meant to be an helper to be called from the window manager."
(end-pos (line-end-position))) (end-pos (line-end-position)))
(gptel-request (gptel-request
(buffer-substring-no-properties start-pos end-pos) ;the prompt (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." :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) :buffer (current-buffer)
:context (cons (set-marker (make-marker) start-pos) :context (cons (set-marker (make-marker) start-pos)
(set-marker (make-marker) end-pos)) (set-marker (make-marker) end-pos))
:callback :callback
(lambda (response info) (lambda (response info)
(if (not response) (if (not response)
(message "ChatGPT response failed with: %s" (plist-get info :status)) (message "ChatGPT response failed with: %s" (plist-get info :status))
(kill-region start-pos end-pos) (kill-region start-pos end-pos)
(insert response))))))) (insert response)))))))
) )
;; (use-package copilot (use-package copilot
;; :custom :custom
;; (copilot-max-char -1) (copilot-max-char -1)
;; (copilot-indent-offset-warning-disable 't) (copilot-indent-offset-warning-disable 't)
;; :hook (prog-mode org-mode) :hook (prog-mode org-mode)
;; :bind (("C-<tab>" . copilot-accept-completion))) :bind (("C-<tab>" . copilot-accept-completion)))
(use-package pass (use-package pass
:config :config

9
packages/packages.nix
View file

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