From 8637113f7c6db313fdd658973864b565b659609e Mon Sep 17 00:00:00 2001
From: kekrby <kekrby@gmail.com>
Date: Tue, 6 Dec 2022 20:40:19 +0300
Subject: [PATCH] t2-iso-minimal, t2-iso-gnome: move common imports to
 common.nix

---
 nix/common.nix         | 7 ++++++-
 nix/t2-iso-gnome.nix   | 4 +---
 nix/t2-iso-minimal.nix | 4 +---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/nix/common.nix b/nix/common.nix
index 1d62fb2..c7f77b7 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -1,6 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, modulesPath, nixos-hardware, ... }:
 
 {
+  imports = [
+    "${modulesPath}/installer/cd-dvd/channel.nix"
+    nixos-hardware.nixosModules.apple-t2
+  ];
+
   nix.settings = {
     trusted-substituters = [
       "https://t2linux.cachix.org"
diff --git a/nix/t2-iso-gnome.nix b/nix/t2-iso-gnome.nix
index 2488722..2fc341a 100644
--- a/nix/t2-iso-gnome.nix
+++ b/nix/t2-iso-gnome.nix
@@ -1,10 +1,8 @@
-{ pkgs, lib, nixos-hardware, modulesPath, ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
-    "${modulesPath}/installer/cd-dvd/channel.nix"
-    nixos-hardware.nixosModules.apple-t2
     ./common.nix
   ];
 
diff --git a/nix/t2-iso-minimal.nix b/nix/t2-iso-minimal.nix
index 4322d03..bc68c82 100644
--- a/nix/t2-iso-minimal.nix
+++ b/nix/t2-iso-minimal.nix
@@ -1,10 +1,8 @@
-{ pkgs, nixos-hardware, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
-    "${modulesPath}/installer/cd-dvd/channel.nix"
-    nixos-hardware.nixosModules.apple-t2
     ./common.nix
   ];
 }