mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

feat: move modules/optional/boot-* -> nixos-extra-modules

Browse source
This commit is contained in:
oddlama 2023-12-22 20:34:33 +01:00
parent da1db65104
commit dfed8f8219
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
9 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -405,11 +405,11 @@
"pre-commit-hooks": "pre-commit-hooks_3" "pre-commit-hooks": "pre-commit-hooks_3"
}, },
"locked": { "locked": {
"lastModified": 1703206032, "lastModified": 1703273523,
"narHash": "sha256-hCuX9y1lUwa8Ck0jruebL2YLhwnDunav/uiIp9EvmNc=", "narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=",
"owner": "oddlama", "owner": "oddlama",
"repo": "nixos-extra-modules", "repo": "nixos-extra-modules",
"rev": "073a8ae3b34ed85619dd22bba0d4fb6b6e8e14d1", "rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/kroma/default.nix
View file

@ -18,7 +18,6 @@
../../modules/optional/hardware/bluetooth.nix ../../modules/optional/hardware/bluetooth.nix
../../modules ../../modules
../../modules/optional/boot-efi.nix
../../modules/optional/initrd-ssh.nix ../../modules/optional/initrd-ssh.nix
../../modules/optional/dev ../../modules/optional/dev
../../modules/optional/graphical ../../modules/optional/graphical
@ -32,6 +31,7 @@
./net.nix ./net.nix
]; ];
boot.mode = "efi";
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.binfmt.emulatedSystems = ["aarch64-linux"]; boot.binfmt.emulatedSystems = ["aarch64-linux"];
} }

2
hosts/nom/default.nix
View file

@ -12,7 +12,6 @@
../../modules/optional/hardware/physical.nix ../../modules/optional/hardware/physical.nix
../../modules ../../modules
../../modules/optional/boot-efi.nix
../../modules/optional/initrd-ssh.nix ../../modules/optional/initrd-ssh.nix
../../modules/optional/dev ../../modules/optional/dev
../../modules/optional/graphical ../../modules/optional/graphical
@ -26,6 +25,7 @@
./net.nix ./net.nix
]; ];
boot.mode = "efi";
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
console = { console = {

2
hosts/sentinel/default.nix
View file

@ -3,7 +3,6 @@
../../modules/optional/hardware/hetzner-cloud.nix ../../modules/optional/hardware/hetzner-cloud.nix
../../modules ../../modules
../../modules/optional/boot-bios.nix
../../modules/optional/initrd-ssh.nix ../../modules/optional/initrd-ssh.nix
../../modules/optional/zfs.nix ../../modules/optional/zfs.nix
@ -13,6 +12,7 @@
./oauth2.nix ./oauth2.nix
]; ];
boot.mode = "bios";
users.groups.acme.members = ["nginx"]; users.groups.acme.members = ["nginx"];
services.nginx.enable = true; services.nginx.enable = true;

2
hosts/ward/default.nix
View file

@ -13,7 +13,6 @@
../../modules/optional/hardware/physical.nix ../../modules/optional/hardware/physical.nix
../../modules ../../modules
../../modules/optional/boot-efi.nix
../../modules/optional/initrd-ssh.nix ../../modules/optional/initrd-ssh.nix
../../modules/optional/zfs.nix ../../modules/optional/zfs.nix
@ -22,6 +21,7 @@
./kea.nix ./kea.nix
]; ];
boot.mode = "efi";
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "r8169"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "r8169"];
meta.promtail = { meta.promtail = {

2
hosts/zackbiene/default.nix
View file

@ -11,7 +11,6 @@ in {
../../modules/optional/hardware/odroid-n2plus.nix ../../modules/optional/hardware/odroid-n2plus.nix
../../modules ../../modules
../../modules/optional/boot-efi.nix
../../modules/optional/initrd-ssh.nix ../../modules/optional/initrd-ssh.nix
../../modules/optional/zfs.nix ../../modules/optional/zfs.nix
@ -25,6 +24,7 @@ in {
#./zigbee2mqtt.nix #./zigbee2mqtt.nix
]; ];
boot.mode = "efi";
users.groups.acme.members = ["nginx"]; users.groups.acme.members = ["nginx"];
services.nginx.enable = true; services.nginx.enable = true;

7
modules/guests/microvm.nix
View file

@ -32,7 +32,12 @@ in {
hypervisor = mkDefault "qemu"; hypervisor = mkDefault "qemu";
# Give them some juice by default # Give them some juice by default
# TODO # TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
# TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
# TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
# TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
# TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
# TODO aaaaaaaaaaaaaaaaaaaaaaaaaaa
mem = mkDefault 1024; mem = mkDefault 1024;
# Add a writable store overlay, but since this is always ephemeral # Add a writable store overlay, but since this is always ephemeral

7
modules/optional/boot-bios.nix
View file

@ -1,7 +0,0 @@
{
boot.loader.grub = {
enable = true;
efiSupport = false;
configurationLimit = 32;
};
}

7
modules/optional/boot-efi.nix
View file

@ -1,7 +0,0 @@
{
boot.loader = {
systemd-boot.enable = true;
systemd-boot.configurationLimit = 32;
efi.canTouchEfiVariables = true;
};
}