7 files changed, 26 insertions, 20 deletions

diff --git a/.envrc b/.envrc
index eea1624..ee044cb 100644
--- a/.envrc
+++ b/.envrc
@@ -1,3 +1,3 @@
 use flake
-watch_file dev.nix
+watch_file dev/shell.nix
 dotenv_if_exists
diff --git a/.gitignore b/.gitignore
index 708042a..e45066e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 # nix build artifacts
 result*
 repl-result-out*
-gc-roots/
 
 # dev shell
 .pre-commit-config.yaml
diff --git a/dev/checks.nix b/dev/checks.nix
new file mode 100644
index 0000000..386e122
--- /dev/null
+++ b/dev/checks.nix
@@ -0,0 +1,13 @@
+{
+  perSystem = {config, ...}: {
+    pre-commit = {
+      settings.hooks = {
+        actionlint.enable = true;
+        ${config.formatter.pname}.enable = true;
+        deadnix.enable = true;
+        nil.enable = true;
+        statix.enable = true;
+      };
+    };
+  };
+}
diff --git a/ci.nix b/dev/ci.nix
index 1eb78e3..1eb78e3 100644
--- a/ci.nix
+++ b/dev/ci.nix
diff --git a/dev/default.nix b/dev/default.nix
new file mode 100644
index 0000000..d8da3fe
--- /dev/null
+++ b/dev/default.nix
@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./checks.nix
+    ./ci.nix
+    ./shell.nix
+  ];
+
+  perSystem = {pkgs, ...}: {
+    formatter = pkgs.alejandra;
+  };
+}
diff --git a/dev.nix b/dev/shell.nix
index 7ac4683..c0c9d20 100644
--- a/dev.nix
+++ b/dev/shell.nix
@@ -1,21 +1,10 @@
 {
   perSystem = {
-    lib,
     pkgs,
     config,
     inputs',
     ...
   }: {
-    pre-commit = {
-      settings.hooks = {
-        actionlint.enable = true;
-        ${config.formatter.pname}.enable = true;
-        deadnix.enable = true;
-        nil.enable = true;
-        statix.enable = true;
-      };
-    };
-
     devShells = {
       default = pkgs.mkShell {
         shellHook = config.pre-commit.installationScript;
@@ -35,14 +24,9 @@
             just
             jq
             opentofu
-
-            # ci
-            nix-eval-jobs
           ]
           ++ lib.optional stdenv.isLinux inputs'.agenix.packages.agenix;
       };
     };
-
-    formatter = pkgs.alejandra;
   };
 }
diff --git a/flake.nix b/flake.nix
index c580600..aaac59d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -142,13 +142,12 @@
         inputs.pre-commit.flakeModule
         inputs.nix2workflow.flakeModule
 
+        ./dev
         ./modules
         ./overlay
         ./systems
         ./tf
         ./users
-        ./ci.nix
-        ./dev.nix
       ];
 
       systems = [