flake: migrate to trivionomicon mkSystemFlake

2 files changed, 14 insertions, 91 deletions

diff --git a/flake.nix b/flake.nix
index e1fcbdb..4f9c5b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,98 +39,21 @@
     vpsadminos.url = "github:vpsfreecz/vpsadminos";
   };
 
-  outputs =
-    flakes@{ self
-    , nixpkgs
-    , unstable
-    , home-manager
-    , nur
-    , impermanence
-    , hm-isolation
-    , nixvirt
-    , flake-utils
-    , lanzaboote
-    , trivionomicon
-    , vpsadminos
-    }:
-    let
-      system = "x86_64-linux";
+  outputs = flakes: flakes.trivionomicon.lib.mkSystemFlake {
+    inherit flakes;
 
-      pkgs = importPkgs nixpkgs;
+    system = "x86_64-linux";
+    doctrinePrefix = "local";
 
-      importPkgs = flake: import flake {
-        inherit system;
+    paths = {
+      localOverlay = "pkgs";
+      nixpkgsConfig = "pkgs/config";
 
-        config = import ./pkgs/config nixpkgs.lib;
-        overlays = [ nur.overlays.default trivionomicon.overlays.default self.overlays.default ];
-      };
-
-      inherit (pkgs.local.lib) importAll;
-
-      local = import ./pkgs;
-    in
-    with pkgs.lib; {
-      formatter.${system} = pkgs.nixpkgs-fmt;
-      packages.${system} = pkgs.local;
-
-      overlays.default = final: prev:
-        let
-          locals = local final prev;
-        in
-        {
-          local = locals;
-          unstable = importPkgs unstable;
-        } // locals.override;
-
-      nixosConfigurations =
-        let
-          nixosSystem = { modules }: makeOverridable nixpkgs.lib.nixosSystem {
-            inherit modules pkgs system;
-
-            specialArgs = {
-              inherit flakes;
-              doctrine = import "${trivionomicon}/doctrine" {
-                inherit pkgs;
-                namespace = "sys";
-              };
-            };
-          };
+      nixosSource = "sys";
+      nixosPlatforms = "sys/platform";
 
-          hostConfig = host: nixosSystem {
-            modules = [
-              ./sys
-              host
-            ];
-          };
-        in
-        mapAttrs (_: hostConfig) (importAll { root = ./sys/platform; });
-
-      homeConfigurations =
-        let
-          registry = { ... }: {
-            config.nix.registry = mapAttrs
-              (_: value: { flake = value; })
-              flakes;
-          };
-
-          home = name: platform: home-manager.lib.homeManagerConfiguration {
-            inherit pkgs;
-
-            extraSpecialArgs = {
-              inherit flakes;
-              doctrine = import "${trivionomicon}/doctrine" {
-                inherit pkgs;
-                namespace = "hm";
-              };
-            };
-
-            modules = [
-              ./home
-              platform
-              registry
-            ];
-          };
-        in
-        mapAttrs home (importAll { root = ./home/platform; });
+      hmSource = "home";
+      hmPlatforms = "home/platform";
     };
+  };
 }
diff --git a/pkgs/config/default.nix b/pkgs/config/default.nix
index 6787b5e..03972e8 100644
--- a/pkgs/config/default.nix
+++ b/pkgs/config/default.nix
@@ -1,4 +1,4 @@
-lib: with lib; {
+{ lib }: {
   android_sdk.accept_license = true;
-  allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg);
+  allowUnfreePredicate = pkg: import ./unfree.nix lib (lib.getName pkg);
 }