From 6bd0fa9d6ea37134867d6382b3072f5d5da7b804 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 3 Jul 2026 20:14:10 +0100 Subject: [PATCH] Stuff --- hardware/filesystem.nix | 74 ++++++++++++++++++++--------------------- home/impermanence.nix | 1 + system/services.nix | 1 + 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/hardware/filesystem.nix b/hardware/filesystem.nix index 21f0fe7..1be3213 100644 --- a/hardware/filesystem.nix +++ b/hardware/filesystem.nix @@ -8,43 +8,43 @@ in { boot.initrd.supportedFilesystems = [ "btrfs" ]; - boot.initrd.systemd.services.rollback-root = { - description = "Rollback btrfs root subvolume"; - wantedBy = [ "initrd.target" ]; - after = [ "systemd-cryptsetup@.service" ]; - before = [ "sysroot.mount" ]; - unitConfig.DefaultDependencies = "no"; - serviceConfig.Type = "oneshot"; - script = '' - mkdir -p /btrfs_tmp - mount ${rootDisk} /btrfs_tmp - - # Ensure the old_roots directory exists - mkdir -p /btrfs_tmp/old_roots - - if [[ -e /btrfs_tmp/root ]]; then - timestamp=$(date +%Y-%m-%d_%H-%M-%S) - mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" - fi - - delete_subvolume_recursively() { - IFS=$'\n' - for i in $(btrfs subvolume list -o "$1" | cut -f 9 -d ' '); do - delete_subvolume_recursively "/btrfs_tmp/$i" - done - btrfs subvolume delete "$1" - } - - for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +7); do - # Don't delete the old_roots directory itself - if [[ "$i" == "/btrfs_tmp/old_roots/" ]]; then continue; fi - delete_subvolume_recursively "$i" - done - - btrfs subvolume create /btrfs_tmp/root - umount /btrfs_tmp - ''; - }; + # boot.initrd.systemd.services.rollback-root = { + # description = "Rollback btrfs root subvolume"; + # wantedBy = [ "initrd.target" ]; + # after = [ "systemd-cryptsetup@.service" ]; + # before = [ "sysroot.mount" ]; + # unitConfig.DefaultDependencies = "no"; + # serviceConfig.Type = "oneshot"; + # script = '' + # mkdir -p /btrfs_tmp + # mount ${rootDisk} /btrfs_tmp + # + # # Ensure the old_roots directory exists + # mkdir -p /btrfs_tmp/old_roots + # + # if [[ -e /btrfs_tmp/root ]]; then + # timestamp=$(date +%Y-%m-%d_%H-%M-%S) + # mv /btrfs_tmp/root "/btrfs_tmp/old_roots/$timestamp" + # fi + # + # delete_subvolume_recursively() { + # IFS=$'\n' + # for i in $(btrfs subvolume list -o "$1" | cut -f 9 -d ' '); do + # delete_subvolume_recursively "/btrfs_tmp/$i" + # done + # btrfs subvolume delete "$1" + # } + # + # for i in $(find /btrfs_tmp/old_roots/ -maxdepth 1 -mtime +7); do + # # Don't delete the old_roots directory itself + # if [[ "$i" == "/btrfs_tmp/old_roots/" ]]; then continue; fi + # delete_subvolume_recursively "$i" + # done + # + # btrfs subvolume create /btrfs_tmp/root + # umount /btrfs_tmp + # ''; + # }; # fileSystems."/" = { # device = rootDisk; diff --git a/home/impermanence.nix b/home/impermanence.nix index d3247f8..c1c2f52 100644 --- a/home/impermanence.nix +++ b/home/impermanence.nix @@ -37,6 +37,7 @@ ".local/state/wireplumber" ".mozilla/firefox" ".ssh" + ".gemini" ".steam" ".minecraft" "Code" diff --git a/system/services.nix b/system/services.nix index b511c76..d241c5f 100644 --- a/system/services.nix +++ b/system/services.nix @@ -32,6 +32,7 @@ enable = true; wayland.enable = true; theme = "maya"; + package = pkgs-unstable.kdePackages.sddm; }; autoLogin.enable = true; autoLogin.user = "chris";