diff --git a/flake.lock b/flake.lock index 49cc4b4..6763fcc 100644 --- a/flake.lock +++ b/flake.lock @@ -87,11 +87,11 @@ "extra-package-indent-bars": { "flake": false, "locked": { - "lastModified": 1710117442, - "narHash": "sha256-0p3PW2hbzGeUIVkUWow6OWpL3OspbId+yqEPV909g4k=", + "lastModified": 1712632727, + "narHash": "sha256-i1A4TlyhgEMqgqJmTQiT4fgWoUlelRFNC38XwuPSyGM=", "owner": "jdtsmith", "repo": "indent-bars", - "rev": "4583e3e9f507143cd4241131b77fc5e8b1722bbf", + "rev": "e20ba1caead519832221abad75cce75bf1787499", "type": "github" }, "original": { @@ -103,16 +103,16 @@ "extra-package-nix-ts-mode": { "flake": false, "locked": { - "lastModified": 1694965545, - "narHash": "sha256-HijDb+2ojDk1Evv/KEIrZ/xW+QXz6IJoUllniTsE3hs=", - "owner": "aciceri", + "lastModified": 1705596103, + "narHash": "sha256-jEUmhfLE7cFan4/PF4qBiEOLsjM3Q4iSDTlM+0CYwZg=", + "owner": "antifuchs", "repo": "nix-ts-mode", - "rev": "8da9a76cd014d56ee734553a32c9e006e375bce4", + "rev": "0ef4e663add03d026a1804f57ac7d5453a635b15", "type": "github" }, "original": { - "owner": "aciceri", - "ref": "improved", + "owner": "antifuchs", + "ref": "improve-indented-string-indentation", "repo": "nix-ts-mode", "type": "github" } diff --git a/init.el b/init.el index cc5d556..0fac8fa 100644 --- a/init.el +++ b/init.el @@ -141,7 +141,6 @@ (dired-mode . nerd-icons-dired-mode)) (use-package indent-bars - :after consult :custom (indent-bars-treesit-support t) (indent-bars-spacing-override 2) @@ -149,8 +148,6 @@ (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 @@ -641,13 +638,27 @@ (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)) + ;; :hook (eshell-mode . esh-autosuggest-mode) # FIXME otherwise emacs stucks + ) (use-package fish-completion-mode :hook ((eshell-mode . fish-completion-mode))) @@ -837,10 +848,14 @@ 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)) @@ -859,7 +874,10 @@ 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 '((copilot-mode 0) (copilot-mode -1)))) + '(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)))) (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 b29ac86..6cc07b7 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -97,6 +97,7 @@ pkgs: epkgs: let consult-notmuch poly-org casual + org-re-reveal ]) ++ (with elpaPackages; [ delight kind-icon