diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix index 57eb631..3f0b220 100644 --- a/programs/emacs/default.nix +++ b/programs/emacs/default.nix @@ -7,14 +7,13 @@ let # mkdir -p $out/share/emacs/site-lisp # cp ${defaultEl} $out/share/emacs/site-lisp/default.el #''; - emacsPackage = (pkgs.emacsPackagesGen pkgs.emacs).emacsWithPackages (epkgs: - #let - # lpkgs = import ./packages.nix { - # inherit config lib pkgs epkgs; - # }; - #in + let + lpkgs = import ./packages.nix { + inherit config lib pkgs epkgs; + }; + in #[ (defaultConfig lpkgs) ] ++ (with pkgs; [ # aspell # emacs-all-the-icons-fonts @@ -73,7 +72,7 @@ let use-package yaml-mode yasnippet - ])); + ] ++ (with lpkgs; [org-roam-ui]))); in { services.emacs = { diff --git a/programs/emacs/packages.nix b/programs/emacs/packages.nix new file mode 100644 index 0000000..273c95c --- /dev/null +++ b/programs/emacs/packages.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, epkgs, ...}: +let +in +with epkgs; rec{ + org-roam-ui = trivialBuild{ + pname = "org-roam-ui"; + version = "2021-10-06"; + src = pkgs.fetchFromGitHub { + owner = "org-roam"; + repo = "org-roam-ui"; + rev = "bae6487afd5e6eec9f04b38b235bbac24042ca62"; + sha256 = "14dbdvxf1l0dwbhc0ap3wr3ffafy4cxmwc9b7gm0gzzmcxvszisc"; + }; + packageRequires = [ f websocket org-roam simple-httpd ]; + postInstall = '' + cp -r out $out/share/emacs/site-lisp + ''; + }; +}