greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Move Raspberry Pi 4 support to a module

Browse Source
This commit is contained in:
Greg Hellings
2022-04-25 22:18:41 -05:00
parent 64cbe3dd1f
commit a992c7c560
5 changed files with 64 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/2maccabees/default.nix
+1 -1
View File
@@ -7,8 +7,8 @@
./home-assistant.nix
./networking.nix
./vhosts.nix
../../profiles/rpi4.nix
../../profiles/home.nix
];
networking.hostName = "2maccabees";
greg.rpi4.enable = true;
}
hosts/2maccabees/hardware-configuration.nix
+19 -19
View File
@@ -4,28 +4,28 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "uas" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "uas" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/35f9a49a-b557-4eb3-a013-2afca7a990e4";
fsType = "btrfs";
};
fileSystems."/" ={
device = "/dev/disk/by-uuid/35f9a49a-b557-4eb3-a013-2afca7a990e4";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A982-C8A3";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/A982-C8A3";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/4b6f2dc4-d845-4ec4-81f2-4f61bb3f282d"; }
];
swapDevices = [ {
device = "/dev/disk/by-uuid/4b6f2dc4-d845-4ec4-81f2-4f61bb3f282d";
} ];
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
}
modules/default.nix
+1
View File
@@ -3,5 +3,6 @@
{
imports = [
./proxy.nix
./rpi4.nix
];
}
modules/rpi4.nix
+43
View File
@@ -0,0 +1,43 @@
{ config, lib, pkgs, ... }:
let
cfg = config.greg.rpi4;
in with lib; {
options = {
greg.rpi4 = {
enable = mkEnableOption "Enable support for Raspberry Pi 4s";
};
};
config = mkIf cfg.enable {
boot = {
# This prevents us from having to compile our own kernel
kernelPackages = pkgs.linuxPackages_rpi4;
kernelParams = [
"8250.nr_uarts=1"
"console=ttyAMA0,115200"
"console=tty1"
"cma=128M"
];
loader = {
raspberryPi = {
enable = true;
version = 4;
};
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
grub.enable = false;
# Enables the generation of /boot/extlinux/extlinux.conf
#generic-extlinux-compatible.enable = true;
};
};
environment.systemPackages = with pkgs; [
raspberrypifw
usbutils
];
};
}
profiles/rpi4.nix
-33
View File
@@ -1,33 +0,0 @@
# Base configurations for Raspberry Pi 4s
{ config, pkgs, ... }:
{
boot = {
# This prevents us from having to compile our own kernel
kernelPackages = pkgs.linuxPackages_rpi4;
kernelParams = [
"8250.nr_uarts=1"
"console=ttyAMA0,115200"
"console=tty1"
"cma=128M"
];
loader = {
raspberryPi = {
enable = true;
version = 4;
};
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
grub.enable = false;
# Enables the generation of /boot/extlinux/extlinux.conf
#generic-extlinux-compatible.enable = true;
};
};
environment.systemPackages = with pkgs; [
raspberrypifw
usbutils
];
}