Compare commits

..

6 commits

Author SHA1 Message Date
Emmet d6dc86d4c8 Updated system 2024-06-29 19:00:27 -05:00
Emmet 46257ff011 Revert bad mu4e optimizations 2024-06-29 19:00:20 -05:00
Emmet f574841f13 Start emacs via systemd 2024-06-29 19:00:03 -05:00
Emmet 8302bce90d (slightly) faster mu4e loading (I think) 2024-06-29 15:43:20 -05:00
Emmet e97051872a Use ripgrep in emacs 2024-06-29 11:53:35 -05:00
Emmet 23a8f9ad3a Simplify mutli-org-roam-agenda loading 2024-06-29 11:50:45 -05:00
5 changed files with 49 additions and 52 deletions

View file

@ -117,11 +117,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719001847, "lastModified": 1719456570,
"narHash": "sha256-dt/UEjcTSxkmsC+zZvGS2+Y6c2CFjo6Hn3WAhokFAkk=", "narHash": "sha256-FS9+w+9QPBd6hCtX7C5x/xm4nGCA0lOtYgjefkQNbbg=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "05a9ae6098bb2f09eb1d35cb440a086a9a85d39c", "rev": "0f8be09978187ba0e4eab2a9e0dcde88f358f1dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,11 +472,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719037157, "lastModified": 1719677234,
"narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -896,11 +896,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719506693,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +943,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1718811006, "lastModified": 1719234068,
"narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "rev": "90bd1b26e23760742fdcb6152369919098f05417",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1172,11 +1172,11 @@
"org-sliced-images": { "org-sliced-images": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718918908, "lastModified": 1719203338,
"narHash": "sha256-Pcz+e26qVsZMNEBbzjdrOUUib9ozLG1gY6Ry/l8e+qM=", "narHash": "sha256-wi8G6AHWWbAFBPGsZSSOVIOBqrzfdOhzgTfUNe4fAEc=",
"owner": "jcfk", "owner": "jcfk",
"repo": "org-sliced-images", "repo": "org-sliced-images",
"rev": "43d4f4147ed4cd670aab8a2d9fdfe3c0edd289c9", "rev": "b98b88a55eff07e998e7789e0bf7307dd71db050",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1351,11 +1351,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1719109180, "lastModified": 1719627476,
"narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1411,11 +1411,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1719152448, "lastModified": 1719525570,
"narHash": "sha256-Acbi1Crd+UEbpPW8IR0ZGRKV+JCnMXDS2cglFQJvRPM=", "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "0fc4e9f1449a9dce4be7a1ecedd97949da591181", "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -204,6 +204,10 @@
;; For camelCase ;; For camelCase
(global-subword-mode 1) (global-subword-mode 1)
;; ripgrep as grep
(setq grep-command "rg -nS --no-heading "
grep-use-null-device nil)
;; Mini-frames ;; cool but kinda suboptimal atm ;; Mini-frames ;; cool but kinda suboptimal atm
;(add-load-path! "~/.emacs.d/mini-frame") ;(add-load-path! "~/.emacs.d/mini-frame")
;(require 'mini-frame) ;(require 'mini-frame)
@ -699,6 +703,8 @@ If the path from LINK does not exist, nil is returned."
org-roam-db-choice) org-roam-db-choice)
) )
(setq org-roam-list-files-commands '(rg))
(setq full-org-roam-db-list nil) (setq full-org-roam-db-list nil)
(setq full-org-roam-db-list (directory-files "~/Org" t "\\.[p,s]$")) (setq full-org-roam-db-list (directory-files "~/Org" t "\\.[p,s]$"))
@ -882,27 +888,18 @@ If the path from LINK does not exist, nil is returned."
) )
) )
(defun org-roam-append-notes-to-agenda (tag-name db)
(org-roam-switch-db db t)
; (org-roam-dailies-apply-old-todos-tags-to-all)
(setq org-agenda-files (append org-agenda-files (org-roam-list-notes-by-tag "todos")))
)
(defun org-roam-append-ids-to-org-id-files (db)
(org-roam-switch-db db t)
(setq org-id-files (append org-id-files (org-roam-list-files)))
)
;; Refreshing org roam agenda ;; Refreshing org roam agenda
(defun org-roam-refresh-agenda-list () (defun org-roam-refresh-agenda-list ()
(interactive) (interactive)
(setq prev-org-roam-db-choice org-roam-db-choice) (setq prev-org-roam-db-choice org-roam-db-choice)
(setq org-agenda-files '()) (setq org-agenda-files '())
(setq org-id-files '()) (setq org-id-files '())
(dolist (DB full-org-roam-db-list-pretty) (setq org-roam-directory (file-truename "~/Org")
(org-roam-append-notes-to-agenda "todos" DB) org-roam-db-location (file-truename "~/Org/org-roam.db")
(org-roam-append-ids-to-org-id-files DB) org-directory (file-truename "~/Org/"))
) (org-roam-db-sync)
(setq org-agenda-files (org-roam-list-notes-by-tag "todos"))
(setq org-id-files (org-roam-list-files))
(setq org-agenda-files (-uniq org-agenda-files)) (setq org-agenda-files (-uniq org-agenda-files))
(org-roam-switch-db prev-org-roam-db-choice 1) (org-roam-switch-db prev-org-roam-db-choice 1)
) )

