flake/dev: refactor devshell

Author: khaneliman

flake/dev/devshells.nix

@@ -5,6 +5,8 @@
       lib,
       inputs,
       self,
+      self',
+      system,
       ...
     }:
     let
@@ -51,33 +53,13 @@
 
       buildShell = name: {
         ${name} = import (shellsPath + "/${name}.nix") {
-          inherit lib;
+          inherit system self';
           inherit (devPkgs) mkShell;
           pkgs = devPkgs;
         };
       };
-
-      dynamicShells = lib.foldl' (acc: name: acc // buildShell name) { } shellNames;
     in
     {
-      devShells = dynamicShells // {
-        default = pkgs.mkShell {
-          name = "khanelidev";
-          packages = with pkgs; [
-            nixpkgs-fmt
-            statix
-            deadnix
-            nil
-          ];
-          shellHook = ''
-            echo "🚀 Khanelinix development environment"
-            echo "Available commands:"
-            echo "  nix flake check       - Run all checks"
-            echo "  nix fmt -- --no-cache - Format without cache"
-            echo "  statix check          - Check for anti-patterns"
-            echo "  deadnix               - Find unused code"
-          '';
-        };
-      };
+      devShells = lib.foldl' (acc: name: acc // buildShell name) { } shellNames;
     };
 }

flake/dev/shells/default.nix

@@ -1,8 +1,7 @@
 {
-  inputs,
   mkShell,
   pkgs,
-  system,
+  self',
   ...
 }:
 mkShell {
@@ -12,13 +11,16 @@ mkShell {
     nh
     statix
     sops
-    (inputs.treefmt-nix.lib.mkWrapper pkgs ../../treefmt.nix)
+    self'.formatter
   ];
 
   shellHook = ''
-    ${inputs.self.checks.${system}.pre-commit-hooks.shellHook}
-    echo 🔨 Welcome to Khanelinix! 
-
-
+    ${self'.checks.pre-commit-hooks.shellHook or ""}
+    echo "🚀 Khanelinix development environment"
+    echo "Available commands:"
+    echo "  nix flake check       - Run all checks"
+    echo "  nix fmt -- --no-cache - Format without cache"
+    echo "  statix check          - Check for anti-patterns"
+    echo "  deadnix               - Find unused code"
   '';
 }