Reorganize imports to prevent infinite recursions

checks/default.nix

@@ -4,23 +4,17 @@
   pkgs,
   deployPkgs,
   ...
-}:
+}@inputs:
 {
   ${system} = {
 
-    # Check project formatting
+    # TODO: Check project formatting
-    format = pkgs.runCommand "nixfmt-check" { } ''
-      set -euo pipefail
-      cd ${self}
-      ${self.formatter.${system}}/bin/formatter . --check
-      mkdir $out
-    '';
 
     nixos-modules = pkgs.callPackage ./nixos-modules {
       inherit (self.lib) getSubDirs isFolderWithFile;
     };
 
-    #TODO(#29): Integration/System tests
+    nixos-configurations = import ./nixos-configurations inputs;
 
     # Import deploy-rs tests
   } // (deployPkgs.deploy-rs.lib.deployChecks self.deploy);

checks/nixos-configurations/default.nix

@@ -0,0 +1,4 @@
+{ self, pkgs, ... }:
+pkgs.linkFarmFromDrvs "all" (
+  pkgs.lib.mapAttrsToList (n: v: v.config.system.build.toplevel) self.nixosConfigurations
+)

checks/packages/default.nix

@@ -0,0 +1,5 @@
+{ self, pkgs, ... }:
+let
+  inherit (pkgs.lib) attrValues;
+in
+pkgs.linkFarmFromDrvs "all" (attrValues self.packages)

deploy/docs-ops/default.nix

@@ -1,6 +1,5 @@
 {
   deployPkgs,
-  pkgs,
   self,
   system,
   ...

flake.lock

@@ -111,10 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737552783,
+        "lastModified": 1742849713,
-        "narHash": "sha256-pJ2lp36L3++a5HtdN7ULcVpdB4j7yo90TDayWuAO+T8=",
+        "narHash": "sha256-EH3vvMdalGxxvYt3tZI4K4RKT/YAh7XejYYrf/jZ0N8=",
-        "rev": "33cf80043c64ddd6882268430454e3cbe98b692b",
+        "ref": "refs/heads/main",
-        "revCount": 11,
+        "rev": "f79080b8802eec4463bb4a25c64f82f73e6e31db",
+        "revCount": 12,
         "type": "git",
         "url": "file:./private"
       },

flake.nix

@@ -23,7 +23,12 @@
   };
 
   outputs =
-    { nixpkgs-nixos-unstable, deploy-rs, ... }@inputs:
+    {
+      self,
+      nixpkgs-nixos-unstable,
+      deploy-rs,
+      ...
+    }@inputs:
     let
       system = "x86_64-linux";
       # Packages for development and build process
@@ -40,22 +45,79 @@
           })
         ];
       };
-      importParams = inputs // {
+      importParams = {
-        inherit pkgs;
+        inherit (inputs)
-        inherit deployPkgs;
+          deploy-rs
-        inherit system;
+          disko
+          nixpkgs-nixos-stable
+          sops-nix
+          private
+          ;
+        inherit pkgs deployPkgs system;
+        flakeSelf = self;
       };
     in
     {
-      checks = import ./checks/default.nix importParams;
+      checks = import ./checks/default.nix (
-      deploy = import ./deploy/default.nix importParams;
+        importParams
-      devShells = import ./dev-shells/default.nix importParams;
+        // {
-      formatter.${system} = pkgs.writeShellScriptBin "formatter" ''
+          self = {
-        ${pkgs.findutils}/bin/find $1 -type f -name '*.nix' -exec ${pkgs.nixfmt-rfc-style}/bin/nixfmt ''${@:2} {} +
+            inherit (self)
-      '';
+              lib
-      nixosConfigurations = import ./nixos-configurations/default.nix importParams;
+              packages
-      nixosModules = import ./nixos-modules/default.nix importParams;
+              nixosModules
-      packages = import ./packages/default.nix importParams;
+              nixosConfigurations
-      lib = import ./lib/default.nix importParams;
+              deploy
+              ;
+          };
+        }
+      );
+      deploy = import ./deploy/default.nix (
+        importParams
+        // {
+          self = {
+            inherit (self)
+              lib
+              packages
+              nixosModules
+              nixosConfigurations
+              ;
+          };
+        }
+      );
+      devShells = import ./dev-shells/default.nix (
+        importParams
+        // {
+          self = {
+            inherit (self) lib packages;
+          };
+        }
+      );
+      formatter.${system} = pkgs.nixfmt-tree;
+      nixosConfigurations = import ./nixos-configurations/default.nix (
+        importParams
+        // {
+          self = {
+            inherit (self) lib packages nixosModules;
+          };
+        }
+      );
+      nixosModules = import ./nixos-modules/default.nix (
+        importParams
+        // {
+          self = {
+            inherit (self) lib packages;
+          };
+        }
+      );
+      packages = import ./packages/default.nix (
+        importParams
+        // {
+          self = {
+            inherit (self) lib packages;
+          };
+        }
+      );
+      lib = import ./lib/default.nix { inherit pkgs; };
     };
 }

nixos-configurations/default.nix

@@ -7,27 +7,23 @@
   ...
 }@inputs:
 let
+  inherit (pkgs.lib) genAttrs;
+  inherit (nixpkgs-nixos-stable.lib) nixosSystem;
   configs = self.lib.foldersWithNix ./.;
 in