View file

@ -41,6 +41,8 @@ in
# End block # End block
}; };
services.emacs.enable = true;
home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors { home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
template = builtins.readFile ./themes/doom-stylix-theme.el.mustache; template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
extension = ".el"; extension = ".el";

View file

@ -267,6 +267,10 @@ Doom Emacs is traditionally installed by cloning the repository ([[https://githu
;; For camelCase ;; For camelCase
(global-subword-mode 1) (global-subword-mode 1)
;; ripgrep as grep
(setq grep-command "rg -nS --no-heading "
grep-use-null-device nil)
;; Mini-frames ;; cool but kinda suboptimal atm ;; Mini-frames ;; cool but kinda suboptimal atm
;(add-load-path! "~/.emacs.d/mini-frame") ;(add-load-path! "~/.emacs.d/mini-frame")
;(require 'mini-frame) ;(require 'mini-frame)
@ -835,6 +839,8 @@ exit
org-roam-db-choice) org-roam-db-choice)
) )
(setq org-roam-list-files-commands '(rg))
#+END_SRC #+END_SRC
*** Multi Org Roam Configuration *** Multi Org Roam Configuration
#+BEGIN_SRC emacs-lisp :tangle config.el #+BEGIN_SRC emacs-lisp :tangle config.el
@ -1027,27 +1033,18 @@ exit
) )
) )
(defun org-roam-append-notes-to-agenda (tag-name db)
(org-roam-switch-db db t)
; (org-roam-dailies-apply-old-todos-tags-to-all)
(setq org-agenda-files (append org-agenda-files (org-roam-list-notes-by-tag "todos")))
)
(defun org-roam-append-ids-to-org-id-files (db)
(org-roam-switch-db db t)
(setq org-id-files (append org-id-files (org-roam-list-files)))
)
;; Refreshing org roam agenda ;; Refreshing org roam agenda
(defun org-roam-refresh-agenda-list () (defun org-roam-refresh-agenda-list ()
(interactive) (interactive)
(setq prev-org-roam-db-choice org-roam-db-choice) (setq prev-org-roam-db-choice org-roam-db-choice)
(setq org-agenda-files '()) (setq org-agenda-files '())
(setq org-id-files '()) (setq org-id-files '())
(dolist (DB full-org-roam-db-list-pretty) (setq org-roam-directory (file-truename "~/Org")
(org-roam-append-notes-to-agenda "todos" DB) org-roam-db-location (file-truename "~/Org/org-roam.db")
(org-roam-append-ids-to-org-id-files DB) org-directory (file-truename "~/Org/"))
) (org-roam-db-sync)
(setq org-agenda-files (org-roam-list-notes-by-tag "todos"))
(setq org-id-files (org-roam-list-files))
(setq org-agenda-files (-uniq org-agenda-files)) (setq org-agenda-files (-uniq org-agenda-files))
(org-roam-switch-db prev-org-roam-db-choice 1) (org-roam-switch-db prev-org-roam-db-choice 1)
) )
@ -2126,6 +2123,8 @@ in
# End block # End block
}; };
services.emacs.enable = true;
home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors { home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
template = builtins.readFile ./themes/doom-stylix-theme.el.mustache; template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
extension = ".el"; extension = ".el";

View file

@ -57,7 +57,6 @@ in
exec-once = GOMAXPROCS=1 syncthing --no-browser exec-once = GOMAXPROCS=1 syncthing --no-browser
exec-once = protonmail-bridge --noninteractive exec-once = protonmail-bridge --noninteractive
exec-once = waybar exec-once = waybar
exec-once = emacs --daemon
exec-once = hypridle exec-once = hypridle
exec-once = sleep 5 && libinput-gestures exec-once = sleep 5 && libinput-gestures