diff --git a/flake.lock b/flake.lock index 3bde280..98a7cbd 100644 --- a/flake.lock +++ b/flake.lock @@ -511,6 +511,22 @@ "type": "github" } }, + "org-nursery": { + "flake": false, + "locked": { + "lastModified": 1684554851, + "narHash": "sha256-2qV19PET2WRKLeeTHkEAY8mP/5THlnymtu3isij6ay8=", + "owner": "chrisbarrett", + "repo": "nursery", + "rev": "8301db1405dc7a5f57f8c2af95195890afe6cca2", + "type": "github" + }, + "original": { + "owner": "chrisbarrett", + "repo": "nursery", + "type": "github" + } + }, "org-yt": { "flake": false, "locked": { @@ -566,6 +582,7 @@ "home-manager": "home-manager", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", + "org-nursery": "org-nursery", "rust-overlay": "rust-overlay", "stylix": "stylix" } diff --git a/flake.nix b/flake.nix index 911e2f1..f0181e2 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,13 @@ url = "github:emacs-eaf/eaf-browser"; flake = false; }; + org-nursery = { + url = "github:chrisbarrett/nursery"; + flake = false; + }; }; - outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, eaf, eaf-browser, rust-overlay, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, eaf, eaf-browser, org-nursery, rust-overlay, ... }@inputs: let system = "x86_64-linux"; name = "emmet"; @@ -63,6 +67,7 @@ myBackgroundSha256 = backgroundSha256; inherit (inputs) eaf; inherit (inputs) eaf-browser; + inherit (inputs) org-nursery; }; }; }; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 667e717..795cee4 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -24,6 +24,8 @@ (setq custom-theme-directory "~/.emacs.d/themes") (setq doom-theme 'doom-stylix) (setq doom-font (font-spec :family "Inconsolata" :size 20)) +;; +unicode-init-fonts-h often errors out +(remove-hook 'doom-init-ui-hook '+unicode-init-fonts-h) ;; Transparent background (set-frame-parameter (selected-frame) 'alpha '(90 . 90)) @@ -669,6 +671,11 @@ same directory as the org-buffer and insert a link to this file." (add-hook 'org-mode-hook 'org-roam-olivetti-mode) +(add-load-path! "~/.emacs.d/org-nursery/lisp") +(require 'org-roam-dblocks) +(use-package org-roam-dblocks + :hook (org-mode . org-roam-dblocks-autoupdate-mode)) + (setq org-id-extra-files 'org-agenda-text-search-extra-files) ;(add-to-list 'display-buffer-alist '("^\\ORUI" display-buffer-in-side-window diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 2b33226..06e0e3c 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, eaf, eaf-browser, ... }: +{ config, lib, pkgs, eaf, eaf-browser, org-nursery, ... }: { programs.doom-emacs = { @@ -39,4 +39,7 @@ popd; "; }; + home.file.".emacs.d/org-nursery" = { + source = "${org-nursery}"; + }; } diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 538fea4..e399437 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -76,6 +76,8 @@ I use this functionality to load my private config file with non-public informat (setq custom-theme-directory "~/.emacs.d/themes") (setq doom-theme 'doom-stylix) (setq doom-font (font-spec :family "Inconsolata" :size 20)) +;; +unicode-init-fonts-h often errors out +(remove-hook 'doom-init-ui-hook '+unicode-init-fonts-h) ;; Transparent background (set-frame-parameter (selected-frame) 'alpha '(90 . 90)) @@ -998,7 +1000,9 @@ styletree.write('styles.xml') #+END_SRC *** TODO Org Roam Dynamic Blocks This needs fixing on NixOS: -#+BEGIN_SRC emacs-lisp +#+BEGIN_SRC emacs-lisp :tangle config.el +(add-load-path! "~/.emacs.d/org-nursery/lisp") +(require 'org-roam-dblocks) (use-package org-roam-dblocks :hook (org-mode . org-roam-dblocks-autoupdate-mode))