From ccf58efcb31fa3b72c55ab0252e862b02835c0cf Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Tue, 18 Jul 2023 17:39:38 +0300 Subject: [PATCH] Missing file + removed option --- hosts/nixos/common/users/adrielus.nix | 4 ---- hosts/nixos/lapetus/zfs.nix | 12 ++++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hosts/nixos/common/users/adrielus.nix b/hosts/nixos/common/users/adrielus.nix index 5c8fec6..18818c8 100644 --- a/hosts/nixos/common/users/adrielus.nix +++ b/hosts/nixos/common/users/adrielus.nix @@ -12,10 +12,6 @@ # Adds me to some default groups, and creates the home dir isNormalUser = true; - # Not sure if this works, but it's supposed to be the password - # assigned when the user is first created. - initialPassword = "pleasechangeme"; - # File containing my password, managed by agenix passwordFile = config.age.secrets.adrielusPassword.path; diff --git a/hosts/nixos/lapetus/zfs.nix b/hosts/nixos/lapetus/zfs.nix index e69de29..f350a4e 100644 --- a/hosts/nixos/lapetus/zfs.nix +++ b/hosts/nixos/lapetus/zfs.nix @@ -0,0 +1,12 @@ +{ config, ... }: { + # Configure ZFS + boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.extraPools = [ "zroot" ]; + boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; + boot.kernelParams = [ "nohibernate" ]; + + # Roll back to blank snapshot on boot + # boot.initrd.postDeviceCommands = lib.mkAfter '' + # zfs rollback -r zroot@blank + # ''; +}