shell, treefmt: refactor

flake.nix

@@ -48,20 +48,11 @@
         systems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
 
         imports = [
+          inputs.treefmt-nix.flakeModule
+          ./shell.nix
           ./treefmt.nix
         ];
 
-        perSystem =
-          { config
-          , inputs'
-          , pkgs
-          , self'
-          , ...
-          }: {
-            devShells.default = pkgs.callPackage ./shell.nix {
-              inherit config;
-            };
-          };
         flake.nixosConfigurations =
           let
             inherit (inputs.nixpkgs.lib) nixosSystem;

shell.nix

@@ -1,21 +1,22 @@
-{ config
-, pkgs
-}:
-
-with pkgs;
-mkShellNoCC {
-  buildInputs = [
-    jq
-    sops
-    ssh-to-age
-    (python3.withPackages (
-      p: [
-        p.deploykit
-        p.invoke
-        p.requests
-      ]
-    ))
-    rsync
-    config.treefmt.build.wrapper
-  ];
+{
+  perSystem = { config, pkgs, ... }: {
+    devShells = {
+      default = with pkgs; mkShellNoCC {
+        buildInputs = [
+          jq
+          sops
+          ssh-to-age
+          (python3.withPackages (
+            p: [
+              p.deploykit
+              p.invoke
+              p.requests
+            ]
+          ))
+          rsync
+          config.treefmt.build.wrapper
+        ];
+      };
+    };
+  };
 }

treefmt.nix

@@ -1,7 +1,4 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.treefmt-nix.flakeModule
-  ];
+{
   perSystem = { pkgs, ... }: {
     treefmt = {
       # Used to find the project root