diff --git a/home/natto/config/emacs/config.org b/home/natto/config/emacs/config.org index 5dd4522..f0dcce1 100644 --- a/home/natto/config/emacs/config.org +++ b/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) diff --git a/home/natto/programs.nix b/home/natto/programs.nix index 7d0c0e2..edf740e 100644 --- a/home/natto/programs.nix +++ b/home/natto/programs.nix @@ -23,5 +23,6 @@ }; go.enable = true; password-store.enable = true; + direnv.enable = true; }; } diff --git a/home/natto/services.nix b/home/natto/services.nix index 74edbf1..e65ea87 100644 --- a/home/natto/services.nix +++ b/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"; diff --git a/overlays/emacs/default.nix b/overlays/emacs/default.nix index 20f396a..4a216e0 100644 --- a/overlays/emacs/default.nix +++ b/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; - package = emacsNativeComp; + inherit config package; alwaysEnsure = true; alwaysTangle = true; extraEmacsPackages = epkgs: with epkgs; [ diff --git a/overlays/packages.nix b/overlays/packages.nix index 4280a48..dbe9e5b 100644 --- a/overlays/packages.nix +++ b/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 { }; }