framework-2024-11-25-00-02-03

machine/nixos-virtualbox/configuration.nix

@@ -5,12 +5,6 @@
   outputs,
   ...
 }: {
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-  };
-
   imports = [
     ./hardware-configuration.nix
     ../../configs/common.nix
@@ -37,57 +31,9 @@
   time.timeZone = "Europe/Berlin";
 
   boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      grub = {
-        enable = true;
-        efiSupport = true;
-        device = "nodev";
-      };
-    };
-    supportedFilesystems = ["btrfs"];
-
     initrd = {
       enable = true;
       supportedFilesystems = ["btrfs"];
-
-      postResumeCommands = lib.mkAfter ''
-        mkdir -p /mnt
-        # We first mount the btrfs root to /mnt
-        # so we can manipulate btrfs subvolumes.
-        mount -o subvol=/ /dev/vda3 /mnt
-
-        # While we're tempted to just delete /root and create
-        # a new snapshot from /root-blank, /root is already
-        # populated at this point with a number of subvolumes,
-        # which makes `btrfs subvolume delete` fail.
-        # So, we remove them first.
-        #
-        # /root contains subvolumes:
-        # - /root/var/lib/portables
-        # - /root/var/lib/machines
-        #
-        # I suspect these are related to systemd-nspawn, but
-        # since I don't use it I'm not 100% sure.
-        # Anyhow, deleting these subvolumes hasn't resulted
-        # in any issues so far, except for fairly
-        # benign-looking errors from systemd-tmpfiles.
-        btrfs subvolume list -o /mnt/root |
-        cut -f9 -d' ' |
-        while read subvolume; do
-          echo "deleting /$subvolume subvolume..."
-          btrfs subvolume delete "/mnt/$subvolume"
-        done &&
-        echo "deleting /root subvolume..." &&
-        btrfs subvolume delete /mnt/root
-
-        echo "restoring blank /root subvolume..."
-        btrfs subvolume snapshot /mnt/root-blank /mnt/root
-
-        # Once we're done rolling back to a blank snapshot,
-        # we can unmount /mnt and continue on the boot process.
-        umount /mnt
-      '';
     };
   };
 
@@ -100,15 +46,6 @@
     persistence."/persist" = {
       directories = [
         "/var/lib/docker"
-        "/var/lib/nixos"
-        "/var/lib/tuptime"
-        "/var/lib/vnstat"
-      ];
-      files = [
-        "/etc/ssh/ssh_host_ed25519_key"
-        "/etc/ssh/ssh_host_ed25519_key.pub"
-        "/etc/ssh/ssh_host_rsa_key"
-        "/etc/ssh/ssh_host_rsa_key.pub"
       ];
     };
   };