Skip to content

Commit ad8f2a0

Browse files
cyber-murmelcyber-murmel
committed
fix imageBaseName; add raspbbery pi 1-3
1 parent 36e2fd0 commit ad8f2a0

File tree

7 files changed

+129
-4
lines changed

7 files changed

+129
-4
lines changed

‎machines/espressobin/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
../generic-aarch64
55
];
66

7-
sdImage.imageBaseName = lib.mkDefault "nixos-espressobin";
7+
sdImage.imageBaseName = "nixos-espressobin";
88

99
boot.kernelParams = [
1010
"console=ttyMV0,115200n8"

‎machines/orange-pi-zero/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ in
1010
../generic-armv7l-hf
1111
];
1212

13-
sdImage.imageBaseName = lib.mkDefault "nixos-orange-pi-zero";
13+
sdImage.imageBaseName = "nixos-orange-pi-zero";
1414

1515
sdImage.postBuildCommands = with pkgs; ''
1616
dd if=${ubootOrangePiZero}/u-boot-sunxi-with-spl.bin of=$img conv=fsync,notrunc bs=1024 seek=8

‎machines/raspberry-pi-1/default.nix‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{ config, pkgs, lib, ... }:
2+
{
3+
nixpkgs.crossSystem = lib.systems.elaborate lib.systems.examples.raspberryPi;
4+
5+
imports = [
6+
<nixpkgs/nixos/modules/profiles/base.nix>
7+
<nixpkgs/nixos/modules/installer/sd-card/sd-image.nix>
8+
];
9+
10+
sdImage.imageBaseName = "nixos-raspberry-pi-1";
11+
12+
boot = {
13+
loader = {
14+
grub.enable = false;
15+
raspberryPi = {
16+
enable = true;
17+
version = 1;
18+
};
19+
};
20+
21+
kernelPackages = pkgs.linuxPackages_rpi1;
22+
consoleLogLevel = lib.mkDefault 7;
23+
24+
# prevent `modprobe: FATAL: Module ahci not found`
25+
initrd.availableKernelModules = pkgs.lib.mkForce [
26+
"mmc_block"
27+
];
28+
};
29+
30+
sdImage = {
31+
populateRootCommands = "";
32+
populateFirmwareCommands = with config.system.build; ''
33+
${installBootLoader} ${toplevel} -d ./firmware
34+
'';
35+
firmwareSize = 64;
36+
};
37+
}

‎machines/raspberry-pi-2/default.nix‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{ config, pkgs, lib, ... }:
2+
{
3+
nixpkgs.crossSystem = lib.systems.elaborate lib.systems.examples.armv7l-hf-multiplatform;
4+
5+
imports = [
6+
<nixpkgs/nixos/modules/profiles/base.nix>
7+
<nixpkgs/nixos/modules/installer/sd-card/sd-image.nix>
8+
];
9+
10+
sdImage.imageBaseName = "nixos-raspberry-pi-2";
11+
12+
boot = {
13+
loader = {
14+
grub.enable = false;
15+
raspberryPi = {
16+
enable = true;
17+
version = 2;
18+
firmwareConfig = ''
19+
dtparam=i2c=on
20+
'';
21+
};
22+
};
23+
24+
kernelPackages = pkgs.linuxPackages_rpi2;
25+
consoleLogLevel = lib.mkDefault 7;
26+
27+
# prevent `modprobe: FATAL: Module ahci not found`
28+
initrd.availableKernelModules = pkgs.lib.mkForce [
29+
"mmc_block"
30+
];
31+
};
32+
33+
sdImage = {
34+
populateRootCommands = "";
35+
populateFirmwareCommands = with config.system.build; ''
36+
${installBootLoader} ${toplevel} -d ./firmware
37+
'';
38+
firmwareSize = 64;
39+
};
40+
}

‎machines/raspberry-pi-3/default.nix‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{ config, pkgs, lib, ... }:
2+
{
3+
nixpkgs.crossSystem = lib.systems.elaborate lib.systems.examples.aarch64-multiplatform;
4+
5+
imports = [
6+
<nixpkgs/nixos/modules/profiles/base.nix>
7+
<nixpkgs/nixos/modules/installer/sd-card/sd-image.nix>
8+
];
9+
10+
sdImage.imageBaseName = "nixos-raspberry-pi-3";
11+
12+
boot = {
13+
loader = {
14+
grub.enable = false;
15+
raspberryPi = {
16+
enable = true;
17+
version = 3;
18+
firmwareConfig = ''
19+
dtparam=i2c=on
20+
'';
21+
};
22+
};
23+
24+
kernelPackages = pkgs.linuxPackages_rpi3;
25+
consoleLogLevel = lib.mkDefault 7;
26+
27+
# prevent `modprobe: FATAL: Module ahci not found`
28+
initrd.availableKernelModules = pkgs.lib.mkForce [
29+
"mmc_block"
30+
];
31+
};
32+
33+
sdImage = {
34+
populateRootCommands = "";
35+
populateFirmwareCommands = with config.system.build; ''
36+
${installBootLoader} ${toplevel} -d ./firmware
37+
'';
38+
firmwareSize = 128;
39+
};
40+
41+
hardware = {
42+
# needed for wlan0 to work (https://github.com/NixOS/nixpkgs/issues/115652)
43+
enableRedistributableFirmware = pkgs.lib.mkForce false;
44+
firmware = with pkgs; [
45+
raspberrypiWirelessFirmware
46+
];
47+
};
48+
}

‎machines/raspberry-pi-zero-w/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<nixpkgs/nixos/modules/installer/sd-card/sd-image.nix>
88
];
99

10-
sdImage.imageBaseName = lib.mkDefault "nixos-raspberry-pi-zero";
10+
sdImage.imageBaseName = "nixos-raspberry-pi-zero";
1111

1212
boot = {
1313
loader = {

‎machines/roc-rk3328-cc/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
../generic-aarch64
55
];
66

7-
sdImage.imageBaseName = lib.mkDefault "nixos-roc-rk3328-cc";
7+
sdImage.imageBaseName = "nixos-roc-rk3328-cc";
88

99
nixpkgs.config.allowUnfree = true;
1010
sdImage.postBuildCommands = with pkgs; ''

0 commit comments

Comments
 (0)