Compare commits

..

4 commits

Author SHA1 Message Date
f4b44ddd30 flake.lock: Update
All checks were successful
/ test (push) Successful in 6m36s
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
0afba6526f
Bump deps
All checks were successful
/ test (push) Successful in 16s
2024-08-16 17:12:23 +02:00
386a004a1c
Disabled EAF 2024-08-16 17:12:15 +02:00
524b38e744
Things
All checks were successful
/ test (push) Successful in 27s
2024-08-16 17:08:16 +02:00
3 changed files with 24 additions and 38 deletions

6
flake.lock generated
View file

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

27
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
@ -820,12 +805,12 @@ This is meant to be an helper to be called from the window manager."
(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

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;
# })
] ]