diff --git a/flake.lock b/flake.lock
index a25f4f1..24eb5d7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -110,43 +110,6 @@
         "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"
       }
     },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1711241261,
-        "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": "nixlib",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729472750,
-        "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1749494155,
@@ -179,24 +142,11 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=",
-        "path": "/nix/store/nj8ah8wp5sxbah6qmqarv8cg7yrg7f0b-source",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
         "lix-module": "lix-module",
-        "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "waveforms": "waveforms"
@@ -219,7 +169,9 @@
     },
     "waveforms": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1748247366,
diff --git a/flake.nix b/flake.nix
index f027dc8..37b8f56 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,50 +17,45 @@
 # https://github.com/nix-community/nixos-anywhere-examples/blob/main/configuration.nix
 
 {
-  description = "Lauren's System Flake";
-
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    # Lix over Nix
     lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
     lix-module.inputs.nixpkgs.follows = "nixpkgs";
 
     disko.url = "github:nix-community/disko/latest";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixos-generators.url = "github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565";
-    nixos-generators.inputs.nixpkgs.follows = "nixpkgs";
-
-    # Home Manager
     home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     # Extras
     waveforms.url = "github:liff/waveforms-flake";
+    waveforms.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, nixos-generators, disko, waveforms, lix-module, ... }@inputs: let
+  outputs = {
+    self,
+    nixpkgs,
+    nixpkgs-unstable, 
+    home-manager,
+    disko,
+    waveforms,
+    lix-module
+  }@inputs: let
     system = "x86_64-linux";
-    timezone = "America/Chicago";
-    locale = "en_US.UTF-8";
-    stateVersion = "24.11";
 
     pkgs = import nixpkgs {
       inherit system;
       config.allowUnfree = true;
     };
+
     pkgs-unstable = import nixpkgs-unstable {
       inherit system;
       config.allowUnfree = true;
     };
 
-    iso_modules = [
-      "${nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix"
-      { isoImage.squashfsCompression = "zstd"; }
-    ];
-
     # Look into: https://git.sr.ht/~magic_rb/dotfiles/tree/master/item/nixos/systems/gooseberry
     pi_modules = [{ 
       # Disabling the whole `profiles/base.nix` module, which is responsible
@@ -71,24 +66,44 @@
 
       # Allows for remote deployment via
       # nixos-rebuild -L switch --flake .?submodules=1#HOSTNAME --target-host USER@HOSTNAME
-      nix.settings.require-sigs = false;
+      #nix.settings.require-sigs = false;
     }];
 
     # TODO: Surely a better way, no?
-    inherited_modules_lite = [
-      {
-        time.timeZone = timezone;
-        system.stateVersion = stateVersion;
-      }
-
+    _inherited_modules = [
       home-manager.nixosModules.home-manager
-    ];
-
-    inherited_modules = inherited_modules_lite ++ [
       disko.nixosModules.default
       lix-module.nixosModules.default
     ];
   in {
+    homeManagerModules = {
+      "lauren_lagarde" = [
+        {
+          home.username = "lauren_lagarde";
+          home.homeDirectory = "/home/lauren_lagarde";
+        }
+
+        ./home-manager/base.nix
+      ];
+
+      "lauren_lagarde@ll-latitude-e5591" = self.homeManagerModules."lauren_lagarde" ++ [
+        ./home-manager/i3.nix
+
+        ./secrets/mlaga97.nix
+        ./secrets/mlaga97-gui.nix
+
+        ./systems/ll-latitude-e5591/home.nix
+      ];
+    };
+
+    homeConfigurations = {
+      "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        modules = self.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+        extraSpecialArgs = { inherit inputs pkgs-unstable; };
+      };
+    };
+
     nixosConfigurations = {
       ll-latitude-e5591 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -96,11 +111,18 @@
           {
             networking.hostName = "ll-latitude-e5591";
             networking.hostId = "f55542ee";
+
+            system.stateVersion = "24.11";
           }
+
           ./systems/ll-latitude-e5591.nix
           ./disko/nvme/uefi-luks-lvm-ext4.nix
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
           waveforms.nixosModule
-        ] ++ inherited_modules;
+          disko.nixosModules.default
+        ];
         specialArgs = { inherit inputs pkgs-unstable; };
       };
 
@@ -126,13 +148,18 @@
             };
           }
           ./systems/ll-nixos-headless.nix
-        ] ++ inherited_modules;
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          waveforms.nixosModule
+          disko.nixosModules.default
+        ];
         specialArgs = { inherit inputs pkgs-unstable; };
       };
 
       ll-nixos-base = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = iso_modules ++ [
+        modules = [
           {
             networking.hostName = "ll-nixos-base";
             home-manager.users."lauren_lagarde" = { config, pkgs-unstable, ... }: {
@@ -140,7 +167,12 @@
             };
           }
           ./systems/ll-nixos-base.nix
-        ] ++ inherited_modules;
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          waveforms.nixosModule
+          disko.nixosModules.default
+        ];
 
         specialArgs = { inherit inputs pkgs-unstable; };
       };
