From d5c36191180f72726fd12ce36f2db7ffa977fb61 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Thu, 18 Jun 2020 22:48:19 -0400 Subject: feat(g/emacs): Install dottime from depot via nix To test out emacs package installs from depot Change-Id: Ia8bb370d671c566c6ce8de08b47925ec3a1653e4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/493 Reviewed-by: glittershark --- users/glittershark/emacs.d/init.el | 3 +++ users/glittershark/system/home/modules/emacs.nix | 13 +++++++++++-- users/glittershark/system/home/modules/lib/depot.nix | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 users/glittershark/system/home/modules/lib/depot.nix diff --git a/users/glittershark/emacs.d/init.el b/users/glittershark/emacs.d/init.el index 59e34b0bf8..eda79b2ed8 100644 --- a/users/glittershark/emacs.d/init.el +++ b/users/glittershark/emacs.d/init.el @@ -167,6 +167,9 @@ ;; provides a Spacemacs-inspired keybinding scheme and a smartparens ;; config. Use it as a reference for your own modules. (default +bindings +smartparens)) + +(appendq! load-path (split-string (getenv "EMACSLOADPATH") ":")) + (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/users/glittershark/system/home/modules/emacs.nix b/users/glittershark/system/home/modules/emacs.nix index 3f82880d2b..d7cd0ecc8d 100644 --- a/users/glittershark/system/home/modules/emacs.nix +++ b/users/glittershark/system/home/modules/emacs.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, config, ... }: with lib; @@ -9,8 +9,14 @@ let # doomPrivateDir = ./doom.d; # Directory containing your config.el init.el # # and packages.el files # }; + + + depot = config.lib.depot; in { - imports = [ ./lib/cloneRepo.nix ]; + imports = [ + ./lib/cloneRepo.nix + ./lib/depot.nix + ]; # home.packages = [ doom-emacs ]; # home.file.".emacs.d/init.el".text = '' @@ -48,6 +54,9 @@ in { programs.emacs = { enable = true; package = pkgs.emacsUnstable; + extraPackages = (epkgs: [ + depot.tools.emacs-pkgs.dottime + ]); }; grfn.impure.clonedRepos = { diff --git a/users/glittershark/system/home/modules/lib/depot.nix b/users/glittershark/system/home/modules/lib/depot.nix new file mode 100644 index 0000000000..b0bc40acce --- /dev/null +++ b/users/glittershark/system/home/modules/lib/depot.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: + +{ + lib.depot = import ~/code/depot {}; +} -- cgit 1.4.1