From ae3b8d2c4ac4b16f77d88efddf0a0f10a67cc8d2 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Mon, 11 Nov 2024 22:29:39 +0100
Subject: [PATCH] Put dev-shells back in flake.nix for automatic reload Add
 colmena to dev shell

---
 dev-shells.nix | 12 ------------
 flake.nix      | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 dev-shells.nix

diff --git a/dev-shells.nix b/dev-shells.nix
deleted file mode 100644
index 2d9ff4d..0000000
--- a/dev-shells.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  self,
-  nixpkgs,
-  flake-utils,
-  ...
-}:
-flake-utils.lib.eachDefaultSystem (system: {
-  devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
-    inherit (self.checks.${system}.pre-commit-check) shellHook;
-    buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
-  };
-})
diff --git a/flake.nix b/flake.nix
index 262f27e..b1b068b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,13 +52,25 @@
     };
   };
 
-  outputs = inputs @ {flake-utils, ...}:
-    flake-utils.lib.meld inputs [
+  outputs = inputs @ {
+    self,
+    nixpkgs,
+    flake-utils,
+    ...
+  }:
+    (flake-utils.lib.meld inputs [
       ./packages.nix
       ./formatter.nix
       ./nixos-configurations.nix
       ./checks.nix
-      ./dev-shells.nix
       ./colmena.nix
-    ];
+    ])
+    // flake-utils.lib.eachDefaultSystem (system: {
+      devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
+        inherit (self.checks.${system}.pre-commit-check) shellHook;
+        buildInputs =
+          self.checks.${system}.pre-commit-check.enabledPackages
+          ++ (with nixpkgs.legacyPackages.${system}; [colmena]);
+      };
+    });
 }