diff --git a/home-manager/i3.nix b/home-manager/i3.nix
index 7098088..a5bcb01 100644
--- a/home-manager/i3.nix
+++ b/home-manager/i3.nix
@@ -3,12 +3,12 @@
     ./programs/kitty.nix
     ./programs/firefox.nix
     ./programs/polybar.nix
-    ./programs/chromium.nix
+    #./programs/chromium.nix
     ./programs/gnome-terminal.nix
   ];
 
-  services.blueman-applet.enable = true;
-  services.network-manager-applet.enable = true;
+  #services.blueman-applet.enable = true;
+  #services.network-manager-applet.enable = true;
 
   services.flameshot = {
     enable = true;
@@ -27,9 +27,9 @@
     ];
   };
 
-  programs.mpv.enable = true;
+  #programs.mpv.enable = true;
   programs.firefox.enable = true;
-  programs.chromium.enable = true;
+  #programs.chromium.enable = true;
   programs.browserpass.enable = true;
 
   programs.rofi = {
@@ -43,39 +43,39 @@
     #dunst
     #xidlehook?
 
-    feh
-    vlc
-    loupe
+  #  feh
+  #  vlc
+  #  loupe
     arandr
-    gparted
-    brightnessctl
-    pavucontrol
+  #  gparted
+  #  brightnessctl
+  #  pavucontrol
     pinentry-qt
     gnome-terminal
     xorg.xkill
     nemo-with-extensions
 
     # Other Apps
-    wine
-    gthumb
+  #  wine
+  #  gthumb
     qtpass
-    ledger
-    librecad
-    libreoffice
-    sound-juicer
+  #  ledger
+  #  librecad
+  #  libreoffice
+  #  sound-juicer
     virt-manager
     sublime-merge
-    openscad-unstable
+  #  openscad-unstable
   ];
 
   home.file = {
     ".config/IJHack/QtPass.conf".source = ./assets/QtPass.conf;
-    ".local/share/OpenSCAD/libraries/BOSL2" = {
-      source = builtins.fetchGit {
-        url = "https://github.com/BelfrySCAD/BOSL2";
-        rev = "7821a5143c7ab488ff3ff73d0cd0c4b508fb5796";
-      };
-    };
+  #  ".local/share/OpenSCAD/libraries/BOSL2" = {
+  #    source = builtins.fetchGit {
+  #      url = "https://github.com/BelfrySCAD/BOSL2";
+  #      rev = "7821a5143c7ab488ff3ff73d0cd0c4b508fb5796";
+  #    };
+  #  };
   };
 
   # picom --vsync --experimental-backend
@@ -86,7 +86,7 @@
       bars = [];
       keybindings = lib.mkForce {};
       startup = [
-        { command = "qtpass"; notification = false; }
+  #      { command = "qtpass"; notification = false; }
       ];
     };
 
diff --git a/systems/bastion/configuration.nix b/systems/bastion/configuration.nix
index 8664adc..a9d198d 100644
--- a/systems/bastion/configuration.nix
+++ b/systems/bastion/configuration.nix
@@ -12,6 +12,10 @@
   # https://xcp-ng.org/docs/networking.html#intel-i218-i219-slow-speed
   # https://serverfault.com/questions/581265/disable-tcp-checksum-offloading-on-kvm-virtual-network
 
+  # TODO: systemd-boot
+  # TODO: security cam view
+  # TODO: disk encryption
+
   networking.hostName = "bastion";
   networking.hostId = "0d13f99b";
 
@@ -20,7 +24,7 @@
   home-manager = {
     users."lauren_lagarde" = {
       home.stateVersion = "24.11";
-      imports = self.homeManagerModules."lauren_lagarde@tui.mlaga97.space";
+      imports = self.homeManagerModules."lauren_lagarde@gui.mlaga97.space";
     };
     extraSpecialArgs = { inherit self pkgs-unstable; };
   };
@@ -52,6 +56,11 @@
     ../../users/lauren_lagarde/configuration.nix
     ../../users/ashley_funkhouser/ashley_funkhouser.nix
 
+    # i3wm
+    ../../nixos/features/i3wm.nix
+    ../../nixos/features/hardware/yubikey.nix
+    ../../nixos/tweaks/intel_igpu_screen_tearing.nix
+
     # Bastion Features
     ../../nixos/features/hardware/yubikey.nix
     ../../nixos/features/virtualization/dockge.nix
diff --git a/systems/ll-latitude-e5591/configuration.nix b/systems/ll-latitude-e5591/configuration.nix
index 9220b6f..31fa357 100644
--- a/systems/ll-latitude-e5591/configuration.nix
+++ b/systems/ll-latitude-e5591/configuration.nix
@@ -33,6 +33,15 @@
 
     # Lauren Base
     ../../users/lauren_lagarde/configuration.nix
+    {
+      home-manager = {
+        users."lauren_lagarde" = {
+          home.stateVersion = stateVersion;
+          imports = self.homeManagerModules."lauren_lagarde@gui.mlaga97.space";
+        };
+        extraSpecialArgs = { inherit self pkgs-unstable; };
+      };
+    }
 
     # i3wm
     ../../nixos/features/i3wm.nix