From e526e19d09e12a8778d07b05e9db3bb1f8f06b98 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Tue, 6 Sep 2022 16:50:59 -0500
Subject: [PATCH] updates to dalinar and home

---
 README.org                   | 13 +++++++++++--
 flake.nix                    |  3 ++-
 system/syl/configuration.nix |  3 ++-
 user/home.nix                |  4 ++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/README.org b/README.org
index bd26b58..f10f569 100644
--- a/README.org
+++ b/README.org
@@ -82,12 +82,13 @@ Both include the home-manager module. Primarily I chose that route so that I cou
       };
 
       lib = nixpkgs.lib;
+      # unstable = nixpkgs;
 
     in  {
       nixosConfigurations = {
         syl = lib.nixosSystem {
           inherit system;
-          inherit emacs;
+          # inherit emacs;
           modules = [
             ./system/syl/configuration.nix
             home-manager.nixosModules.home-manager
@@ -646,7 +647,11 @@ Notice how I am including all of my software here. It may be a big file, but hav
     <<overlays>>
   ];
 
-  <<emacs>>
+  services.emacs = {
+    enable = true;
+    package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
+  };
+
   <<samba>>
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -1589,6 +1594,10 @@ I also use home-manager for managing dotfiles. This means that everything is con
     source = ../fish/functions;
   };
 
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
+  programs.direnv.nix-direnv.enableFlakes = true;
+
   # programs.qutebrowser.enable = true;
   home.file.".config/qutebrowser/config.py" = {
     source = ../qutebrowser/config.py;
diff --git a/flake.nix b/flake.nix
index 7a66734..45c35fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,12 +55,13 @@
       };
 
       lib = nixpkgs.lib;
+      # unstable = nixpkgs;
 
     in  {
       nixosConfigurations = {
         syl = lib.nixosSystem {
           inherit system;
-          inherit emacs;
+          # inherit emacs;
           modules = [
             ./system/syl/configuration.nix
             home-manager.nixosModules.home-manager
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index 58e11df..e516a45 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -385,8 +385,9 @@
 
   services.emacs = {
     enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
+    package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ]));
   };
+
   services.samba-wsdd.enable = true;
   services.samba = {
     enable = true;
diff --git a/user/home.nix b/user/home.nix
index c8bdeac..2a3f610 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -340,6 +340,10 @@
     source = ../fish/functions;
   };
 
+  programs.direnv.enable = true;
+  programs.direnv.nix-direnv.enable = true;
+  programs.direnv.nix-direnv.enableFlakes = true;
+
   # programs.qutebrowser.enable = true;
   home.file.".config/qutebrowser/config.py" = {
     source = ../qutebrowser/config.py;