Move some options into base.nix
This commit is contained in:
parent
442b72de55
commit
2ad217fd84
9 changed files with 8 additions and 32 deletions
7
base.nix
7
base.nix
|
@ -117,7 +117,12 @@
|
|||
};
|
||||
time.timeZone = "Europe/Helsinki";
|
||||
|
||||
boot.loader.timeout = 0;
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
timeout = 0;
|
||||
};
|
||||
services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
|
||||
|
||||
#################### Memory management ####################
|
||||
zramSwap.enable = true;
|
||||
|
|
|
@ -18,7 +18,5 @@
|
|||
Option "TearFree" "true"
|
||||
'';
|
||||
};
|
||||
|
||||
logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,9 +4,6 @@
|
|||
|
||||
imports = [ ../base.nix ];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
#Many installs will need this, and it won't hurt either way
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
|
|
|
@ -89,10 +89,5 @@
|
|||
};
|
||||
resumeDevice = "/dev/mapper/luks-f6e1979b-0dee-4ee9-8170-10490019854b";
|
||||
kernelParams = [ "resume_offset=44537856" ];
|
||||
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -61,12 +61,5 @@
|
|||
|
||||
resumeDevice = "/dev/mapper/nixos";
|
||||
kernelParams = [ "resume_offset=39292928" ];
|
||||
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
|
||||
}
|
||||
|
|
|
@ -8,10 +8,5 @@
|
|||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
||||
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
}
|
||||
|
|
|
@ -9,9 +9,5 @@
|
|||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
||||
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
}
|
||||
|
|
|
@ -8,10 +8,5 @@
|
|||
];
|
||||
|
||||
# HARDWARE SPECIFIC
|
||||
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
}
|
||||
|
|
|
@ -108,6 +108,8 @@ in
|
|||
"usb_storage"
|
||||
];
|
||||
loader = {
|
||||
systemd-boot.enable = pkgs.lib.mkForce false;
|
||||
efi.canTouchEfiVariables = pkgs.lib.mkForce false;
|
||||
grub.enable = false;
|
||||
generic-extlinux-compatible.enable = true;
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue