diff --git a/modules/nixos/hardware/battery/default.nix b/modules/nixos/hardware/battery/default.nix index 0e7aeb1..733503d 100644 --- a/modules/nixos/hardware/battery/default.nix +++ b/modules/nixos/hardware/battery/default.nix @@ -31,8 +31,8 @@ in { }; config = mkIf cfg.enable (import ./batteryStatus.nix { - inherit config; - inherit namespace; - inherit pkgs; - }); + inherit config; + inherit namespace; + inherit pkgs; + }); } diff --git a/modules/nixos/hardware/hibernation/default.nix b/modules/nixos/hardware/hibernation/default.nix index 1869c80..1fc246d 100644 --- a/modules/nixos/hardware/hibernation/default.nix +++ b/modules/nixos/hardware/hibernation/default.nix @@ -23,10 +23,12 @@ in { config = mkIf cfg.enable { boot = { - kernelParams = [ - "resume_offset=${builtins.toString cfg.resumeDevice}" - "mem_sleep_default=deep" - ]; + kernelParams = + [ + "mem_sleep_default=deep" + ] + #https://github.com/nix-community/disko/issues/651#issuecomment-2383741717 + ++ optional (!config.boot.initrd.systemd.enable) "resume_offset=${builtins.toString cfg.swapFileOffset}"; inherit (cfg) resumeDevice; }; services.logind = {