From 9c33718aff2d11ceee02c57c9c25d3c0883e493d Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 21 Jun 2025 01:38:39 +0100
Subject: [PATCH] Extract dev-shell.nix module

---
 flake.nix                 | 52 +-------------------------------
 nix/modules/dev-shell.nix | 62 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 51 deletions(-)
 create mode 100644 nix/modules/dev-shell.nix

diff --git a/flake.nix b/flake.nix
index 8606726af..e9e90771d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,62 +11,12 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        inputs.devshell.flakeModule
+        ./nix/modules/dev-shell.nix
       ];
 
       perSystem =
         { pkgs, ... }:
-        let
-          php = pkgs.php83.buildEnv {
-            extraConfig = ''
-              upload_max_filesize = 50M;
-              post_max_size = 50M;
-            '';
-          };
-          phpPackages = pkgs.php83Packages;
-        in
         {
-          devshells.default = {
-            packages = with pkgs; [
-              just
-              lua-language-server
-              lua54Packages.luacheck
-              nixd
-              php
-              phpactor
-              phpPackages.composer
-              sqlite
-              tailwindcss_4
-              tailwindcss-language-server
-              watchman
-            ];
-
-            commands = [
-              {
-                name = "generate";
-                command = "vendor/bin/drush tome:static --uri https://www.oliverdavies.uk";
-                help = "Generate the static HTML";
-              }
-
-              {
-                name = "import";
-                command = "vendor/bin/drush tome:import";
-                help = "Re-import configuration, content and files";
-              }
-
-              {
-                name = "upload";
-                command = ''
-                  generate
-
-                  rsync -avzP html/ nixedo.oliverdavies.uk:/var/www/vhosts/website-tome \
-                    --delete --delete-after
-                '';
-                help = "Generate the static HTML and upload it to the server";
-              }
-            ];
-          };
-
           formatter = pkgs.nixfmt-rfc-style;
         };
     };
diff --git a/nix/modules/dev-shell.nix b/nix/modules/dev-shell.nix
new file mode 100644
index 000000000..893fde28b
--- /dev/null
+++ b/nix/modules/dev-shell.nix
@@ -0,0 +1,62 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.devshell.flakeModule
+  ];
+
+  perSystem =
+    { pkgs, ... }:
+    let
+      php = pkgs.php83.buildEnv {
+        extraConfig = ''
+          upload_max_filesize = 50M;
+          post_max_size = 50M;
+        '';
+      };
+
+      phpPackages = pkgs.php83Packages;
+    in
+    {
+      devshells.default = {
+        packages = with pkgs; [
+          just
+          lua-language-server
+          lua54Packages.luacheck
+          nixd
+          php
+          phpactor
+          phpPackages.composer
+          sqlite
+          tailwindcss_4
+          tailwindcss-language-server
+          watchman
+        ];
+
+        commands = [
+          {
+            name = "generate";
+            command = "vendor/bin/drush tome:static --uri https://www.oliverdavies.uk";
+            help = "Generate the static HTML";
+          }
+
+          {
+            name = "import";
+            command = "vendor/bin/drush tome:import";
+            help = "Re-import configuration, content and files";
+          }
+
+          {
+            name = "upload";
+            command = ''
+              generate
+
+              rsync -avzP html/ nixedo.oliverdavies.uk:/var/www/vhosts/website-tome \
+                --delete --delete-after
+            '';
+            help = "Generate the static HTML and upload it to the server";
+          }
+        ];
+      };
+    };
+}