From 83b5d14b98f6170ab899a9e34d21a93251ef9234 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Tue, 6 Aug 2024 21:14:26 +0200
Subject: [PATCH] Move nh and just into direnv dev-shell

---
 .envrc                     |  1 +
 flake/dev-shells.nix       | 21 +++++++++++++++------
 hosts/common.nix           |  5 +----
 hosts/inspiron/default.nix |  2 --
 hosts/north/default.nix    |  1 -
 5 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/flake/dev-shells.nix b/flake/dev-shells.nix
index 14c1fca..c4e4a47 100644
--- a/flake/dev-shells.nix
+++ b/flake/dev-shells.nix
@@ -2,12 +2,21 @@
   perSystem =
     { pkgs, ... }:
     {
-      devShells.sops = pkgs.mkShell {
-        packages = [
-          pkgs.sops
-          pkgs.age
-          pkgs.ssh-to-age
-        ];
+      devShells = {
+        default = pkgs.mkShell {
+          packages = [
+            pkgs.just
+            pkgs.nh
+          ];
+        };
+
+        sops = pkgs.mkShell {
+          packages = [
+            pkgs.sops
+            pkgs.age
+            pkgs.ssh-to-age
+          ];
+        };
       };
     };
 }
diff --git a/hosts/common.nix b/hosts/common.nix
index 9241ef3..e3b8f1f 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -52,10 +52,7 @@
     vimAlias = true;
   };
 
-  environment.systemPackages = [
-    pkgs.git
-    pkgs.just
-  ];
+  environment.systemPackages = [ pkgs.git ];
 
   nixpkgs.config.allowUnfreePredicate =
     pkg:
diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index c175ab0..7267ebc 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -31,6 +31,4 @@
       ssh.enable = true;
     };
   };
-
-  programs.nh.enable = true;
 }
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 0dd3188..80f3dcb 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -29,6 +29,5 @@
     };
   };
 
-  programs.nh.enable = true;
   programs.steam.enable = true;
 }