Additional updates to bastion

systems/bastion/bastion_base.nix

@@ -1,27 +1,35 @@
 { pkgs, ... }: {
   imports = [
-    # Base Config
+    # Core Features
     ../../features/base.nix
-    ../../features/headless.nix
+    ../../features/tui-apps.nix
+    ../../features/openssh-server.nix
 
-    # Features
+    # Core Tweaks
+    ../../tweaks/zram.nix
+    ../../tweaks/enable_flakes.nix
+    ../../tweaks/disable_nixos_user.nix
+    ../../tweaks/systemd-resolved_nonsense.nix
+
+    # Dotspace
+    ../../secrets/dotspace.nix
+    ../../secrets/dotspace_shares.nix
+    ../../features/stronghold-binary-cache.nix
+
+    # Users
+    ../../users/lauren_lagarde/lauren_lagarde.nix
+    ../../users/ashley_funkhouser/ashley_funkhouser.nix
+
+    # Bastion Features
+    ../../features/hardware/yubikey.nix
     ../../features/networking/networkd-br0.nix
     ../../features/virtualization/dockge.nix
     ../../features/virtualization/docker.nix
     ../../features/virtualization/libvirt-host.nix
 
-    # Tweaks
+    # Bastion Tweaks
     ../../tweaks/zfs.nix
-    ../../tweaks/zram.nix
     ../../tweaks/disable_firewall.nix
-    ../../tweaks/systemd-resolved_nonsense.nix
-
-    # Dotspace
-    ../../secrets/dotspace.nix
-
-    # Users
-    ../../users/lauren_lagarde/lauren_lagarde.nix
-    ../../users/ashley_funkhouser/ashley_funkhouser.nix
   ];
 
   ##############################################################################