diff --git a/configuration.nix b/configuration.nix index 5bb3892..31110a0 100755 --- a/configuration.nix +++ b/configuration.nix @@ -126,9 +126,25 @@ }; # Delete root on reboot - boot.initrd.postMountCommands = lib.mkAfter '' - zfs rollback -r zroot/root@blank - ''; + boot.initrd.systemd.services = { + rollback = { + description = "Rollback root zfs dataset to blank snapshot"; + wantedBy = [ "initrd.target" ]; + before = [ "sysroot.mount" ]; + after = [ "zfs-import-zroot.service" ]; + path = with pkgs; [ + zfs + ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = '' + zfs rollback -r zroot/root@blank && echo "blank rollback complete" + ''; + }; + + }; + }; nix = { settings.experimental-features = [ @@ -150,7 +166,6 @@ environment.systemPackages = with pkgs; [ alacritty gimp - neofetch rose-pine-hyprcursor vim wget diff --git a/flake.nix b/flake.nix index ff7be6b..08994e5 100755 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixvim = { url = "github:nix-community/nixvim/nixos-26.05"; - inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { url = "github:nix-community/home-manager/release-26.05"; diff --git a/home.nix b/home.nix index 54adb77..108dc23 100755 --- a/home.nix +++ b/home.nix @@ -34,7 +34,7 @@ wl-clipboard woeusb wofi - xorg.xrandr + xrandr yq-go zip ];