Lots of refactoring

systems/ll-nixos-base.nix

@@ -1,22 +1,27 @@
-{ ... }: {
+{ pkgs, ... }: {
   imports = [
-    ./ll-nixos-headless.nix
+    # Core Features
+    ../features/base.nix
+    ../features/tui-apps.nix
+    ../features/openssh-server.nix
+
+    # Core Tweaks
+    ../tweaks/zram.nix
+    ../tweaks/enable_flakes.nix
+    ../tweaks/disable_nixos_user.nix
+    ../tweaks/systemd-resolved_nonsense.nix
+
+    # Lauren Base
+    ../users/lauren_lagarde/lauren_lagarde.nix
 
     # i3wm
-    ../features/i3.nix
-    ../features/yubikey.nix
+    ../features/i3wm.nix
+    ../features/hardware/yubikey.nix
     ../tweaks/bluetooth.nix
     ../tweaks/intel_igpu_screen_tearing.nix
 
-    # Lauren
-    ../users/lauren_lagarde/i3.nix
-    ../users/lauren_lagarde/autologin.nix
+    # Dotspace
+    ../secrets/dotspace.nix
+    ../features/stronghold-binary-cache.nix
   ];
-
-  home-manager.users.lauren_lagarde = {
-    imports = [
-      ../users/lauren_lagarde/home-manager/monitor_configs.nix
-      ../users/lauren_lagarde/home-manager/secrets/dotspace_gui.nix
-    ];
-  };
 }