-pkgs.lib.genAttrs configs (
+genAttrs configs (
   config:
-  nixpkgs-nixos-stable.lib.nixosSystem {
+  nixosSystem {
     system = "x86_64-linux";
     specialArgs = {
       inherit inputs;
     };
     modules = [
-      self.nixosModules.default
-      ./${config}/default.nix
       disko.nixosModules.disko
       sops-nix.nixosModules.sops
-      (
+      self.nixosModules.default
-        { ... }:
+      ./${config}/default.nix
-        {
+      ./secrets.nix
-          system.extraSystemBuilderCmds = "ln -s ${self} $out/nixos-configuration";
-          imports = [ ./secrets.nix ];
-        }
-      )
     ];
   }
 )

nixos-configurations/lindberg-build/applications/nixpkgs-cache.nix

@@ -1,8 +1,7 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   qois.nixpkgs-cache = {
     enable = true;
-    hostname = "nixpkgs-cache.qo.is";
     dnsResolvers = [ config.qois.meta.network.virtual.lindberg-vms-nat.hosts.lindberg.v4.ip ];
   };
 }

nixos-modules/default.nix

@@ -1,8 +1,9 @@
-inputs: {
+{ private, self, ... }:
+{
   default =
-    { config, pkgs, ... }:
+    { ... }:
     {
 
-      imports = (inputs.self.lib.loadSubmodulesFrom ./.) ++ [ inputs.private.nixosModules.default ];
+      imports = (self.lib.loadSubmodulesFrom ./.) ++ [ private.nixosModules.default ];
     };
 }

nixos-modules/nixpkgs-cache/default.nix

@@ -16,6 +16,7 @@ with lib;
     hostname = mkOption {
       type = types.str;
       example = "mycache.myhost.org";
+      default = "nixpkgs-cache.qo.is";
       description = "Hostname, under which the cache is served";
     };
 

nixos-modules/system/default.nix

@@ -57,7 +57,7 @@
     settings =
       let
         substituters = [
-          "https://${inputs.self.nixosConfigurations.lindberg-build.config.qois.nixpkgs-cache.hostname}?priority=39"
+          "https://${config.qois.nixpkgs-cache.hostname}?priority=39"
           "https://cache.nixos.org?priority=40"
           "https://attic.qo.is/qois-infrastructure"
         ];

nixos-modules/system/overlays.nix

@@ -7,6 +7,5 @@
 }:
 
 {
-  nixpkgs.overlays = [ (import ../../overlays) ];
   nix.nixPath = options.nix.nixPath.default;
 }

overlays/default.nix

@@ -1,5 +0,0 @@
-self: super: {
-  lib = (super.lib or { }) // {
-    qois = import ../lib { lib = self.lib; };
-  };
-}

packages/default.nix

@@ -1,37 +1,28 @@
 {
   self,
+  flakeSelf,
   system,
+  private,
   pkgs,
   ...
 }:
-with pkgs.lib;
+let
+  inherit (self.lib) foldersWithNix;
+  inherit (pkgs.lib)
+    path
+    genAttrs
+    ;
+in
 {
-  ${system} =
+  ${system} = genAttrs (foldersWithNix ./.) (
-    let
+    name:
-      packages = pipe (self.lib.foldersWithNix ./.) [
+    pkgs.callPackage (path.append ./. "./${name}/default.nix") {
-        (map (name: {
+      inherit
-          inherit name;
+        self
-          path = path.append ./. "./${name}/default.nix";
+        flakeSelf
-        }))
+        system
-        (map (
+        private
-          { name, path }:
+        ;
-          {
+    }
-            inherit name;
+  );
-            value = pkgs.callPackage path {
-              inherit self;
-              inherit system;
-            };
-          }
-        ))
-        listToAttrs
-      ];
-    in
-    packages
-    // {
-      default =
-        let
-          nixosConfigs = mapAttrsToList (n: v: v.config.system.build.toplevel) self.nixosConfigurations;
-        in
-        pkgs.linkFarmFromDrvs "all" (nixosConfigs ++ (attrValues packages));
-    };
 }

packages/deploy-qois/default.nix

@@ -1,6 +1,6 @@
 {
   deploy-rs,
-  self,
+  flakeSelf,
   writeShellApplication,
   ...
 }:
@@ -9,6 +9,6 @@ writeShellApplication {
   meta.description = "Deploy configuration to specificed targets.";
   runtimeInputs = [ deploy-rs ];
   text = ''
-    deploy --interactive --targets "''${@:-${self}}"
+    deploy --interactive --targets "''${@:-${flakeSelf}}"
   '';
 }

packages/docs/default.nix

@@ -3,12 +3,12 @@
   mdbook-plantuml,
   mdbook,
   plantuml,
-  self,
+  flakeSelf,
   stdenv,
   ...
 }:
 let
-  version = self.rev or self.dirtyRev;
+  version = flakeSelf.rev or flakeSelf.dirtyRev;
 in
 stdenv.mkDerivation {
   inherit version;
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
     mdbook-plantuml
     plantuml
   ];
-  src = self;
+  src = flakeSelf;
   buildPhase = "mdbook build --dest-dir $out";
 }

packages/sops-config/default.nix

@@ -3,7 +3,7 @@
   gnupg,
   lib,
   runCommand,
-  self,
+  private,
   ssh-to-age,
   writeText,
   ...
@@ -13,7 +13,7 @@ let
   metaHostConfigs = import ../../defaults/meta/hosts.nix { };
   userPgpKeys =
     let
-      keysFolder = "${self.inputs.private}/sops_keys";
+      keysFolder = "${private}/sops_keys";
       gpgFingerprintsFile =
         runCommand "userPgpKeys"
           {

private

@@ -1 +1 @@
-Subproject commit 33cf80043c64ddd6882268430454e3cbe98b692b
+Subproject commit f79080b8802eec4463bb4a25c64f82f73e6e31db