.github/workflows/build-then-cache.yaml

@@ -37,6 +37,3 @@ jobs:
       - run: 'nix develop .#ci --command nix-fast-build --eval-workers 1 --no-nom --skip-cache -f .#nixosConfigurations.slab.config.system.build.toplevel'
       - run: 'nix develop .#ci --command nix-fast-build --eval-workers 1 --no-nom --skip-cache -f .#nixosConfigurations.nullbox.config.system.build.toplevel'
       - run: 'nix develop .#ci --command nix-fast-build --eval-workers 1 --no-nom --skip-cache -f .#nixosConfigurations.nixos-wsl.config.system.build.toplevel'
-
-      # packages
-      - run: 'nix develop .#ci --command nix-fast-build --eval-workers 1 --no-nom --skip-cache -f .#redlib'

flake.nix

@@ -121,8 +121,6 @@
         # flake-parts imports
         imports = [
           ./flake
-          ./lib/nixfiles/module.nix
-          ./pkgs/module.nix
         ];
 
         config = {
@@ -435,7 +433,6 @@
               };
               default = pkgs.mkShell {
                 buildInputs = with pkgs; [
-                  alejandra
                   nix-update
                   inputs.agenix.packages.${system}.default
                 ];
@@ -447,7 +444,13 @@
             nixosModules = (import ./modules/nixos) moduleInputs;
             homeManagerModules = (import ./modules/home-manager) moduleInputs;
             packages = eachSystem (
-              system: {
+              system: let
+                pkgs = import nixpkgs-unstable {inherit system;};
+              in
+                (
+                  import ./pkgs {inherit pkgs;}
+                )
+                // {
                   iso = let
                     isoSystem = mkISOSystem system;
                   in

lib/nixfiles/default.nix

@@ -1,27 +1,8 @@
-{...} @ attrs: let
+{ pkgs, ... }:
-  # compatibility with old loading system (this looks awful fix this when i
+let
-  # fully migrate to flake-parts). this constructs an attrset that resembles
-  # what the old args used to look like in attrs', so i don't have to rewrite
-  # all of the glue. it creates a fake pkgs value containing only `lib`.
-  #
-  # actually no idk if i can fix this because it needs to be accessible from
-  # everything (flake, nixos/home-manager modules, maybe derivations). this
-  # might be the best way to do this so i can pass in either pkgs or lib based
-  # on the current context, and just return relevant libraries based on that
-  # input.
-  #
-  # create empty `pkgs` with lib only `lib` attr as fallback
-  pkgs = attrs.pkgs or {inherit (attrs) lib;};
-  # inherit lib from whatever `pkgs` happens to be
   inherit (pkgs) lib;
-
-  # compat
-  attrs' = attrs // {inherit pkgs;};
 in
 {
-    types = (import ./types.nix) attrs';
+  types = (import ./types.nix) { inherit pkgs; };
-  }
+  minecraft = (import ./minecraft.nix) { inherit pkgs; };
-  # only if an actual `pkgs` was passed
-  // lib.optionalAttrs (attrs ? pkgs) {
-    minecraft = (import ./minecraft.nix) attrs';
 }

lib/nixfiles/module.nix

@@ -1,11 +0,0 @@
-{lib, ...}: let
-  inherit (lib) types;
-  nixfiles-lib = (import ./.) {inherit lib;};
-in {
-  options.nixfiles.lib = lib.mkOption {
-    description = "nixfiles library";
-    type = types.attrs;
-    readOnly = true;
-    default = nixfiles-lib;
-  };
-}

pkgs/module.nix

@@ -1,51 +0,0 @@
-{
-  inputs,
-  self,
-  config,
-  lib,
-  options,
-  ...
-}: let
-  cfg = config.nixfiles.outputs.packages;
-  inherit (lib) mapAttrs mkEnableOption mkIf;
-in {
-  options.nixfiles.outputs.packages = {
-    enable =
-      mkEnableOption ""
-      // {
-        description = ''
-          Whether to generate the packages output.
-        '';
-        default = true;
-      };
-  };
-  config = mkIf cfg.enable {
-    perSystem = {
-      system,
-      inputs',
-      self',
-      pkgs,
-      ...
-    }: {
-      packages = let
-        inherit (pkgs) callPackage callPackages;
-
-        # i forget how this works so i'm not messing with it.
-        mopidyPackages = callPackages ./mopidy {
-          python = pkgs.python3;
-        };
-      in
-        (mapAttrs (_: v: callPackage v {}) {
-          google-fonts = ./google-fonts;
-          wm-helpers = ./wm-helpers;
-          atool = ./atool-wrapped;
-          nixfiles-assets = ./nixfiles-assets;
-          redlib = ./redlib;
-          cross-seed = ./cross-seed;
-        })
-        // {
-          inherit (mopidyPackages) mopidy-autoplay;
-        };
-    };
-  };
-}