aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Filesystems] Remove aviallon.boot.resumeDevice

Browse source 
boot.resumeDevice should probably be used instead.
If disabling hibernation and resume is needed, use aviallon.boot.cmdline.hibernate = "off"
This commit is contained in:
Antoine Viallon 2023-10-31 23:37:20 +01:00
parent 0c68b4cf87
commit adaf03c542
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 1 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
filesystems.nix
View file

@ -8,6 +8,7 @@ in
{ {
imports = [ imports = [
./filesystems ./filesystems
(mkRemovedOptionModule [ "aviallon" "filesystems" "resumeDevice"] "Use boot.resumeDevice instead")
]; ];
options.aviallon.filesystems = { options.aviallon.filesystems = {
@ -48,12 +49,6 @@ in
type = types.listOf types.str; type = types.listOf types.str;
}; };
lvm = mkEnableOption "lvm options required for correct booting"; lvm = mkEnableOption "lvm options required for correct booting";
resumeDevice = mkOption {
default = null;
description = "Swap device used for hibernation/resuming.";
example = "LABEL=nixos-swap";
type = types.nullOr types.str;
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -71,15 +66,6 @@ in
++ optionals config.aviallon.boot.kvdo.enable [ "kvdo" ] ++ optionals config.aviallon.boot.kvdo.enable [ "kvdo" ]
; ;
aviallon.boot.cmdline = {
resume =
if isNull cfg.resumeDevice
then "none"
else cfg.resumeDevice
;
};
boot.supportedFilesystems = [ "ntfs" "ext4" "vfat" "exfat" ]; boot.supportedFilesystems = [ "ntfs" "ext4" "vfat" "exfat" ];
aviallon.filesystems.udevRules = mkBefore (concatLists [ aviallon.filesystems.udevRules = mkBefore (concatLists [