From 5ba3a082e6cc081f347f9c1830858f30741c1571 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 11 Nov 2024 19:06:51 -0600
Subject: [PATCH] disabled impermanence

---
 enviroments/common/default.nix           |   7 --
 flake.lock                               |  16 ---
 flake.nix                                |  10 +-
 hosts/defiant/hardware-configuration.nix | 151 +++++++++++------------
 4 files changed, 80 insertions(+), 104 deletions(-)

diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 36b86ac..8b18f78 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -178,13 +178,6 @@
   environment = {
     # List packages installed in system profile.
     systemPackages = with pkgs; [
-      qemu
-      (pkgs.writeShellScriptBin "qemu-system-x86_64-uefi" ''
-        qemu-system-x86_64 \
-          -bios ${OVMF.fd}/FV/OVMF.fd \
-          "$@"
-      '')
-
       wget
 
       # version control
diff --git a/flake.lock b/flake.lock
index 4854b9d..b092a6d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -122,21 +122,6 @@
         "type": "github"
       }
     },
-    "impermanence": {
-      "locked": {
-        "lastModified": 1731242966,
-        "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
     "lix": {
       "flake": false,
       "locked": {
@@ -250,7 +235,6 @@
         "disko": "disko",
         "flake-compat": "flake-compat",
         "home-manager": "home-manager",
-        "impermanence": "impermanence",
         "lix-module": "lix-module",
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-hardware": "nixos-hardware",
diff --git a/flake.nix b/flake.nix
index 02d86d7..7d24c4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,9 +23,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    impermanence = {
-      url = "github:nix-community/impermanence";
-    };
+    # impermanence = {
+    #   url = "github:nix-community/impermanence";
+    # };
 
     # users home directories
     home-manager = {
@@ -62,7 +62,7 @@
   outputs = {
     nixpkgs,
     disko,
-    impermanence,
+    # impermanence,
     nixos-hardware,
     home-manager,
     lix-module,
@@ -132,7 +132,7 @@
         modules = [
           lix-module.nixosModules.default
           ./overlays
-          impermanence.nixosModules.impermanence
+          # impermanence.nixosModules.impermanence
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           home-manager-config
diff --git a/hosts/defiant/hardware-configuration.nix b/hosts/defiant/hardware-configuration.nix
index 0d345f2..13e4d5e 100644
--- a/hosts/defiant/hardware-configuration.nix
+++ b/hosts/defiant/hardware-configuration.nix
@@ -2,7 +2,6 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
-  pkgs,
   config,
   lib,
   modulesPath,
@@ -24,38 +23,38 @@
       #   zfs rollback -r rpool/root@blank
       #   zfs rollback -r rpool/home@blank
       # '';
-      systemd = {
-        enable = lib.mkDefault true;
-        services.rollback = {
-          description = "Rollback root filesystem to a pristine state on boot";
-          wantedBy = [
-            "zfs.target"
-            "initrd.target"
-          ];
-          after = [
-            "zfs-import-rpool.service"
-          ];
-          before = [
-            "sysroot.mount"
-            "fs.target"
-          ];
-          path = with pkgs; [
-            zfs
-          ];
-          unitConfig.DefaultDependencies = "no";
-          # serviceConfig = {
-          #   Type = "oneshot";
-          #   ExecStart =
-          #     "${config.boot.zfs.package}/sbin/zfs rollback -r rpool/home@blank";
-          # };
-          serviceConfig.Type = "oneshot";
-          script = ''
-            zfs list -t snapshot || echo
-            zfs rollback -r rpool/root@blank
-            zfs rollback -r rpool/home@blank
-          '';
-        };
-      };
+      # systemd = {
+      #   enable = lib.mkDefault true;
+      #   services.rollback = {
+      #     description = "Rollback root filesystem to a pristine state on boot";
+      #     wantedBy = [
+      #       "zfs.target"
+      #       "initrd.target"
+      #     ];
+      #     after = [
+      #       "zfs-import-rpool.service"
+      #     ];
+      #     before = [
+      #       "sysroot.mount"
+      #       "fs.target"
+      #     ];
+      #     path = with pkgs; [
+      #       zfs
+      #     ];
+      #     unitConfig.DefaultDependencies = "no";
+      #     # serviceConfig = {
+      #     #   Type = "oneshot";
+      #     #   ExecStart =
+      #     #     "${config.boot.zfs.package}/sbin/zfs rollback -r rpool/home@blank";
+      #     # };
+      #     serviceConfig.Type = "oneshot";
+      #     script = ''
+      #       zfs list -t snapshot || echo
+      #       zfs rollback -r rpool/root@blank
+      #       zfs rollback -r rpool/home@blank
+      #     '';
+      #   };
+      # };
     };
     kernelModules = ["kvm-amd"];
     kernelParams = ["quiet"];
@@ -68,19 +67,19 @@
 
   swapDevices = [];
 
-  fileSystems = {
-    "/" = {
-      neededForBoot = true;
-    };
+  # fileSystems = {
+  #   "/" = {
+  #     neededForBoot = true;
+  #   };
 
-    "/home" = {
-      neededForBoot = true;
-    };
+  #   "/home" = {
+  #     neededForBoot = true;
+  #   };
 
-    "/persistent" = {
-      neededForBoot = true;
-    };
-  };
+  #   "/persistent" = {
+  #     neededForBoot = true;
+  #   };
+  # };
 
   networking = {
     hostId = "c51763d6";
@@ -88,43 +87,43 @@
     useNetworkd = true;
   };
 
-  environment.persistence."/persistent" = {
-    enable = true;
-    hideMounts = true;
-    directories = [
-      # "/run/secrets"
+  # environment.persistence."/persistent" = {
+  #   enable = true;
+  #   hideMounts = true;
+  #   directories = [
+  #     # "/run/secrets"
 
-      "/etc/ssh"
+  #     "/etc/ssh"
 
-      "/var/log"
-      "/var/lib/nixos"
-      "/var/lib/systemd/coredump"
+  #     "/var/log"
+  #     "/var/lib/nixos"
+  #     "/var/lib/systemd/coredump"
 
-      # config.apps.pihole.directory.root
+  #     # config.apps.pihole.directory.root
 
-      # config.apps.jellyfin.mediaDirectory
-      # config.services.jellyfin.configDir
-      # config.services.jellyfin.cacheDir
-      # config.services.jellyfin.dataDir
+  #     # config.apps.jellyfin.mediaDirectory
+  #     # config.services.jellyfin.configDir
+  #     # config.services.jellyfin.cacheDir
+  #     # config.services.jellyfin.dataDir
 
-      # "/var/hass" # config.users.users.hass.home
-      # "/var/postgresql" # config.users.users.postgresql.home
-      # "/var/forgejo" # config.users.users.forgejo.home
-      # "/var/nextcloud" # config.users.users.nextcloud.home
-      # "/var/headscale" # config.users.users.headscale.home
-    ];
-    files = [
-      "/etc/machine-id"
-      # config.environment.sessionVariables.SOPS_AGE_KEY_FILE
-    ];
-    users.leyla = {
-      directories = [
-        "documents"
-        ".ssh"
-      ];
-      files = [];
-    };
-  };
+  #     # "/var/hass" # config.users.users.hass.home
+  #     # "/var/postgresql" # config.users.users.postgresql.home
+  #     # "/var/forgejo" # config.users.users.forgejo.home
+  #     # "/var/nextcloud" # config.users.users.nextcloud.home
+  #     # "/var/headscale" # config.users.users.headscale.home
+  #   ];
+  #   files = [
+  #     "/etc/machine-id"
+  #     # config.environment.sessionVariables.SOPS_AGE_KEY_FILE
+  #   ];
+  #   users.leyla = {
+  #     directories = [
+  #       "documents"
+  #       ".ssh"
+  #     ];
+  #     files = [];
+  #   };
+  # };
 
   # systemd.services = {
   #   # https://github.com/openzfs/zfs/issues/10891