diff --git a/flake.nix b/flake.nix
index c3929a8..2b03ea5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,8 +39,8 @@
     };
   };
 
-  outputs = {self, nixpkgs, ...} @ inputs: {
-    nixosConfigurations = import ./hosts {inherit inputs;};
-    devShells = import ./shells {inherit inputs;};
+  outputs = {self, nixpkgs, ...} @ inputs: let
+  in {
+    nixosConfigurations = import ./hosts {inherit nixpkgs inputs self;};
   };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index 084916d..e334112 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,6 +1,5 @@
-{ inputs, ... }:
+{ self, inputs, ... }:
 let
-  inherit (inputs) self;
   inherit (inputs.nixpkgs) lib;
 
   # A list of shared modules that ALL systems need
@@ -11,6 +10,17 @@ let
   ];
 in
 {
+  vboxnix = lib.nixosSystem {
+    system = "x86_64-linux";
+    specialArgs = { inherit lib inputs self; };
+    modules = [
+      ./vbox_nix
+      inputs.home-manager.nixosModules.home-manager
+      inputs.impermanence.nixosModules.impermanence
+      inputs.lanzaboote.nixosModules.lanzaboote
+    ] ++ shared;
+  };
+
   herugrim = lib.nixosSystem {
     system = "x86_64-linux";
     specialArgs = { inherit lib inputs self; };
diff --git a/shells/default.nix b/shells/default.nix
deleted file mode 100644
index 5934283..0000000
--- a/shells/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{inputs, ...}: let 
-  inherit (inputs) nixpkgs;
-
-  system = "x86_64-linux";
-  pkgs = nixpkgs.legacyPackages.${system};
-in {
-  ${system} = {
-    default = pkgs.mkShell {
-      name = "nixdots";
-      meta.description = "The default development shell for my NixOS configuration";
-      packages = with pkgs; [
-        git # flakes require git
-        nil # nix ls
-        statix # lints and suggestions
-        deadnix # clean up unused nix code
-        alejandra # nix formatter
-      ];
-      shellHook = "exec $SHELL";
-    };
-  };
-}
diff --git a/system/roles/workstation/display/login/greetd.nix b/system/roles/workstation/display/login/greetd.nix
index c366e87..9590df6 100644
--- a/system/roles/workstation/display/login/greetd.nix
+++ b/system/roles/workstation/display/login/greetd.nix
@@ -11,9 +11,6 @@
   deviceType = config.myOptions.device.roles.type;
   acceptedTypes = ["laptop" "desktop"];
 
-  greetingMsg = "'Access is restricted to authorized personnel only.'";
-  tuiGreetTheme = "'border=magenta;text=cyan;prompt=green;time=red;action=white;button=yellow;container=black;input=gray'";
-
   sessionData = config.services.displayManager.sessionData.desktops;
   sessionPaths = concatStringsSep ":" [
     "${sessionData}/share/xsessions"
@@ -28,16 +25,14 @@
       "--remember"
       "--remember-user-session"
       "--asterisks"
-      "--greeting ${greetingMsg}"
       "--sessions '${sessionPaths}'"
-      "--theme ${tuiGreetTheme}"
     ];
   };
 in {
   config = mkIf (builtins.elem deviceType acceptedTypes) {
     services.greetd = {
       enable = true;
-      vt = 1;
+      vt = 2;
 
       # <https://man.sr.ht/~kennylevinsen/greetd/>
       settings = {
@@ -59,8 +54,5 @@ in {
       TTYVHangup = true;
       TTYVTDisallocate = true;
     };
-
-    # Persist info about previous session & user
-    myOptions.system.impermanence.root.extraDirectories = [ "/var/cache/tuigreet" ];
   };
 }