diff options
author | Milan Pässler <milan@petabyte.dev> | 2020-10-31 18:11:55 +0100 |
---|---|---|
committer | Milan Pässler <milan@petabyte.dev> | 2020-10-31 18:14:56 +0100 |
commit | b68a2b47de510ec87b12513d9c305571ceae9cc9 (patch) | |
tree | b3bd2877af873cf8a0813922258eb64e839c558a | |
parent | 0573f11e4a97742f964b17206aa0c25edbc58255 (diff) |
share some config for my devices
-rw-r--r-- | configs/milan/common.nix | 16 | ||||
-rw-r--r-- | configs/milan/milan-x1c.nix (renamed from configs/milan-x1c.nix) | 11 | ||||
-rw-r--r-- | configs/milan/milan-x230t.nix (renamed from configs/milan-x230t.nix) | 6 | ||||
-rw-r--r-- | flake.nix | 4 |
4 files changed, 22 insertions, 15 deletions
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-x1c.nix b/configs/milan/milan-x1c.nix index 37fe960d59ab..251bc379e95b 100644 --- a/configs/milan-x1c.nix +++ b/configs/milan/milan-x1c.nix @@ -2,8 +2,8 @@ { imports = [ - ./common.nix - ./boards/x1c.nix + ./milan.nix + ../boards/x1c.nix ]; corenix.corebootConfig = { @@ -12,12 +12,5 @@ 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/milan-x230t.nix index f66c67c81012..ca410ea5ed9c 100644 --- a/configs/milan-x230t.nix +++ b/configs/milan/milan-x230t.nix @@ -2,8 +2,8 @@ { imports = [ - ./common.nix - ./boards/x230t.nix + ./milan.nix + ../boards/x230t.nix ]; corenix.corebootConfig = { @@ -11,6 +11,4 @@ CONFIG_LINEAR_FRAMEBUFFER_MAX_HEIGHT = "900"; CONFIG_CBFS_SIZE = "0x500000"; }; - - tianocore.enable = true; } 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 { |