lowkey kirking it

global/default.nix

@@ -1,16 +1,23 @@
 # This is for global config I DEFINITELY want on all machines, this should only include basic utilities and be relatively small.
 # There is no order for where things are in this, it's a little messy.
-{pkgs, ...}:
+{ pkgs, nix-flatpak, ... }:
 {
 
+  imports = [
+    # nix-flatpak.nixosModules.nix-flatpak
+  ];
+
   # Lix
-  nixpkgs.overlays = [ (final: prev: {
-  inherit (prev.lixPackageSets.stable)
-    nixpkgs-review
-    nix-eval-jobs
-    nix-fast-build
-    colmena;
-  }) ];
+  nixpkgs.overlays = [
+    (final: prev: {
+      inherit (prev.lixPackageSets.stable)
+        nixpkgs-review
+        nix-eval-jobs
+        nix-fast-build
+        colmena
+        ;
+    })
+  ];
   nix.package = pkgs.lixPackageSets.stable.lix;
 
   # 🇺🇸
@@ -55,10 +62,27 @@
   users.users.laythe = {
     isNormalUser = true;
     description = "laythe";
-    extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "jackaudio" "podman" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "docker"
+      "adbusers"
+      "jackaudio"
+      "podman"
+    ];
     #To make podman work
-    subUidRanges = [{ startUid = 100000; count = 65536; }];
-    subGidRanges = [{ startGid = 100000; count = 65536; }];
+    subUidRanges = [
+      {
+        startUid = 100000;
+        count = 65536;
+      }
+    ];
+    subGidRanges = [
+      {
+        startGid = 100000;
+        count = 65536;
+      }
+    ];
   };
 
   programs.appimage = {
@@ -126,5 +150,8 @@
     package = pkgs.usbmuxd2;
   };
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-}
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+}

global/eraseyourdarlings.nix

@@ -1,73 +1,73 @@
-{lib, ...}:
+{ lib, ... }:
 {
   boot.initrd.postResumeCommands = lib.mkAfter ''
     rm -rf /bin /etc /lib64 /srv /sys /tmp /usr /var
-  ''
-
-  {
-    environment.persistence."/persistent" = {
-      enable = true; # NB: Defaults to true, not needed
-      hideMounts = true;
+  '';
+  # impermanence
+  environment.persistence."/persistent" = {
+    enable = true; # NB: Defaults to true, not needed
+    hideMounts = true;
+    directories = [
+      "/var/log"
+      "/var/lib/bluetooth"
+      "/var/lib/nixos"
+      "/var/lib/systemd/coredump"
+      "/etc/NetworkManager/system-connections"
+      "/etc/nixos"
+      "/var/lib/flatpak"
+      {
+        directory = "/var/lib/colord";
+        user = "colord";
+        group = "colord";
+        mode = "u=rwx,g=rx,o=";
+      }
+    ];
+    files = [
+      "/etc/machine-id"
+      {
+        file = "/var/keys/secret_file";
+        parentDirectory = {
+          mode = "u=rwx,g=,o=";
+        };
+      }
+    ];
+    users.laythe = {
       directories = [
-        "/var/log"
-        "/var/lib/bluetooth"
-        "/var/lib/nixos"
-        "/var/lib/systemd/coredump"
-        "/etc/NetworkManager/system-connections"
+        "Downloads"
+        "Music"
+        "Pictures"
+        "Documents"
+        "Videos"
+        "nixos-configv3"
         {
-          directory = "/var/lib/colord";
-          user = "colord";
-          group = "colord";
-          mode = "u=rwx,g=rx,o=";
+          directory = ".local/share/Steam";
+          mode = "0777";
         }
+        {
+          directory = ".local/share/flatpak";
+          mode = "0700";
+        }
+        {
+          directory = ".gnupg";
+          mode = "0700";
+        }
+        {
+          directory = ".ssh";
+          mode = "0700";
+        }
+        {
+          directory = ".nixops";
+          mode = "0700";
+        }
+        {
+          directory = ".local/share/keyrings";
+          mode = "0700";
+        }
+        ".local/share/direnv"
       ];
       files = [
-        "/etc/machine-id"
-        {
-          file = "/var/keys/secret_file";
-          parentDirectory = {
-            mode = "u=rwx,g=,o=";
-          };
-        }
+        ".screenrc"
       ];
-      users.laythe = {
-        directories = [
-          "Downloads"
-          "Music"
-          "Pictures"
-          "Documents"
-          "Videos"
-          "VirtualBox VMs"
-          {
-            directory = ".local/share/Steam";
-            mode = "0777"
-          }
-          {
-            directory = ".local/share/flatpak";
-            mode = "0700"
-          }
-          {
-            directory = ".gnupg";
-            mode = "0700";
-          }
-          {
-            directory = ".ssh";
-            mode = "0700";
-          }
-          {
-            directory = ".nixops";
-            mode = "0700";
-          }
-          {
-            directory = ".local/share/keyrings";
-            mode = "0700";
-          }
-          ".local/share/direnv"
-        ];
-        files = [
-          ".screenrc"
-        ];
-      };
     };
-  }
-}
+  };
+}