From 4fbc25a0320ffaf7bba55b7ac7fb4bc17ad5ca71 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Wed, 7 Sep 2022 06:30:46 -0500
Subject: [PATCH] adding some tweaks and home manager to dalinar

---
 LightlyShaders/default.nix       | 4 ++--
 README.org                       | 2 +-
 fish/config.fish                 | 2 ++
 flake.nix                        | 1 +
 system/kaladin/configuration.nix | 1 -
 system/syl/configuration.nix     | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/LightlyShaders/default.nix b/LightlyShaders/default.nix
index 18242c7..19bc22e 100644
--- a/LightlyShaders/default.nix
+++ b/LightlyShaders/default.nix
@@ -23,12 +23,12 @@
 
 stdenv.mkDerivation rec {
   pname = "LightlyShaders";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "a-parhom";
     repo = "LightlyShaders";
-    rev = "4d649f8d9874b3ab251588fdaa2eac4bb74b1125";
+    rev = "04432c4a704d561541ae2be1f9907bb7bb783a2b";
     sha256 = "c/zbYmOXhl0xX+Rjw5eU48jQqA+OAxsh/pvWXo5bakA=";
   };
 
diff --git a/README.org b/README.org
index 9455821..74c35be 100644
--- a/README.org
+++ b/README.org
@@ -117,6 +117,7 @@ Both include the home-manager module. Primarily I chose that route so that I cou
           inherit system;
           modules = [
             ./system/dalinar/configuration.nix
+            home-manager.nixosModules.home-manager
           ];
         };
       };
@@ -404,7 +405,6 @@ airshipper
 Here are some dev tools that I often have on a few devices.
 #+NAME: dev-tools
 #+begin_src nix
-direnv
 android-tools
 nix-index
 meson
diff --git a/fish/config.fish b/fish/config.fish
index 970bc39..c1b9a0a 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -239,3 +239,5 @@ end
 
 # fm6000 -r -c blue
 any-nix-shell fish --info-right | source
+
+direnv hook fish | source
diff --git a/flake.nix b/flake.nix
index 45c35fe..8fad568 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,7 @@
           inherit system;
           modules = [
             ./system/dalinar/configuration.nix
+            home-manager.nixosModules.home-manager
           ];
         };
       };
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index 04d98d8..b311ffc 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -302,7 +302,6 @@
     lutris
     protonup
     # Dev tools
-    direnv
     android-tools
     nix-index
     meson
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index e516a45..8f022ee 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -318,7 +318,6 @@
     fet-sh
     macchina
     # Dev tools
-    direnv
     android-tools
     nix-index
     meson