@@ -148,11 +180,23 @@
       # Real Systems
       bastion-in-training = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ ./systems/bastion/bastion-in-training.nix ] ++ inherited_modules;
+        modules = [
+          ./systems/bastion/bastion-in-training.nix
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          disko.nixosModules.default
+        ];
       };
       bastion = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [ ./systems/bastion/bastion-actual.nix ] ++ inherited_modules;
+        modules = [
+          ./systems/bastion/bastion-actual.nix
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          disko.nixosModules.default
+        ];
       };
 
       stronghold = nixpkgs.lib.nixosSystem {
@@ -163,7 +207,11 @@
             networking.hostId = "c581a1cd";
           }
           ./systems/vm-docker-base.nix
-        ] ++ inherited_modules;
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          disko.nixosModules.default
+        ];
       };
 
       vm-docker-luks-test = nixpkgs.lib.nixosSystem {
@@ -174,7 +222,11 @@
             networking.hostId = "1b5432b7";
           }
           ./systems/vm-docker-luks.nix
-        ] ++ inherited_modules;
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          disko.nixosModules.default
+        ];
       };
 
       vm-docker-zfs-test = nixpkgs.lib.nixosSystem {
@@ -185,40 +237,50 @@
             networking.hostId = "459ecfce";
           }
           ./systems/vm-docker-host/vm-docker-host-zfs.nix
-        ] ++ inherited_modules;
+
+          lix-module.nixosModules.default
+          home-manager.nixosModules.home-manager
+          disko.nixosModules.default
+        ];
       };
     };
 
