lkjdsalkjldsa

flake.nix

@@ -200,29 +200,7 @@
       ;
 
     overlays = {
-      pbsdspkgs = final: prev: let
-        pkgs = final;
-        inherit (pkgs) lib;
-        # TODO: get faketty to work, ${expect}/bin/unbuffer is bad
-        wrapWithNom = pkg: pkgs.writeScriptBin pkg.meta.mainProgram ''
-          if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
-            exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe pkgs.nix-output-monitor}
-          else
-            exec ${lib.getExe pkg} -L "$@"
-          fi
-        '';
-      in {
-        pbsds = lib.makeScope pkgs.newScope (pbsds: {
-          nom-nixos-rebuild    = wrapWithNom pkgs.nixos-rebuild;
-          nom-nixos-rebuild-ng = wrapWithNom pkgs.nixos-rebuild-ng;
-          nom-home-manager     = wrapWithNom pkgs.home-manager;
-
-          v4l2-play = pkgs.callPackage ./pkgs/v4l2-play {};
-          device-mon = pkgs.callPackage ./pkgs/device-mon {};
-          #pdoc-docs  = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs;
-          #pdoc3-docs = (pkgs.callPackage ./pkgs/pdocs.nix {}).pdocs3;
-        });
-      };
+      pbsdspkgs = import ./overlays/pbsdspkgs.nix;
       wl-clipboard-timeout = import ./overlays/wl-clipboard-timeout.nix;
       default = self.overlays.pbsdspkgs;
     };

overlays/pbsdspkgs.nix

@@ -0,0 +1,27 @@
+final: prev:
+let
+  inherit (final) lib;
+
+  # TODO: get faketty to work, ${expect}/bin/unbuffer is bad
+  mkNomWrapper =
+    pkg:
+    final.writeScriptBin pkg.meta.mainProgram ''
+      if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
+        exec ${lib.getExe pkg} -L "$@" |& ${lib.getExe final.nix-output-monitor}
+      else
+        exec ${lib.getExe pkg} -L "$@"
+      fi
+    '';
+in
+{
+  pbsds = lib.makeScope final.newScope (pbsds: {
+    nom-nixos-rebuild = mkNomWrapper final.nixos-rebuild;
+    nom-nixos-rebuild-ng = mkNomWrapper final.nixos-rebuild-ng;
+    nom-home-manager = mkNomWrapper final.home-manager;
+
+    v4l2-play = final.callPackage ./../pkgs/v4l2-play { };
+    device-mon = final.callPackage ./../pkgs/device-mon { };
+    #pdoc-docs  = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs;
+    #pdoc3-docs = (final.callPackage ./../pkgs/pdocs.nix {}).pdocs3;
+  });
+}