My Nix Configuration

[systems] Update filesystems to be attrsets

https://github.com/NixOS/nixpkgs/pull/289856

Changed files
+59 -37
systems
x86_64-linux
+11 -13
systems/x86_64-linux/marvin/bootloader.nix
···
-
{ pkgs, lib, ... }:
{
boot = {
extraModulePackages = [ ];
kernelModules = [ "kvm-amd" ];
kernelPackages = pkgs.linuxPackages_6_1;
kernelParams = [ "nohibernate" ];
-
supportedFilesystems = lib.mkForce [
-
"btrfs"
-
"vfat"
-
"f2fs"
-
"zfs"
-
];
zfs.devNodes = "/dev/";
# Initrd config
···
"usb_storage"
"sd_mod"
];
-
supportedFilesystems = [
-
"btrfs"
-
"vfat"
-
"f2fs"
-
"zfs"
-
];
kernelModules = [ ];
};
···
+
{ pkgs, ... }:
+
let
+
fileSystems = {
+
btrfs = true;
+
ext4 = true;
+
vfat = true;
+
zfs = true;
+
};
+
in
{
boot = {
extraModulePackages = [ ];
kernelModules = [ "kvm-amd" ];
kernelPackages = pkgs.linuxPackages_6_1;
kernelParams = [ "nohibernate" ];
+
supportedFilesystems = fileSystems;
zfs.devNodes = "/dev/";
# Initrd config
···
"usb_storage"
"sd_mod"
];
+
supportedFilesystems = fileSystems;
kernelModules = [ ];
};
+14 -5
systems/x86_64-linux/prefect/bootloader.nix
···
lib,
modulesPath,
...
-
}: {
-
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
boot = {
zfs.devNodes = "/dev/";
loader = {
···
"sd_mod"
"sr_mod"
];
-
kernelModules = ["nvme"];
-
supportedFilesystems = ["btrfs" "vfat" "f2fs" "zfs"];
};
-
supportedFilesystems = lib.mkForce ["btrfs" "vfat" "f2fs" "zfs"];
kernelPackages = pkgs.linuxPackages_6_1;
kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
···
lib,
modulesPath,
...
+
}:
+
let
+
fileSystems = {
+
btrfs = true;
+
ext4 = true;
+
vfat = true;
+
zfs = true;
+
};
+
in
+
{
+
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
zfs.devNodes = "/dev/";
loader = {
···
"sd_mod"
"sr_mod"
];
+
kernelModules = [ "nvme" ];
+
supportedFilesystems = fileSystems;
};
+
supportedFilesystems = fileSystems;
kernelPackages = pkgs.linuxPackages_6_1;
kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
+12 -9
systems/x86_64-linux/thought/bootloader.nix
···
{
-
pkgs,
-
lib,
-
modulesPath,
-
...
-
}: {
-
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
boot = {
loader = {
grub.device = "/dev/sda";
···
"sd_mod"
"sr_mod"
];
-
kernelModules = ["nvme"];
-
supportedFilesystems = ["btrfs" "vfat" "f2fs"];
};
-
supportedFilesystems = lib.mkForce ["btrfs" "vfat" "f2fs"];
kernelPackages = pkgs.linuxPackages_latest;
kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
···
+
{ pkgs, modulesPath, ... }:
+
let
+
fileSystems = {
+
btrfs = true;
+
ext4 = true;
+
vfat = true;
+
};
+
in
{
+
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
loader = {
grub.device = "/dev/sda";
···
"sd_mod"
"sr_mod"
];
+
kernelModules = [ "nvme" ];
+
supportedFilesystems = fileSystems;
};
+
supportedFilesystems = fileSystems;
kernelPackages = pkgs.linuxPackages_latest;
kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
+22 -10
systems/x86_64-linux/zaphod/bootloader.nix
···
{
-
pkgs,
-
lib,
-
config,
-
...
-
}: {
boot = {
bootspec.enable = true;
kernelPackages = pkgs.linuxPackages_latest;
-
kernelModules = ["kvm-amd" "v4l2loopback" "btusb"];
-
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback perf];
-
supportedFilesystems = lib.mkForce ["btrfs" "vfat" "f2fs"];
initrd = {
enable = true;
network.enable = false;
-
availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod"];
-
kernelModules = [];
};
loader = {
systemd-boot = {
···
+
{ pkgs, ... }:
+
let
+
fileSystems = {
+
btrfs = true;
+
ext4 = true;
+
vfat = true;
+
};
+
in
{
boot = {
bootspec.enable = true;
kernelPackages = pkgs.linuxPackages_latest;
+
kernelModules = [
+
"kvm-amd"
+
"btusb"
+
];
+
supportedFilesystems = fileSystems;
initrd = {
enable = true;
network.enable = false;
+
availableKernelModules = [
+
"xhci_pci"
+
"thunderbolt"
+
"nvme"
+
"usb_storage"
+
"usbhid"
+
"sd_mod"
+
];
+
kernelModules = [ ];
};
loader = {
systemd-boot = {