home/natto/emacs: add direnv and misc changes

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

home/natto/config/emacs/config.org

@@ -246,6 +246,13 @@ For autocomplete
   (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
 #+end_src
 
+** Direnv
+#+begin_src emacs-lisp
+(use-package direnv
+ :config
+ (direnv-mode))
+#+end_src
+
 ** Lang support
 #+begin_src emacs-lisp
 (use-package inform7)

home/natto/programs.nix

@@ -23,5 +23,6 @@
     };
     go.enable = true;
     password-store.enable = true;
+    direnv.enable = true;
   };
 }

home/natto/services.nix

@@ -6,7 +6,9 @@ in
   services = {
     baremacs = {
       enable = true;
-      package = pkgs.mymacs ./config/emacs/config.org;
+      package = pkgs.mymacs.override {
+        config = ./config/emacs/config.org;
+      };
       defaultEditor = {
         enable = false;
         editor = "emacsclient";

overlays/emacs/default.nix

@@ -4,15 +4,15 @@
 , fetchurl
 , fetchFromGitHub
 , emacsNativeComp
-, conf ? null
+, config ? null
+, package ? emacsNativeComp
 , ...
 }:
 
-assert (conf != null);
+assert (config != null);
 
 emacsWithPackagesFromUsePackage {
-  config = conf;
+  inherit config package;
-  package = emacsNativeComp;
   alwaysEnsure = true;
   alwaysTangle = true;
   extraEmacsPackages = epkgs: with epkgs; [

overlays/packages.nix

@@ -5,7 +5,7 @@ let
   mpd_discord_richpresence = call ./mpd-rpc { };
   customscripts = call ./customscripts { };
   gruvbox-icons = call ./gruvbox-icons { };
-  mymacs = c: call ./emacs { conf = c; };
+  mymacs = call ./emacs { };
   tlauncher = call ./tlauncher { };
   simp1e-cursors = call ./simp1e { };
 }