nix: clean up devShells

Signed-off-by: Ophestra <cat@gensokyo.uk>

flake.nix

@@ -115,7 +115,40 @@
           };
           fsu = pkgs.callPackage ./cmd/fsu/package.nix { inherit (self.packages.${system}) fortify; };
 
-          dist = pkgs.runCommand "${fortify.name}-dist" { inherit (self.devShells.${system}.default) buildInputs; } ''
+          dist =
+            pkgs.runCommand "${fortify.name}-dist"
+              {
+                buildInputs =
+                  with pkgs;
+                  [
+                    go
+                    gcc
+                  ]
+                  # buildInputs
+                  ++ (
+                    with pkgsStatic;
+                    [
+                      musl
+                      libffi
+                      libseccomp
+                      acl
+                      wayland
+                      wayland-protocols
+                    ]
+                    ++ (with xorg; [
+                      libxcb
+                      libXau
+                      libXdmcp
+                    ])
+                  )
+                  # nativeBuildInputs
+                  ++ [
+                    pkg-config
+                    wayland-scanner
+                    makeBinaryWrapper
+                  ];
+              }
+              ''
                 # go requires XDG_CACHE_HOME for the build cache
                 export XDG_CACHE_HOME="$(mktemp -d)"
 
@@ -174,47 +207,12 @@
           pkgs = nixpkgsFor.${system};
         in
         {
-          default = pkgs.mkShell {
+          default = pkgs.mkShell { inherit (fortify) buildInputs; };
-            buildInputs =
+          withPackage = pkgs.mkShell { buildInputs = [ fortify ] ++ fortify.buildInputs; };
-              with pkgs;
-              [
-                go
-                gcc
-              ]
-              # buildInputs
-              ++ (
-                with pkgsStatic;
-                [
-                  musl
-                  libffi
-                  libseccomp
-                  acl
-                  wayland
-                  wayland-protocols
-                ]
-                ++ (with xorg; [
-                  libxcb
-                  libXau
-                  libXdmcp
-                ])
-              )
-              # nativeBuildInputs
-              ++ [
-                pkg-config
-                wayland-scanner
-                makeBinaryWrapper
-              ];
-          };
-
           fhs = fhs.env;
 
-          withPackage = nixpkgsFor.${system}.mkShell {
-            buildInputs = [ self.packages.${system}.fortify ] ++ self.devShells.${system}.default.buildInputs;
-          };
-
           generateDoc =
             let
-              pkgs = nixpkgsFor.${system};
               inherit (pkgs) lib;
 
               doc =
@@ -233,7 +231,7 @@
                 sed -i '/*Declared by:*/,+1 d' $out
               '';
             in
-            nixpkgsFor.${system}.mkShell {
+            pkgs.mkShell {
               shellHook = ''
                 exec cat ${docText} > options.md
               '';