summary refs log tree commit diff stats
path: root/nix
diff options
context:
space:
mode:
authorAlan Pearce2017-08-31 18:28:16 +0200
committerAlan Pearce2017-08-31 18:28:16 +0200
commitc2a83cf8782be879f9cfad3f69c616455ae0259e (patch)
treea0e55f49a89bca4ce4dcd91410e2091c58b4834d /nix
parent6045fa207e8844b7b91cf56f2349094c29fd7719 (diff)
parent9da3e40568910e4fcee192064b0d41762e9fdf53 (diff)
downloadnixfiles-c2a83cf8782be879f9cfad3f69c616455ae0259e.tar.lz
nixfiles-c2a83cf8782be879f9cfad3f69c616455ae0259e.tar.zst
nixfiles-c2a83cf8782be879f9cfad3f69c616455ae0259e.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'nix')
-rw-r--r--nix/.config/nixpkgs/emacs.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/.config/nixpkgs/emacs.nix b/nix/.config/nixpkgs/emacs.nix
index 6ce3a210..aface0fa 100644
--- a/nix/.config/nixpkgs/emacs.nix
+++ b/nix/.config/nixpkgs/emacs.nix
@@ -51,8 +51,7 @@ in
     diminish
     bind-key
     use-package
-    smartparens
-    lentic
+    smartparens 
   ]) ++ (with epkgs.melpaPackages; [
     ace-link
     ace-window
@@ -107,6 +106,7 @@ in
     goto-chg
     haskell-mode
     highlight-stages
+    helpful
     imenu-anywhere
     indium
     jinja2-mode