From 83a6b1c73c26d9ca8ce4579566857253b672199f Mon Sep 17 00:00:00 2001
From: Lauren Lagarde <lauren@lagarde.dev>
Date: Mon, 23 Jun 2025 22:26:22 -0500
Subject: [PATCH] Make home-manager config for ll-latitude-e5591 build again

---
 flake.lock                                    |  54 +---
 flake.nix                                     | 304 +++++++++++-------
 .../.gitignore                                |   0
 .../README.md                                 |   0
 .../apply.sh                                  |   0
 .../assets/QtPass.conf                        |   0
 .../assets/resetbluetooth.sh                  |   0
 .../base.nix                                  |   0
 .../clear_secrets.sh                          |   0
 .../default.nix                               |   0
 .../i3.nix                                    |   0
 .../pop_secrets.sh                            |   0
 .../programs/chromium.nix                     |   0
 .../programs/firefox.nix                      |   0
 .../programs/gnome-terminal.nix               |   0
 .../programs/gpg.nix                          |   0
 .../programs/kitty.nix                        |   0
 .../programs/polybar.nix                      |   0
 .../programs/thunderbird.nix                  |   0
 .../programs/vim.nix                          |   0
 .../pubkeys/ajfunk27_pubkey_20240129.asc      |   0
 .../pubkeys/mlaga97_pubkey_20240419.asc       |   0
 .../mlaga97_with_revoked_uids_20240419.asc    |   0
 .../push_secrets.sh                           |   0
 .../secrets.tar.zst.gpg                       | Bin
 .../systems/precision-5470.nix                |   0
 home.sh                                       |   2 +
 modules/mlaga97-home-manager/flake.lock       |  66 ----
 modules/mlaga97-home-manager/flake.nix        |  60 ----
 .../mlaga97-home-manager/monitor_configs.nix  |  80 -----
 .../mlaga97-home-manager/secrets/finish.sh    |   4 -
 .../systems/ll-latitude-e5591.nix             |  48 ---
 {disko => nixos/disko}/libvirt/luks-lvm.nix   |   0
 {disko => nixos/disko}/libvirt/lvm-ext4.nix   |   0
 {disko => nixos/disko}/libvirt/lvm.nix        |   0
 {disko => nixos/disko}/libvirt/uefi-base.nix  |   0
 .../disko}/libvirt/uefi-zfs-base.nix          |   0
 .../disko}/libvirt/zfs-encrypted.nix          |   0
 {disko => nixos/disko}/libvirt/zfs-mirror.nix |   0
 .../disko}/nvme/uefi-luks-lvm-ext4.nix        |   0
 {features => nixos/features}/base.nix         |   0
 {features => nixos/features}/embedded.nix     |   0
 {features => nixos/features}/factorio.nix     |   0
 .../features}/frigate-mpv-cage.nix            |   0
 {features => nixos/features}/gpu/intel.nix    |   0
 {features => nixos/features}/gpu/nvidia.nix   |   0
 {features => nixos/features}/gui-apps.nix     |   0
 .../features}/hardware/printing.nix           |   0
 .../features}/hardware/rtl-sdr.nix            |   0
 .../features}/hardware/yubikey.nix            |   0
 {features => nixos/features}/headless.nix     |   0
 {features => nixos/features}/i3_old.nix       |   0
 {features => nixos/features}/i3wm.nix         |   0
 {features => nixos/features}/initrd-ssh.nix   |   0
 .../features}/networking/networkd-br0.nix     |   0
 .../features}/openssh-server.nix              |   0
 .../features}/stronghold-binary-cache.nix     |   0
 {features => nixos/features}/systemd-boot.nix |   0
 {features => nixos/features}/tui-apps.nix     |   0
 .../features}/virtualization/docker.nix       |   0
 .../features}/virtualization/dockge.nix       |   0
 .../virtualization/libvirt-guest-uefi.nix     |   0
 .../features}/virtualization/libvirt-host.nix |   0
 .../virtualization/persistent_docker.nix      |   0
 .../virtualization/virtualbox-host.nix        |   0
 .../tweaks}/aarch64-crosscompile.nix          |   0
 {tweaks => nixos/tweaks}/bluetooth.nix        |   0
 {tweaks => nixos/tweaks}/disable_firewall.nix |   0
 .../tweaks}/disable_nixos_user.nix            |   0
 {tweaks => nixos/tweaks}/enable_flakes.nix    |   0
 .../tweaks}/intel_igpu_screen_tearing.nix     |   0
 {tweaks => nixos/tweaks}/powersave.nix        |   0
 .../tweaks}/systemd-resolved_nonsense.nix     |   0
 {tweaks => nixos/tweaks}/zfs.nix              |   0
 {tweaks => nixos/tweaks}/zram.nix             |   0
 secrets.tar.zst.gpg                           | Bin 2342 -> 6133 bytes
 .../configuration.nix}                        |   0
 .../ll-latitude-e5591/home.nix                |  44 ++-
 78 files changed, 236 insertions(+), 426 deletions(-)
 rename {modules/mlaga97-home-manager => home-manager}/.gitignore (100%)
 rename {modules/mlaga97-home-manager => home-manager}/README.md (100%)
 rename {modules/mlaga97-home-manager => home-manager}/apply.sh (100%)
 rename {modules/mlaga97-home-manager => home-manager}/assets/QtPass.conf (100%)
 rename {modules/mlaga97-home-manager => home-manager}/assets/resetbluetooth.sh (100%)
 rename {modules/mlaga97-home-manager => home-manager}/base.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/clear_secrets.sh (100%)
 rename {modules/mlaga97-home-manager => home-manager}/default.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/i3.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/pop_secrets.sh (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/chromium.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/firefox.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/gnome-terminal.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/gpg.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/kitty.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/polybar.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/thunderbird.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/programs/vim.nix (100%)
 rename {modules/mlaga97-home-manager => home-manager}/pubkeys/ajfunk27_pubkey_20240129.asc (100%)
 rename {modules/mlaga97-home-manager => home-manager}/pubkeys/mlaga97_pubkey_20240419.asc (100%)
 rename {modules/mlaga97-home-manager => home-manager}/pubkeys/mlaga97_with_revoked_uids_20240419.asc (100%)
 rename {modules/mlaga97-home-manager => home-manager}/push_secrets.sh (100%)
 rename {modules/mlaga97-home-manager => home-manager}/secrets.tar.zst.gpg (100%)
 rename {modules/mlaga97-home-manager => home-manager}/systems/precision-5470.nix (100%)
 create mode 100755 home.sh
 delete mode 100644 modules/mlaga97-home-manager/flake.lock
 delete mode 100644 modules/mlaga97-home-manager/flake.nix
 delete mode 100644 modules/mlaga97-home-manager/monitor_configs.nix
 delete mode 100755 modules/mlaga97-home-manager/secrets/finish.sh
 delete mode 100644 modules/mlaga97-home-manager/systems/ll-latitude-e5591.nix
 rename {disko => nixos/disko}/libvirt/luks-lvm.nix (100%)
 rename {disko => nixos/disko}/libvirt/lvm-ext4.nix (100%)
 rename {disko => nixos/disko}/libvirt/lvm.nix (100%)
 rename {disko => nixos/disko}/libvirt/uefi-base.nix (100%)
 rename {disko => nixos/disko}/libvirt/uefi-zfs-base.nix (100%)
 rename {disko => nixos/disko}/libvirt/zfs-encrypted.nix (100%)
 rename {disko => nixos/disko}/libvirt/zfs-mirror.nix (100%)
 rename {disko => nixos/disko}/nvme/uefi-luks-lvm-ext4.nix (100%)
 rename {features => nixos/features}/base.nix (100%)
 rename {features => nixos/features}/embedded.nix (100%)
 rename {features => nixos/features}/factorio.nix (100%)
 rename {features => nixos/features}/frigate-mpv-cage.nix (100%)
 rename {features => nixos/features}/gpu/intel.nix (100%)
 rename {features => nixos/features}/gpu/nvidia.nix (100%)
 rename {features => nixos/features}/gui-apps.nix (100%)
 rename {features => nixos/features}/hardware/printing.nix (100%)
 rename {features => nixos/features}/hardware/rtl-sdr.nix (100%)
 rename {features => nixos/features}/hardware/yubikey.nix (100%)
 rename {features => nixos/features}/headless.nix (100%)
 rename {features => nixos/features}/i3_old.nix (100%)
 rename {features => nixos/features}/i3wm.nix (100%)
 rename {features => nixos/features}/initrd-ssh.nix (100%)
 rename {features => nixos/features}/networking/networkd-br0.nix (100%)
 rename {features => nixos/features}/openssh-server.nix (100%)
 rename {features => nixos/features}/stronghold-binary-cache.nix (100%)
 rename {features => nixos/features}/systemd-boot.nix (100%)
 rename {features => nixos/features}/tui-apps.nix (100%)
 rename {features => nixos/features}/virtualization/docker.nix (100%)
 rename {features => nixos/features}/virtualization/dockge.nix (100%)
 rename {features => nixos/features}/virtualization/libvirt-guest-uefi.nix (100%)
 rename {features => nixos/features}/virtualization/libvirt-host.nix (100%)
 rename {features => nixos/features}/virtualization/persistent_docker.nix (100%)
 rename {features => nixos/features}/virtualization/virtualbox-host.nix (100%)
 rename {tweaks => nixos/tweaks}/aarch64-crosscompile.nix (100%)
 rename {tweaks => nixos/tweaks}/bluetooth.nix (100%)
 rename {tweaks => nixos/tweaks}/disable_firewall.nix (100%)
 rename {tweaks => nixos/tweaks}/disable_nixos_user.nix (100%)
 rename {tweaks => nixos/tweaks}/enable_flakes.nix (100%)
 rename {tweaks => nixos/tweaks}/intel_igpu_screen_tearing.nix (100%)
 rename {tweaks => nixos/tweaks}/powersave.nix (100%)
 rename {tweaks => nixos/tweaks}/systemd-resolved_nonsense.nix (100%)
 rename {tweaks => nixos/tweaks}/zfs.nix (100%)
 rename {tweaks => nixos/tweaks}/zram.nix (100%)
 rename systems/{ll-latitude-e5591.nix => ll-latitude-e5591/configuration.nix} (100%)
 rename modules/mlaga97-home-manager/systems/latitude-e5591.nix => systems/ll-latitude-e5591/home.nix (59%)

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 128020faf7953458259acf1383512ea7b859511a..ce6c93ca576abb8473c0ab08d280232012928032 100644
GIT binary patch
literal 6133
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
H^0~5d2>Iva

literal 2342
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
MuWDx$I226|GUDledH?_b

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
+  ];
 }