diff --git a/filesystems.nix b/filesystems.nix index 6f150f2..9d7fb1b 100644 --- a/filesystems.nix +++ b/filesystems.nix @@ -8,6 +8,7 @@ in { imports = [ ./filesystems + (mkRemovedOptionModule [ "aviallon" "filesystems" "resumeDevice"] "Use boot.resumeDevice instead") ]; options.aviallon.filesystems = { @@ -48,12 +49,6 @@ in type = types.listOf types.str; }; 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 { @@ -71,15 +66,6 @@ in ++ 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" ]; aviallon.filesystems.udevRules = mkBefore (concatLists [