diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/bo/boot/module.nix | 12 | ||||
| -rw-r--r-- | modules/by-name/po/power/module.nix | 29 |
2 files changed, 21 insertions, 20 deletions
diff --git a/modules/by-name/bo/boot/module.nix b/modules/by-name/bo/boot/module.nix index 80a47420..86ad58da 100644 --- a/modules/by-name/bo/boot/module.nix +++ b/modules/by-name/bo/boot/module.nix @@ -22,7 +22,7 @@ tails = let tailsPrefix = "/EFI/tails"; in { - root = "${tailsPrefix}/tails.iso"; + iso = "${tailsPrefix}/tails.iso"; initrd = "${tailsPrefix}/initrd.img"; vmlinuz = "${tailsPrefix}/vmlinuz-linux"; }; @@ -85,7 +85,7 @@ # Don't store things persistently "nopersistence" - "fromiso=/dev/nvme0n1p1/${tails.root}" + "fromiso=/dev/nvme0n1p1/${tails.iso}" ]; in { options.soispha.boot = { @@ -154,10 +154,10 @@ in { }; install = pkgs.writeShellScript "wrapped-install-tails-iso-marker" '' - echo "[Wrapped bootloader install] Copying tails iso..." + echo "Wrapped bootloader install> Copying tails iso..." ${copyExtraFiles} - echo "[Wrapped bootloader install] Running original lanzaboote install..." + echo "Wrapped bootloader install> Running original lanzaboote install..." ${lanzabooteInstallHook.config.boot.loader.external.installHook} ''; @@ -203,14 +203,14 @@ in { title Tails ${iso.passthru.version} Live ISO linux ${tails.vmlinuz} initrd ${tails.initrd} - options ${builtins.concatStringsSep " " iso_options} + options boot=casper iso-scan/filename=${tails.iso} noeject noprompt ''; }; extraFiles = { # TODO: Check that the ISO we use for booting is _actually_ still the one we # copied there (someone might exchange it in between) <2026-06-09> - "${tails.root}" = "${iso}/tails.iso"; + "${tails.iso}" = "${iso}/tails.iso"; "${tails.vmlinuz}" = "${iso}/live/vmlinuz-linux"; "${tails.initrd}" = "${iso}/live/initrd.img"; }; diff --git a/modules/by-name/po/power/module.nix b/modules/by-name/po/power/module.nix index 3489853c..5a547101 100644 --- a/modules/by-name/po/power/module.nix +++ b/modules/by-name/po/power/module.nix @@ -21,22 +21,23 @@ in { config = lib.mkIf cfg.enable { # see this for reference: https://github.com/NixOS/nixpkgs/issues/211345 services = { - # conflicts with tlp - power-profiles-daemon.enable = false; - - thermald.enable = true; - - tlp = { + tuned = { enable = true; - settings = { - CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 0; - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - SATA_LINKPWR_ON_AC = "max_performance"; - SATA_LINKPWR_ON_BAT = "min_power"; - }; }; + + # thermald.enable = true; + # + # tlp = { + # enable = true; + # settings = { + # CPU_BOOST_ON_AC = 1; + # CPU_BOOST_ON_BAT = 0; + # CPU_SCALING_GOVERNOR_ON_AC = "performance"; + # CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + # SATA_LINKPWR_ON_AC = "max_performance"; + # SATA_LINKPWR_ON_BAT = "min_power"; + # }; + # }; }; }; } |