From b68a2b47de510ec87b12513d9c305571ceae9cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Sat, 31 Oct 2020 18:11:55 +0100
Subject: share some config for my devices

---
 configs/milan-x1c.nix         | 23 -----------------------
 configs/milan-x230t.nix       | 16 ----------------
 configs/milan/common.nix      | 16 ++++++++++++++++
 configs/milan/milan-x1c.nix   | 16 ++++++++++++++++
 configs/milan/milan-x230t.nix | 14 ++++++++++++++
 flake.nix                     |  4 ++--
 6 files changed, 48 insertions(+), 41 deletions(-)
 delete mode 100644 configs/milan-x1c.nix
 delete mode 100644 configs/milan-x230t.nix
 create mode 100644 configs/milan/common.nix
 create mode 100644 configs/milan/milan-x1c.nix
 create mode 100644 configs/milan/milan-x230t.nix

diff --git a/configs/milan-x1c.nix b/configs/milan-x1c.nix
deleted file mode 100644
index 37fe960d59ab..000000000000
--- a/configs/milan-x1c.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = [
-    ./common.nix
-    ./boards/x1c.nix
-  ];
-
-  corenix.corebootConfig = {
-    CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH = "1600";
-    CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900";
-    CONFIG_CBFS_SIZE = "0x6f0000";
-  };
-
-  grub2.enable = true;
-  seabios.enable = true;
-  seabios.asSecondaryPayload = true;
-  tianocore.enable = true;
-  tianocore.asSecondaryPayload = true;
-  coreinfo.enable = true;
-  nvramcui.enable = true;
-  tint.enable = true;
-}
diff --git a/configs/milan-x230t.nix b/configs/milan-x230t.nix
deleted file mode 100644
index f66c67c81012..000000000000
--- a/configs/milan-x230t.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./common.nix
-    ./boards/x230t.nix
-  ];
-
-  corenix.corebootConfig = {
-    CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH = "1600";
-    CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900";
-    CONFIG_CBFS_SIZE = "0x500000";
-  };
-
-  tianocore.enable = true;
-}
diff --git a/configs/milan/common.nix b/configs/milan/common.nix
new file mode 100644
index 000000000000..b8a7bc002a62
--- /dev/null
+++ b/configs/milan/common.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  imports = [
+    ../common.nix
+  ];
+
+  grub2.enable = true;
+  grub2.users.root.password = "grub.pbkdf2.sha512.10000.EAE4FDF9D98694628FF5F90A0BB4995BB8B85429D5BDCA849F1F94EA353645C86D553193DF1253908B1A25673898AD9586E117C45BA445B906AA887322DE42A5.4B7D4DF5E8E9F6958ECB3D9EA8FDBE7F3590DB03A287FF29960CDDFE7260D94AE2C50A8D399A54C3764E7F5F20DDD2D2FD9EA2C252DC02CA568C18F87DE45B0E";
+  seabios.enable = true;
+  seabios.asSecondaryPayload = true;
+  tianocore.asSecondaryPayload = true;
+  coreinfo.enable = true;
+  nvramcui.enable = true;
+  tint.enable = true;
+}
diff --git a/configs/milan/milan-x1c.nix b/configs/milan/milan-x1c.nix
new file mode 100644
index 000000000000..251bc379e95b
--- /dev/null
+++ b/configs/milan/milan-x1c.nix
@@ -0,0 +1,16 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./milan.nix
+    ../boards/x1c.nix
+  ];
+
+  corenix.corebootConfig = {
+    CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH = "1600";
+    CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900";
+    CONFIG_CBFS_SIZE = "0x6f0000";
+  };
+
+  tianocore.enable = true;
+}
diff --git a/configs/milan/milan-x230t.nix b/configs/milan/milan-x230t.nix
new file mode 100644
index 000000000000..ca410ea5ed9c
--- /dev/null
+++ b/configs/milan/milan-x230t.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  imports = [
+    ./milan.nix
+    ../boards/x230t.nix
+  ];
+
+  corenix.corebootConfig = {
+    CONFIG_LINEAR_FRAMEBUFFER_MAX_WIDTH = "1600";
+    CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900";
+    CONFIG_CBFS_SIZE = "0x500000";
+  };
+}
diff --git a/flake.nix b/flake.nix
index a4c6161d73c3..46dc99486db4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,8 +39,8 @@
       coreboot-payload-nvramcui
       coreboot-payload-coreinfo;
 
-      milan-x1c = makeDevice ./configs/milan-x1c.nix;
-      milan-x230t = makeDevice ./configs/milan-x230t.nix;
+      milan-x1c = makeDevice ./configs/milan/milan-x1c.nix;
+      milan-x230t = makeDevice ./configs/milan/milan-x230t.nix;
     };
 
   in {
-- 
cgit v1.2.3