diff --git a/flake.lock b/flake.lock index 551fee3..0dcac3a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713345229, - "narHash": "sha256-w+bJEnQfkbLacV4gh1DRu5dAA7pHm4KljYTVY33h4So=", + "lastModified": 1713258374, + "narHash": "sha256-Zi/Iu6uKH9KR1wnd1Ll+5nNQch4Vo2rSaoEJ3oObnv8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0334220804cb13f86e1e7ba83b135c9fbffa9d89", + "rev": "433c54490f99473a5fb9d41e857044a62ffa9baf", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1713279232, - "narHash": "sha256-usa8xpg2dvXwFcQf8gKSZ+kOy6EGJ+e2mkvGAjEX66o=", + "lastModified": 1713270255, + "narHash": "sha256-qLERiwntXDgoLYT1LqtDMSCdrAA/tsevbV2qn/yLrFc=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "88261051823961f0fc60c3c76b0cf2bae4ab32e4", + "rev": "0af707c007502ac5016b6afed7b00119602677b9", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { diff --git a/init.el b/init.el index 0fac8fa..cc5d556 100644 --- a/init.el +++ b/init.el @@ -141,6 +141,7 @@ (dired-mode . nerd-icons-dired-mode)) (use-package indent-bars + :after consult :custom (indent-bars-treesit-support t) (indent-bars-spacing-override 2) @@ -148,6 +149,8 @@ (indent-bars-color-by-depth '(:regexp "outline-\\([0-9]+\\)" :blend 0.4)) (indent-bars-no-stipple-char (string-to-char "┋")) (indent-bars-prefer-character 't) ;; so it works also in terminal + ;; :config + ;; (add-hook 'enable-theme-functions #'(lambda (&rest _) (indent-bars-reset))) ) (use-package diredfl @@ -638,27 +641,13 @@ (add-to-list 'eshell-modules-list 'eshell-tramp) ;; to use sudo in eshell ;; (add-to-list 'eshell-modules-list 'eshell-smart) ;; plan 9 style - (setq ccr/eshell-aliases - '((g . magit) - (gl . magit-log) - (d . dired) - (o . find-file) - (oo . find-file-other-window) - (l . (lambda () (eshell/ls '-la))) - (eshell/clear . eshell/clear-scrollback))) - - (mapc (lambda (alias) - (defalias (car alias) (cdr alias))) - ccr/eshell-aliases) - :hook (eshell-mode . (lambda () (setq-local scroll-margin 0))) :bind (("C-c o e" . project-eshell) :map eshell-mode-map ("C-r" . ccr/eshell-history))) ;; i.e. just C-r in semi-char-mode (use-package esh-autosuggest - ;; :hook (eshell-mode . esh-autosuggest-mode) # FIXME otherwise emacs stucks - ) + :hook (eshell-mode . esh-autosuggest-mode)) (use-package fish-completion-mode :hook ((eshell-mode . fish-completion-mode))) @@ -848,14 +837,10 @@ This is meant to be an helper to be called from the window manager." (notmuch-show-logo nil) (send-mail-function 'sendmail-send-it)) -(use-package alert - :config - (alert "Emacs started") - :custom - (alert-default-style 'notifications)) - (use-package notmuch-notify :hook (notmuch-hello-refresh . notmuch-notify-hello-refresh-status-message) + :custo + (alert-default-style 'notifications) :config (notmuch-notify-set-refresh-timer)) @@ -874,10 +859,7 @@ This is meant to be an helper to be called from the window manager." "b5c3c59e2fff6877030996eadaa085a5645cc7597f8876e982eadc923f597aca" default)) '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") '(org-fold-catch-invisible-edits 'show-and-error nil nil "Customized with use-package org") - '(safe-local-variable-values - '((eval progn (require 'org-re-reveal) - (add-hook 'after-save-hook #'org-re-reveal-export-to-html nil t)) - (copilot-mode 0) (copilot-mode -1)))) + '(safe-local-variable-values '((copilot-mode 0) (copilot-mode -1)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/packages/packages.nix b/packages/packages.nix index fb309eb..b29ac86 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -96,8 +96,7 @@ pkgs: epkgs: let notmuch consult-notmuch poly-org - # casual - org-re-reveal + casual ]) ++ (with elpaPackages; [ delight kind-icon