From 9c6072e87d7afe519c2f92c82a9e8b4bd3825193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 4 Dec 2022 21:40:42 +0100
Subject: nixos: move configurations from top level flake file

---
 flake.nix | 110 ++------------------------------------------------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 8279b30..f5ee8d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,118 +16,12 @@
     usbkey.url = "git+https://git.cynerd.cz/usbkey?ref=modules";
   };
 
-  outputs = { self
-    , nixpkgs, flake-utils, nixos-hardware, nix
-    , personal-secret
-    , nixturris, vpsadminos
-    , shellrc, usbkey, sterm
-  }:
+  outputs = { self, nixpkgs, nix, nixos-hardware, flake-utils, shellrc, ... }:
     with flake-utils.lib;
     {
       overlays.default = final: prev: import ./pkgs { inherit self; nixpkgs = prev; };
       nixosModules = import ./nixos self;
-
-      nixosConfigurations = let 
-
-        modules = hostname: [
-          self.nixosModules.default
-          self.nixosModules."machine-${hostname}"
-          shellrc.nixosModules.default
-          usbkey.nixosModules.default
-          (personal-secret.lib.personalSecrets hostname)
-          {
-            networking.hostName = hostname;
-            nixpkgs.overlays = [
-              self.overlays.default
-              sterm.overlay
-            ];
-          }
-        ];
-
-        genericSystem = {system ? "x86_64-linux", extra_modules ? []}:
-          hostname: {
-            ${hostname} = nixpkgs.lib.nixosSystem {
-              system = system;
-              modules = (modules hostname) ++ extra_modules;
-            };
-          };
-        amd64System = genericSystem { };
-        vpsSystem = genericSystem {
-          extra_modules = [
-            vpsadminos.nixosConfigurations.container
-            { boot.loader.systemd-boot.enable = false; }
-          ];
-        };
-        raspi2System = genericSystem {
-          system = "armv7l-linux";
-          extra_modules = [
-            nixos-hardware.nixosModules.raspberry-pi-2
-            nixturris.nixosModules.turris-crossbuild
-            nixturris.nixosModules.armv7l-overlay
-            ({pkgs, ...}: {
-              boot.loader.systemd-boot.enable = false;
-              boot.kernelPackages = pkgs.linuxPackages_latest;
-            })
-            { nixpkgs.overlays = [ (final: super: {
-                makeModulesClosure = x:
-                  super.makeModulesClosure (x // { allowMissing = true; });
-              })]; }
-          ];
-        };
-        raspi3System = genericSystem {
-          system = "aarch64-linux";
-          extra_modules = [
-            nixturris.nixosModules.turris-crossbuild
-            {
-              boot.loader.grub.enable = false;
-              boot.loader.systemd-boot.enable = false;
-              boot.loader.raspberryPi = {
-                enable = true; version = 3;
-              };
-            }
-          ];
-        };
-        beagleboneSystem = genericSystem {
-          system = "armv7l-linux";
-          extra_modules = [
-            nixturris.nixosModules.turris-crossbuild
-            nixturris.nixosModules.armv7l-overlay
-            {
-              boot.loader.grub.enable = false;
-              boot.loader.systemd-boot.enable = false;
-              boot.loader.generic-extlinux-compatible.enable = true;
-            }
-          ];
-        };
-
-        turrisSystem = board: hostname: {
-          ${hostname} = nixturris.lib.nixturrisSystem {
-            nixpkgs = nixpkgs;
-            board = board;
-            modules = modules hostname;
-          };
-        };
-        turrisMoxSystem = turrisSystem "mox";
-        turrisOmniaSystem = turrisSystem "omnia";
-
-      in
-        amd64System "albert" //
-        amd64System "binky" //
-        amd64System "errol" //
-        amd64System "ridcully" //
-        amd64System "susan" //
-        vpsSystem "lipwig" //
-        vpsSystem "mrpump" //
-        raspi2System "spt-mpd" //
-        raspi3System "adm-mpd" //
-        beagleboneSystem "gaspode" //
-        turrisMoxSystem "dean" //
-        turrisOmniaSystem "spt-omnia" //
-        turrisMoxSystem "spt-mox" //
-        turrisMoxSystem "spt-mox2" //
-        turrisOmniaSystem "adm-omnia" //
-        turrisOmniaSystem "adm-omnia2";
-
+      nixosConfigurations = import ./nixos/configurations.nix self;
     } // eachDefaultSystem (system: {
       packages = filterPackages system (flattenTree (
         import ./pkgs { inherit self; nixpkgs = nixpkgs.legacyPackages."${system}"; }
-- 
cgit v1.2.3