Change structure to use individual machine configuration bla blab la

This commit is contained in:
xenia 2024-06-25 18:05:16 +02:00
parent 29ee933441
commit 858ea8b16b
4 changed files with 9 additions and 15 deletions

View File

@ -96,7 +96,6 @@
base = mkNixOsBase {
inherit system pkgs;
hostname = "catboy-cafe";
use-efi = true;
};
graphical = mkNixOsGraphical {
inherit pkgs;
@ -132,7 +131,8 @@
nixpkgs.lib.nixosSystem {
inherit system;
modules = [
./nixos/hardware/catboy-cafe.nix
./nixos/machines/catboy-cafe/hardware.nix
./nixos/machines/catboy-cafe/boot.nix
base
graphical
networking

View File

@ -1,7 +1,5 @@
{
system, pkgs, nixpkgs-flake, hostname,
use-efi ? false, efi-mountpoint ? "/boot",
use-grub ? false, grub-device ? "/dev/sda",
}:
{
nixpkgs.config.allowUnfree = true; # lol
@ -29,17 +27,6 @@
networking.hostName = hostname;
boot.loader = if use-efi
then {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = efi-mountpoint;
} else if use-grub then {
grub.enable = true;
grub.devce = grub-device;
} else throw "Please use either use-efi or use-grub = true";
time.timeZone = "Europe/Stockholm";
services.logind.lidSwitch = "ignore";

View File

@ -0,0 +1,7 @@
{...}: {
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
efi.efiSysMountPoint = "/boot";
};
}