diff options
| author | Vincent Ambo <mail@tazj.in> | 2024-10-06T18·07+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-10-06T18·17+0000 |
| commit | ac4a77d82f701c0cc9e13fd684133ef5405a93e1 (patch) | |
| tree | 5b2679f1cd08927721f911a5ed03d09d940d4681 | |
| parent | 96a78877eb0d3109bd5b76345b9f1aa87bb3ec20 (diff) | |
feat(tazjin/nixos): persist yggdrasil keys for tverskoy r/8781
Change-Id: If2513b009a82a07b90eb06a5dc4db0859aa6c78d Reviewed-on: https://cl.tvl.fyi/c/depot/+/12584 Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
| -rw-r--r-- | users/tazjin/nixos/koptevo/default.nix | 1 | ||||
| -rw-r--r-- | users/tazjin/nixos/modules/persistence.nix | 1 | ||||
| -rw-r--r-- | users/tazjin/nixos/tverskoy/default.nix | 14 |
3 files changed, 5 insertions, 11 deletions
diff --git a/users/tazjin/nixos/koptevo/default.nix b/users/tazjin/nixos/koptevo/default.nix index fd88aefec6be..187f7b92fbb0 100644 --- a/users/tazjin/nixos/koptevo/default.nix +++ b/users/tazjin/nixos/koptevo/default.nix @@ -223,6 +223,7 @@ in AllowedPublicKeys = [ "573fd89392e2741ead4edd85034c91c88f1e560d991bbdbf1fccb6233db4d325" # khamovnik "a56300c3af1ad54840f4b38b9438e3c108a0aa0fd72793dc7d6bd57325c6d691" # zamalek + "301e98e68522f55b3d9fb7a37817eb0e1aeb6478ef1ac124b9915080e9be205f" # tverskoy "152b658f8a3e0cd6d1486c3cb984795ec7c9a02274c9f096bd2045cabf8bfa92" # A9 "550f4920592d2831d013fd1c83ba9ad174ec352273260fd5d7c2627dbe60d097" # matepad ]; diff --git a/users/tazjin/nixos/modules/persistence.nix b/users/tazjin/nixos/modules/persistence.nix index b864d13a8d70..d3a918025a50 100644 --- a/users/tazjin/nixos/modules/persistence.nix +++ b/users/tazjin/nixos/modules/persistence.nix @@ -14,6 +14,7 @@ "/var/lib/bluetooth" "/var/lib/systemd/coredump" "/var/lib/tailscale" + "/var/lib/private/yggdrasil" "/var/log" ]; diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix index c074fd9c5d70..006a27f9f20f 100644 --- a/users/tazjin/nixos/tverskoy/default.nix +++ b/users/tazjin/nixos/tverskoy/default.nix @@ -28,7 +28,7 @@ lib.fix (self: { tvl.cache.enable = true; - boot = rec { + boot = { initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; initrd.kernelModules = [ ]; @@ -38,10 +38,9 @@ lib.fix (self: { ''; # Install thinkpad modules for TLP - extraModulePackages = [ kernelPackages.acpi_call ]; + extraModulePackages = [ pkgs.linuxPackages.acpi_call ]; - kernelModules = [ "kvm-amd" "i2c_dev" ]; - kernelPackages = pkgs.zfsUnstable.latestCompatibleLinuxPackages; + kernelModules = [ "acpi_call" "kvm-amd" "i2c_dev" ]; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; }; @@ -164,12 +163,5 @@ lib.fix (self: { # android stuff for hacking on Awful.apk programs.adb.enable = true; - # systemd-oomd seems to have been enabled by default around ~ - # December 2022, and it's really into killing my X session as soon - # as I do anything stressful to the machine - systemd.services.systemd-oomd.enable = lib.mkForce false; - - environment.systemPackages = [ pkgs.vulkan-tools ]; - system.stateVersion = "20.09"; }) |