-    packages.aarch64-linux = {
-      ll-nixos-headless-pi-sdcard = nixos-generators.nixosGenerate {
-        system = "aarch64-linux";
-        format = "sd-aarch64";
-        modules = pi_modules ++ [
-          { networking.hostName = "ll-nixos-headless-pi"; }
-          ./systems/ll-nixos-headless.nix
-        ] ++ inherited_modules;
-        specialArgs = { inherit inputs pkgs-unstable; };
-      };
+    #packages.aarch64-linux = {
+    #  ll-nixos-headless-pi-sdcard = nixos-generators.nixosGenerate {
+    #    system = "aarch64-linux";
+    #    format = "sd-aarch64";
+    #    modules = pi_modules ++ [
+    #      { networking.hostName = "ll-nixos-headless-pi"; }
+    #      ./systems/ll-nixos-headless.nix
+    #      lix-module.nixosModules.default
+    #      home-manager.nixosModules.home-manager
+    #    ];
+    #    specialArgs = { inherit inputs pkgs-unstable; };
+    #  };
 
-      token-pi-sdcard = nixos-generators.nixosGenerate {
-        system = "aarch64-linux";
-        format = "sd-aarch64";
-        modules = pi_modules ++ [
-          { networking.hostName = "token-pi"; }
-          ./systems/ll-nixos-headless.nix
-        ] ++ inherited_modules;
-        specialArgs = { inherit inputs pkgs-unstable; };
-      };
+    #  token-pi-sdcard = nixos-generators.nixosGenerate {
+    #    system = "aarch64-linux";
+    #    format = "sd-aarch64";
+    #    modules = pi_modules ++ [
+    #      { networking.hostName = "token-pi"; }
+    #      ./systems/ll-nixos-headless.nix
+    #      lix-module.nixosModules.default
+    #      home-manager.nixosModules.home-manager
+    #    ];
+    #    specialArgs = { inherit inputs pkgs-unstable; };
+    #  };
 
-      outpost-sdcard = nixos-generators.nixosGenerate {
-        system = "aarch64-linux";
-        format = "sd-aarch64";
-        modules = pi_modules ++ [
-          ./systems/outpost.nix
-        ] ++ inherited_modules_lite;
-        specialArgs = { inherit inputs pkgs-unstable; };
-      };
-    };
+    #  outpost-sdcard = nixos-generators.nixosGenerate {
+    #    system = "aarch64-linux";
+    #    format = "sd-aarch64";
+    #    modules = pi_modules ++ [
+    #      ./systems/outpost.nix
+    #      lix-module.nixosModules.default
+    #      home-manager.nixosModules.home-manager
+    #    ];
+    #    specialArgs = { inherit inputs pkgs-unstable; };
+    #  };
+    #};
 
     packages.x86_64-linux = {
 
@@ -229,68 +291,78 @@
 
       # TODO: ll-nixos-headless-iso = nixos-generators.nixosGenerate {};
 
-      ll-nixos-base-iso = nixos-generators.nixosGenerate {
-        system = "x86_64-linux";
-        modules = iso_modules ++ [
-          {
-            networking.hostName = "ll-nixos";
-            home-manager.users."lauren_lagarde" = {
-              nixpkgs.config.allowUnfree = true;
-              imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
-            };
-          }
-          ./systems/ll-nixos-base.nix
-        ] ++ inherited_modules;
-        specialArgs = {
-          inherit inputs pkgs-unstable;
-        };
-        format = "install-iso";
-      };
+      #ll-nixos-base-iso = nixos-generators.nixosGenerate {
+      #  system = "x86_64-linux";
+      #  modules = [
+      #    {
+      #      networking.hostName = "ll-nixos";
+      #      home-manager.users."lauren_lagarde" = {
+      #        nixpkgs.config.allowUnfree = true;
+      #        imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+      #      };
+      #    }
+      #    ./systems/ll-nixos-base.nix
+      #    lix-module.nixosModules.default
+      #    home-manager.nixosModules.home-manager
+      #  ];
+      #  specialArgs = {
+      #    inherit inputs pkgs-unstable;
+      #  };
+      #  format = "install-iso";
+      #};
 
-      ll-nixos-full-iso = nixos-generators.nixosGenerate {
-        system = "x86_64-linux";
-        modules = iso_modules ++ [
-          {
-            networking.hostName = "ll-nixos";
-            home-manager.users."lauren_lagarde" = { config, ... }: {
-              nixpkgs.config.allowUnfree = true;
-              imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
-            };
-          }
-          ./systems/ll-nixos-full.nix
-          waveforms.nixosModule
-        ] ++ inherited_modules;
-        specialArgs = {
-          inherit inputs pkgs-unstable;
-        };
-        format = "install-iso";
-      };
+      #ll-nixos-full-iso = nixos-generators.nixosGenerate {
+      #  system = "x86_64-linux";
+      #  modules = [
+      #    {
+      #      networking.hostName = "ll-nixos";
+      #      home-manager.users."lauren_lagarde" = { config, ... }: {
+      #        nixpkgs.config.allowUnfree = true;
+      #        imports = inputs.mlaga97-home-manager.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
+      #      };
+      #    }
+      #    ./systems/ll-nixos-full.nix
 
-      ll-nixos-xmrig-worker-iso = nixos-generators.nixosGenerate {
-        system = "x86_64-linux";
-        modules = iso_modules ++ [
-          { networking.hostName = "ll-nixos-xmrig-worker"; }
-          ./systems/ll-nixos-xmrig-worker.nix
-        ] ++ inherited_modules;
-        format = "install-iso";
-      };
+      #    lix-module.nixosModules.default
+      #    home-manager.nixosModules.home-manager
+      #    waveforms.nixosModule
+      #    disko.nixosModules.default
+      #  ];
+      #  specialArgs = {
+      #    inherit inputs pkgs-unstable;
+      #  };
+      #  format = "install-iso";
+      #};
+
+      #ll-nixos-xmrig-worker-iso = nixos-generators.nixosGenerate {
+      #  system = "x86_64-linux";
+      #  modules = [
+      #    { networking.hostName = "ll-nixos-xmrig-worker"; }
+      #    ./systems/ll-nixos-xmrig-worker.nix
+      #    lix-module.nixosModules.default
+      #    home-manager.nixosModules.home-manager
+      #  ];
+      #  format = "install-iso";
+      #};
 
       ##########################################################################
       ##########################################################################
       ##########################################################################
       # Systems
 
-      living-room-nixos-iso = nixos-generators.nixosGenerate {
-        system = "x86_64-linux";
-        modules = iso_modules ++ [
-          { networking.hostName = "living-room-nixos-iso"; }
-          ./systems/living-room-nixos.nix
-        ] ++ inherited_modules;
-        format = "install-iso";
-        specialArgs = { inherit inputs pkgs-unstable; };
-      };
+      #living-room-nixos-iso = nixos-generators.nixosGenerate {
+      #  system = "x86_64-linux";
+      #  modules = [
+      #    { networking.hostName = "living-room-nixos-iso"; }
+      #    ./systems/living-room-nixos.nix
+      #    lix-module.nixosModules.default
+      #    home-manager.nixosModules.home-manager
+      #  ];
+      #  format = "install-iso";
+      #  specialArgs = { inherit inputs pkgs-unstable; };
+      #};
 
-      default = self.packages.x86_64-linux.ll-nixos-full-iso;
+      #default = self.packages.x86_64-linux.ll-nixos-full-iso;
     };
   };
 }
