teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Fix build

Browse source
This commit is contained in:
Benjamin Bädorf 2022-08-14 20:09:38 +02:00
parent 46992c46d6
commit f9b7c9e3c9
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
3 changed files with 39 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/core/boot.nix
View file

@ -16,26 +16,6 @@ in
description = "Whether it should be assumed that there is a cryptroot device";
};
options.pub-solar.core.hibernation = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether the device can hibernate. This creates a swapfile at /swapfile.";
};
resumeDevice = mkOption {
type = types.str;
default = "/swapfile";
description = "The location of the hibernation resume swap file.";
};
resumeOffset = mkOption {
type = types.nullOr types.number;
default = null;
description = "The swap file offset. Can be found by running `filefrag -v $swap_file_location`. See https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file";
};
};
config = {
boot = {
# Enable plymouth for better experience of booting
@ -50,15 +30,6 @@ in
};
};
resumeDevice = mkIf cfg.hibernation.enable cfg.hibernation.resumeDevice;
kernelParams = mkIf cfg.hibernation.enable [
"resume=${cfg.hibernation.resumeDevice}"
] ++ (
if (cfg.hibernation.resumeOffset == null) then builtins.abort "config.pub-solar.hibernation.resumeOffset has to be set if config.pub-solar.hibernation.enable is true."
else [ "resume_offset=${cfg.hibernation.resumeOffset}" ]
);
loader.systemd-boot.enable = true;
# Use latest LTS linux kernel by default

1
modules/core/default.nix
View file

@ -8,6 +8,7 @@ in
{
imports = [
./boot.nix
./hibernation.nix
./fonts.nix
./i18n.nix
./networking.nix

38
modules/core/hibernation.nix Normal file
View file

@ -0,0 +1,38 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.pub-solar.core.hibernation;
in
{
options.pub-solar.core.hibernation = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether the device can hibernate. This creates a swapfile at /swapfile.";
};
resumeDevice = mkOption {
type = types.str;
default = "/swapfile";
description = "The location of the hibernation resume swap file.";
};
resumeOffset = mkOption {
type = types.nullOr types.int;
default = null;
description = "The swap file offset. Can be found by running `filefrag -v $swap_file_location`. See https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file";
};
};
config = {
boot = mkIf cfg.enable {
resumeDevice = cfg.resumeDevice;
kernelParams = [
"resume=${cfg.resumeDevice}"
] ++ (
if (cfg.resumeOffset == null && cfg.enable) then builtins.abort "config.pub-solar.resumeOffset has to be set if config.pub-solar.enable is true."
else [ "resume_offset=${cfg.resumeOffset}" ]
);
};
};
}