Compare commits
3 commits
d1e561944e
...
2c9cbea84f
Author | SHA1 | Date | |
---|---|---|---|
2c9cbea84f | |||
4e7fec653a | |||
29f2bd443c |
3 changed files with 60 additions and 41 deletions
66
flake.lock
generated
66
flake.lock
generated
|
@ -7,11 +7,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710320774,
|
||||
"narHash": "sha256-TrLaYznIzUGy4vIRw4hDDlOKuF/vDD1J49cLtkxvgAI=",
|
||||
"lastModified": 1713345229,
|
||||
"narHash": "sha256-w+bJEnQfkbLacV4gh1DRu5dAA7pHm4KljYTVY33h4So=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "c68aeff603f1b5c4cc7a57b876cf5e7101f2f21c",
|
||||
"rev": "0334220804cb13f86e1e7ba83b135c9fbffa9d89",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -71,11 +71,11 @@
|
|||
"extra-package-copilot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1710320315,
|
||||
"narHash": "sha256-YY/6vODg2MSPMi+61Ii5aQiDQS5B6YPMP1VP1dDNOLs=",
|
||||
"lastModified": 1713189314,
|
||||
"narHash": "sha256-53BGX2llkrM5mDmFSVe+O/Vo4F2gDJTFh/4TqBuQme8=",
|
||||
"owner": "zerolfx",
|
||||
"repo": "copilot.el",
|
||||
"rev": "57d5e670786ca8156772c6dcb38e6ff67c5efd62",
|
||||
"rev": "edf517a57f539eb41eaa2f92c6752538f3a62b72",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -87,11 +87,11 @@
|
|||
"extra-package-indent-bars": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1710117442,
|
||||
"narHash": "sha256-0p3PW2hbzGeUIVkUWow6OWpL3OspbId+yqEPV909g4k=",
|
||||
"lastModified": 1713279232,
|
||||
"narHash": "sha256-usa8xpg2dvXwFcQf8gKSZ+kOy6EGJ+e2mkvGAjEX66o=",
|
||||
"owner": "jdtsmith",
|
||||
"repo": "indent-bars",
|
||||
"rev": "4583e3e9f507143cd4241131b77fc5e8b1722bbf",
|
||||
"rev": "88261051823961f0fc60c3c76b0cf2bae4ab32e4",
|
||||
"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"
|
||||
}
|
||||
|
@ -138,11 +138,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709336216,
|
||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -195,11 +195,11 @@
|
|||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710309369,
|
||||
"narHash": "sha256-pQo1vDEEyULfvTQeqZixryrDVpGICzGBtj4uIfP4cs0=",
|
||||
"lastModified": 1710478346,
|
||||
"narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "9cc7ed20043adf381f1b8354c54ba667b527d538",
|
||||
"rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -210,11 +210,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"lastModified": 1713248628,
|
||||
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -227,11 +227,11 @@
|
|||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -244,11 +244,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1710162809,
|
||||
"narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
|
||||
"lastModified": 1713145326,
|
||||
"narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
|
||||
"rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -260,11 +260,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1709961763,
|
||||
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
|
||||
"lastModified": 1710272261,
|
||||
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
|
||||
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
32
init.el
32
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.
|
||||
|
|
|
@ -96,7 +96,8 @@ pkgs: epkgs: let
|
|||
notmuch
|
||||
consult-notmuch
|
||||
poly-org
|
||||
casual
|
||||
# casual
|
||||
org-re-reveal
|
||||
]) ++ (with elpaPackages; [
|
||||
delight
|
||||
kind-icon
|
||||
|
|
Reference in a new issue