diff --git a/modules/mlaga97-home-manager/.gitignore b/home-manager/.gitignore
similarity index 100%
rename from modules/mlaga97-home-manager/.gitignore
rename to home-manager/.gitignore
diff --git a/modules/mlaga97-home-manager/README.md b/home-manager/README.md
similarity index 100%
rename from modules/mlaga97-home-manager/README.md
rename to home-manager/README.md
diff --git a/modules/mlaga97-home-manager/apply.sh b/home-manager/apply.sh
similarity index 100%
rename from modules/mlaga97-home-manager/apply.sh
rename to home-manager/apply.sh
diff --git a/modules/mlaga97-home-manager/assets/QtPass.conf b/home-manager/assets/QtPass.conf
similarity index 100%
rename from modules/mlaga97-home-manager/assets/QtPass.conf
rename to home-manager/assets/QtPass.conf
diff --git a/modules/mlaga97-home-manager/assets/resetbluetooth.sh b/home-manager/assets/resetbluetooth.sh
similarity index 100%
rename from modules/mlaga97-home-manager/assets/resetbluetooth.sh
rename to home-manager/assets/resetbluetooth.sh
diff --git a/modules/mlaga97-home-manager/base.nix b/home-manager/base.nix
similarity index 100%
rename from modules/mlaga97-home-manager/base.nix
rename to home-manager/base.nix
diff --git a/modules/mlaga97-home-manager/clear_secrets.sh b/home-manager/clear_secrets.sh
similarity index 100%
rename from modules/mlaga97-home-manager/clear_secrets.sh
rename to home-manager/clear_secrets.sh
diff --git a/modules/mlaga97-home-manager/default.nix b/home-manager/default.nix
similarity index 100%
rename from modules/mlaga97-home-manager/default.nix
rename to home-manager/default.nix
diff --git a/modules/mlaga97-home-manager/i3.nix b/home-manager/i3.nix
similarity index 100%
rename from modules/mlaga97-home-manager/i3.nix
rename to home-manager/i3.nix
diff --git a/modules/mlaga97-home-manager/pop_secrets.sh b/home-manager/pop_secrets.sh
similarity index 100%
rename from modules/mlaga97-home-manager/pop_secrets.sh
rename to home-manager/pop_secrets.sh
diff --git a/modules/mlaga97-home-manager/programs/chromium.nix b/home-manager/programs/chromium.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/chromium.nix
rename to home-manager/programs/chromium.nix
diff --git a/modules/mlaga97-home-manager/programs/firefox.nix b/home-manager/programs/firefox.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/firefox.nix
rename to home-manager/programs/firefox.nix
diff --git a/modules/mlaga97-home-manager/programs/gnome-terminal.nix b/home-manager/programs/gnome-terminal.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/gnome-terminal.nix
rename to home-manager/programs/gnome-terminal.nix
diff --git a/modules/mlaga97-home-manager/programs/gpg.nix b/home-manager/programs/gpg.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/gpg.nix
rename to home-manager/programs/gpg.nix
diff --git a/modules/mlaga97-home-manager/programs/kitty.nix b/home-manager/programs/kitty.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/kitty.nix
rename to home-manager/programs/kitty.nix
diff --git a/modules/mlaga97-home-manager/programs/polybar.nix b/home-manager/programs/polybar.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/polybar.nix
rename to home-manager/programs/polybar.nix
diff --git a/modules/mlaga97-home-manager/programs/thunderbird.nix b/home-manager/programs/thunderbird.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/thunderbird.nix
rename to home-manager/programs/thunderbird.nix
diff --git a/modules/mlaga97-home-manager/programs/vim.nix b/home-manager/programs/vim.nix
similarity index 100%
rename from modules/mlaga97-home-manager/programs/vim.nix
rename to home-manager/programs/vim.nix
diff --git a/modules/mlaga97-home-manager/pubkeys/ajfunk27_pubkey_20240129.asc b/home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
similarity index 100%
rename from modules/mlaga97-home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
rename to home-manager/pubkeys/ajfunk27_pubkey_20240129.asc
diff --git a/modules/mlaga97-home-manager/pubkeys/mlaga97_pubkey_20240419.asc b/home-manager/pubkeys/mlaga97_pubkey_20240419.asc
similarity index 100%
rename from modules/mlaga97-home-manager/pubkeys/mlaga97_pubkey_20240419.asc
rename to home-manager/pubkeys/mlaga97_pubkey_20240419.asc
diff --git a/modules/mlaga97-home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc b/home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
similarity index 100%
rename from modules/mlaga97-home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
rename to home-manager/pubkeys/mlaga97_with_revoked_uids_20240419.asc
diff --git a/modules/mlaga97-home-manager/push_secrets.sh b/home-manager/push_secrets.sh
similarity index 100%
rename from modules/mlaga97-home-manager/push_secrets.sh
rename to home-manager/push_secrets.sh
diff --git a/modules/mlaga97-home-manager/secrets.tar.zst.gpg b/home-manager/secrets.tar.zst.gpg
similarity index 100%
rename from modules/mlaga97-home-manager/secrets.tar.zst.gpg
rename to home-manager/secrets.tar.zst.gpg
diff --git a/modules/mlaga97-home-manager/systems/precision-5470.nix b/home-manager/systems/precision-5470.nix
similarity index 100%
rename from modules/mlaga97-home-manager/systems/precision-5470.nix
rename to home-manager/systems/precision-5470.nix
diff --git a/home.sh b/home.sh
new file mode 100755
index 0000000..2375491
--- /dev/null
+++ b/home.sh
@@ -0,0 +1,2 @@
+rm -rf /home/lauren_lagarde/.mozilla/firefox/lauren/browser-extension-data/7esoorv3@alefvanoon.anonaddy.me/
+home-manager switch -b backup --flake .?submodules=1
diff --git a/modules/mlaga97-home-manager/flake.lock b/modules/mlaga97-home-manager/flake.lock
deleted file mode 100644
index c4f502e..0000000
--- a/modules/mlaga97-home-manager/flake.lock
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744117652,
-        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1744440957,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/modules/mlaga97-home-manager/flake.nix b/modules/mlaga97-home-manager/flake.nix
deleted file mode 100644
index 3bcfc54..0000000
--- a/modules/mlaga97-home-manager/flake.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  description = "Lauren's Home Manager Flake";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  outputs = { self, home-manager, nixpkgs, nixpkgs-unstable, ... }@inputs: let 
-    system = "x86_64-linux";
-
-    pkgs = import nixpkgs {
-      inherit system;
-      config.allowUnfree = true;
-    };
-    pkgs-unstable = import nixpkgs-unstable {
-      inherit system;
-    };
-  in {
-    # Enables all of these be used in a system flake
-    # https://discourse.nixos.org/t/nixos-home-manager-config-where-both-use-flakes/41410/2
-    homeManagerModules = {
-      #inherit pkgs-unstable; #TODO: ????
-
-      "lauren_lagarde" = [
-        {
-          home.username = "lauren_lagarde";
-          home.homeDirectory = "/home/lauren_lagarde";
-        }
-        ./base.nix
-      ];
-
-      "lauren_lagarde@ll-latitude-e5591" = self.homeManagerModules."lauren_lagarde" ++ [
-        ./i3.nix
-
-        ./secrets/dotspace.nix
-        ./secrets/dotspace_gui.nix
-
-        ./systems/ll-latitude-e5591.nix
-      ];
-    };
-
-    homeConfigurations = {
-      "lauren_lagarde" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = self.homeManagerModules."lauren_lagarde";
-        extraSpecialArgs = { inherit inputs pkgs-unstable; };
-      };
-
-      "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = self.homeManagerModules."lauren_lagarde@ll-latitude-e5591";
-        extraSpecialArgs = { inherit inputs pkgs-unstable; };
-      };
-    };
-  };
-}
diff --git a/modules/mlaga97-home-manager/monitor_configs.nix b/modules/mlaga97-home-manager/monitor_configs.nix
deleted file mode 100644
index 10e5eee..0000000
--- a/modules/mlaga97-home-manager/monitor_configs.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ home-manager, ... }: {
-  home.file = {
-    "xps/standalone" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output eDP-1 --mode 1920x1200 --primary \
-          --output DP-1-1 --off \
-          --output DP-1-2 --off \
-          --output DP-1-3 --off
-        i3-msg restart
-      '';
-    };
-    "xps/desk" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output eDP-1 --off \
-          --output DP-1-1 --mode 1920x1080 --rate 30 --left-of DP-1-2 \
-          --output DP-1-2 --mode 3840x2160 --rate 30 --primary \
-          --output DP-1-3 --mode 3840x2160 --rate 30 --right-of DP-1-2
-        i3-msg restart
-      '';
-    };
-    "xps/workbench" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output eDP-1 --off \
-          --output DP-1-1 --mode 3840x2160 --rate 30 --left-of DP-1-2 \
-          --output DP-1-2 --mode 3840x2160 --rate 30 --primary \
-          --output DP-1-3 --mode 1920x1080 --rate 30 --right-of DP-1-2
-        i3-msg restart
-      '';
-    };
-
-    "precision/tv" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output eDP-1 --mode 1920x1080 --primary \
-          --output DP-4 --mode 1920x1080 --rate 60
-        i3-msg restart
-      '';
-    };
-    "precision/desk" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output DP-4-3 --mode 3840x2160 --rate 30 --primary \
-          --output DP-4-1 --mode 3840x2160 --rate 30 --right-of DP-4-3 \
-          --output eDP-1 --off
-        i3-msg restart
-      '';
-    };
-    "precision/work" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output DP-2-2 --mode 3840x2160 --rate 30 --primary \
-          --output DP-2-1 --mode 3840x2160 --rate 30 --right-of DP-2-2 \
-          --output eDP-1 --off
-        i3-msg restart
-      '';
-    };
-    "precision/standalone" = {
-      executable = true;
-      text = ''
-        xrandr \
-          --output eDP-1 --mode 1920x1200 --primary \
-          --output DP-4 --off \
-          --output DP-2-1 --off \
-          --output DP-2-2 --off \
-          --output DP-4-1 --off \
-          --output DP-4-3 --off
-        i3-msg restart
-      '';
-    };
-  };
-}
diff --git a/modules/mlaga97-home-manager/secrets/finish.sh b/modules/mlaga97-home-manager/secrets/finish.sh
deleted file mode 100755
index 5c9aa87..0000000
--- a/modules/mlaga97-home-manager/secrets/finish.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Get passwords
-git clone ssh://git@git.mlaga97.space:2222/mlaga97/.password-store
diff --git a/modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix b/modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix
deleted file mode 100644
index 33b5005..0000000
--- a/modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ pkgs, ... }: { 
-  imports = [
-    ./latitude-e5591.nix
-
-    ../programs/thunderbird.nix
-  ];
-
-  home.file = {
-    ".local/share/OpenSCAD/libraries/BOSL2" = {
-      source = builtins.fetchGit {
-        url = "https://github.com/BelfrySCAD/BOSL2";
-        rev = "7821a5143c7ab488ff3ff73d0cd0c4b508fb5796";
-      };
-    };
-  };
-
-  home.packages = with pkgs; [
-    # TODO: Figure these ones out
-    #dunst
-    #xidlehook?
-
-    # Lauren Base GUI
-    vlc
-    mpv
-    gparted
-    shutter
-    nemo-with-extensions
-
-    # Other Apps
-    chromium
-    librecad
-    libreoffice
-    virt-manager
-    sublime-merge
-    openscad-unstable
-
-    # Dotspace
-    gthumb
-    qtpass
-    ledger
-    sound-juicer
-    #pkgs-unstable.yt-dlp
-    #pkgs-unstable.openscad-unstable
-
-    # ll-latitude-e5591
-    wine
-  ];
-}
diff --git a/disko/libvirt/luks-lvm.nix b/nixos/disko/libvirt/luks-lvm.nix
similarity index 100%
rename from disko/libvirt/luks-lvm.nix
rename to nixos/disko/libvirt/luks-lvm.nix
diff --git a/disko/libvirt/lvm-ext4.nix b/nixos/disko/libvirt/lvm-ext4.nix
similarity index 100%
rename from disko/libvirt/lvm-ext4.nix
rename to nixos/disko/libvirt/lvm-ext4.nix
diff --git a/disko/libvirt/lvm.nix b/nixos/disko/libvirt/lvm.nix
similarity index 100%
rename from disko/libvirt/lvm.nix
rename to nixos/disko/libvirt/lvm.nix
diff --git a/disko/libvirt/uefi-base.nix b/nixos/disko/libvirt/uefi-base.nix
similarity index 100%
rename from disko/libvirt/uefi-base.nix
rename to nixos/disko/libvirt/uefi-base.nix
diff --git a/disko/libvirt/uefi-zfs-base.nix b/nixos/disko/libvirt/uefi-zfs-base.nix
similarity index 100%
rename from disko/libvirt/uefi-zfs-base.nix
rename to nixos/disko/libvirt/uefi-zfs-base.nix
diff --git a/disko/libvirt/zfs-encrypted.nix b/nixos/disko/libvirt/zfs-encrypted.nix
similarity index 100%
rename from disko/libvirt/zfs-encrypted.nix
rename to nixos/disko/libvirt/zfs-encrypted.nix
diff --git a/disko/libvirt/zfs-mirror.nix b/nixos/disko/libvirt/zfs-mirror.nix
similarity index 100%
rename from disko/libvirt/zfs-mirror.nix
rename to nixos/disko/libvirt/zfs-mirror.nix
diff --git a/disko/nvme/uefi-luks-lvm-ext4.nix b/nixos/disko/nvme/uefi-luks-lvm-ext4.nix
similarity index 100%
rename from disko/nvme/uefi-luks-lvm-ext4.nix
rename to nixos/disko/nvme/uefi-luks-lvm-ext4.nix
diff --git a/features/base.nix b/nixos/features/base.nix
similarity index 100%
rename from features/base.nix
rename to nixos/features/base.nix
diff --git a/features/embedded.nix b/nixos/features/embedded.nix
similarity index 100%
rename from features/embedded.nix
rename to nixos/features/embedded.nix
diff --git a/features/factorio.nix b/nixos/features/factorio.nix
similarity index 100%
rename from features/factorio.nix
rename to nixos/features/factorio.nix
diff --git a/features/frigate-mpv-cage.nix b/nixos/features/frigate-mpv-cage.nix
similarity index 100%
rename from features/frigate-mpv-cage.nix
rename to nixos/features/frigate-mpv-cage.nix
diff --git a/features/gpu/intel.nix b/nixos/features/gpu/intel.nix
similarity index 100%
rename from features/gpu/intel.nix
rename to nixos/features/gpu/intel.nix
diff --git a/features/gpu/nvidia.nix b/nixos/features/gpu/nvidia.nix
similarity index 100%
rename from features/gpu/nvidia.nix
rename to nixos/features/gpu/nvidia.nix
diff --git a/features/gui-apps.nix b/nixos/features/gui-apps.nix
similarity index 100%
rename from features/gui-apps.nix
rename to nixos/features/gui-apps.nix
diff --git a/features/hardware/printing.nix b/nixos/features/hardware/printing.nix
similarity index 100%
rename from features/hardware/printing.nix
rename to nixos/features/hardware/printing.nix
diff --git a/features/hardware/rtl-sdr.nix b/nixos/features/hardware/rtl-sdr.nix
similarity index 100%
rename from features/hardware/rtl-sdr.nix
rename to nixos/features/hardware/rtl-sdr.nix
diff --git a/features/hardware/yubikey.nix b/nixos/features/hardware/yubikey.nix
similarity index 100%
rename from features/hardware/yubikey.nix
rename to nixos/features/hardware/yubikey.nix
diff --git a/features/headless.nix b/nixos/features/headless.nix
similarity index 100%
rename from features/headless.nix
rename to nixos/features/headless.nix
diff --git a/features/i3_old.nix b/nixos/features/i3_old.nix
similarity index 100%
rename from features/i3_old.nix
rename to nixos/features/i3_old.nix
diff --git a/features/i3wm.nix b/nixos/features/i3wm.nix
similarity index 100%
rename from features/i3wm.nix
rename to nixos/features/i3wm.nix
diff --git a/features/initrd-ssh.nix b/nixos/features/initrd-ssh.nix
similarity index 100%
rename from features/initrd-ssh.nix
rename to nixos/features/initrd-ssh.nix
diff --git a/features/networking/networkd-br0.nix b/nixos/features/networking/networkd-br0.nix
similarity index 100%
rename from features/networking/networkd-br0.nix
rename to nixos/features/networking/networkd-br0.nix
diff --git a/features/openssh-server.nix b/nixos/features/openssh-server.nix
similarity index 100%
rename from features/openssh-server.nix
rename to nixos/features/openssh-server.nix
diff --git a/features/stronghold-binary-cache.nix b/nixos/features/stronghold-binary-cache.nix
similarity index 100%
rename from features/stronghold-binary-cache.nix
rename to nixos/features/stronghold-binary-cache.nix
diff --git a/features/systemd-boot.nix b/nixos/features/systemd-boot.nix
similarity index 100%
rename from features/systemd-boot.nix
rename to nixos/features/systemd-boot.nix
diff --git a/features/tui-apps.nix b/nixos/features/tui-apps.nix
similarity index 100%
rename from features/tui-apps.nix
rename to nixos/features/tui-apps.nix
diff --git a/features/virtualization/docker.nix b/nixos/features/virtualization/docker.nix
similarity index 100%
rename from features/virtualization/docker.nix
rename to nixos/features/virtualization/docker.nix
diff --git a/features/virtualization/dockge.nix b/nixos/features/virtualization/dockge.nix
similarity index 100%
rename from features/virtualization/dockge.nix
rename to nixos/features/virtualization/dockge.nix
diff --git a/features/virtualization/libvirt-guest-uefi.nix b/nixos/features/virtualization/libvirt-guest-uefi.nix
similarity index 100%
rename from features/virtualization/libvirt-guest-uefi.nix
rename to nixos/features/virtualization/libvirt-guest-uefi.nix
diff --git a/features/virtualization/libvirt-host.nix b/nixos/features/virtualization/libvirt-host.nix
similarity index 100%
rename from features/virtualization/libvirt-host.nix
rename to nixos/features/virtualization/libvirt-host.nix
diff --git a/features/virtualization/persistent_docker.nix b/nixos/features/virtualization/persistent_docker.nix
similarity index 100%
rename from features/virtualization/persistent_docker.nix
rename to nixos/features/virtualization/persistent_docker.nix
diff --git a/features/virtualization/virtualbox-host.nix b/nixos/features/virtualization/virtualbox-host.nix
similarity index 100%
rename from features/virtualization/virtualbox-host.nix
rename to nixos/features/virtualization/virtualbox-host.nix
diff --git a/tweaks/aarch64-crosscompile.nix b/nixos/tweaks/aarch64-crosscompile.nix
similarity index 100%
rename from tweaks/aarch64-crosscompile.nix
rename to nixos/tweaks/aarch64-crosscompile.nix
diff --git a/tweaks/bluetooth.nix b/nixos/tweaks/bluetooth.nix
similarity index 100%
rename from tweaks/bluetooth.nix
rename to nixos/tweaks/bluetooth.nix
diff --git a/tweaks/disable_firewall.nix b/nixos/tweaks/disable_firewall.nix
similarity index 100%
rename from tweaks/disable_firewall.nix
rename to nixos/tweaks/disable_firewall.nix
diff --git a/tweaks/disable_nixos_user.nix b/nixos/tweaks/disable_nixos_user.nix
similarity index 100%
rename from tweaks/disable_nixos_user.nix
rename to nixos/tweaks/disable_nixos_user.nix
diff --git a/tweaks/enable_flakes.nix b/nixos/tweaks/enable_flakes.nix
similarity index 100%
rename from tweaks/enable_flakes.nix
rename to nixos/tweaks/enable_flakes.nix
diff --git a/tweaks/intel_igpu_screen_tearing.nix b/nixos/tweaks/intel_igpu_screen_tearing.nix
similarity index 100%
rename from tweaks/intel_igpu_screen_tearing.nix
rename to nixos/tweaks/intel_igpu_screen_tearing.nix
diff --git a/tweaks/powersave.nix b/nixos/tweaks/powersave.nix
similarity index 100%
rename from tweaks/powersave.nix
rename to nixos/tweaks/powersave.nix
diff --git a/tweaks/systemd-resolved_nonsense.nix b/nixos/tweaks/systemd-resolved_nonsense.nix
similarity index 100%
rename from tweaks/systemd-resolved_nonsense.nix
rename to nixos/tweaks/systemd-resolved_nonsense.nix
diff --git a/tweaks/zfs.nix b/nixos/tweaks/zfs.nix
similarity index 100%
rename from tweaks/zfs.nix
rename to nixos/tweaks/zfs.nix
diff --git a/tweaks/zram.nix b/nixos/tweaks/zram.nix
similarity index 100%
rename from tweaks/zram.nix
rename to nixos/tweaks/zram.nix
diff --git a/secrets.tar.zst.gpg b/secrets.tar.zst.gpg
index 128020f..ce6c93c 100644
Binary files a/secrets.tar.zst.gpg and b/secrets.tar.zst.gpg differ
diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591/configuration.nix
similarity index 100%
rename from systems/ll-latitude-e5591.nix
rename to systems/ll-latitude-e5591/configuration.nix
diff --git a/modules/mlaga97-home-manager/systems/latitude-e5591.nix b/systems/ll-latitude-e5591/home.nix
similarity index 59%
rename from modules/mlaga97-home-manager/systems/latitude-e5591.nix
rename to systems/ll-latitude-e5591/home.nix
index d140900..5eb8d9f 100644
--- a/modules/mlaga97-home-manager/systems/latitude-e5591.nix
+++ b/systems/ll-latitude-e5591/home.nix
@@ -1,5 +1,15 @@
-{ ... }: { 
+{ pkgs, ... }: { 
+  imports = [
+    ../../home-manager/programs/thunderbird.nix
+  ];
+
   home.file = {
+    ".local/share/OpenSCAD/libraries/BOSL2" = {
+      source = builtins.fetchGit {
+        url = "https://github.com/BelfrySCAD/BOSL2";
+        rev = "7821a5143c7ab488ff3ff73d0cd0c4b508fb5796";
+      };
+    };
     "latitude/tv" = {
       executable = true;
       text = ''
@@ -40,4 +50,36 @@
       '';
     };
   };
+
+  home.packages = with pkgs; [
+    # TODO: Figure these ones out
+    #dunst
+    #xidlehook?
+
+    # Lauren Base GUI
+    vlc
+    mpv
+    gparted
+    shutter
+    nemo-with-extensions
+
+    # Other Apps
+    chromium
+    librecad
+    libreoffice
+    virt-manager
+    sublime-merge
+    openscad-unstable
+
+    # Dotspace
+    gthumb
+    qtpass
+    ledger
+    sound-juicer
+    #pkgs-unstable.yt-dlp
+    #pkgs-unstable.openscad-unstable
+
+    # ll-latitude-e5591
+    wine
+  ];
 }