diff --git a/lib/modules/nixos/default-module.nix b/lib/modules/nixos/default-module.nix
index c8f4765..3847205 100644
--- a/lib/modules/nixos/default-module.nix
+++ b/lib/modules/nixos/default-module.nix
@@ -91,7 +91,6 @@
       self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"
     );
     environment = {
-      systemPackages = with pkgs; [ ghostty-terminfo ];
       etc = {
         "lytedev/rev".text = config.system.configurationRevision;
         "lytedev/lastModified".text = toString (self.lastModified or "unknown");
@@ -152,21 +151,21 @@
     hardware.enableRedistributableFirmware = lib.mkDefault true;
 
     users.users.root = {
-      openssh.authorizedKeys.keys = lib.mkDefault [ self.outputs.pubkey ];
+      openssh.authorizedKeys.keys = [ self.outputs.pubkey ];
       shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
     };
 
     services = {
       openssh = {
-        enable = lib.mkDefault true;
+        enable = true;
 
         settings = {
-          PasswordAuthentication = lib.mkDefault false;
-          KbdInteractiveAuthentication = lib.mkDefault false;
-          PermitRootLogin = lib.mkForce "prohibit-password";
+          PasswordAuthentication = false;
+          KbdInteractiveAuthentication = false;
+          PermitRootLogin = "prohibit-password";
         };
 
-        openFirewall = lib.mkDefault true;
+        openFirewall = true;
 
         /*
           listenAddresses = [
@@ -192,7 +191,6 @@
         options = lib.mkDefault "ctrl:nocaps";
       };
       smartd.enable = lib.mkDefault true;
-      fwupd.enable = lib.mkDefault true;
     };
 
     console = {
diff --git a/lib/modules/nixos/shell-config.nix b/lib/modules/nixos/shell-config.nix
index 762e4d0..a928dfb 100644
--- a/lib/modules/nixos/shell-config.nix
+++ b/lib/modules/nixos/shell-config.nix
@@ -19,6 +19,9 @@ in
   config = lib.mkIf cfg.enable {
     programs.nix-index.enable = true;
     programs.command-not-found.enable = false;
+    services = {
+      fwupd.enable = lib.mkDefault true;
+    };
     users = {
       defaultUserShell = pkgs.fish;
     };
@@ -40,6 +43,7 @@ in
         MANPAGER = "bat --style=plain";
       };
       systemPackages = with pkgs; [
+        ghostty-terminfo
         aria2
         bat
         bottom
diff --git a/packages/hosts/rascal.nix b/packages/hosts/rascal.nix
index 1390f51..22aeecd 100644
--- a/packages/hosts/rascal.nix
+++ b/packages/hosts/rascal.nix
@@ -60,7 +60,8 @@
   '';
 
   networking = {
-    wifi.enable = true;
+    useDHCP = true;
+    wifi.enable = false;
     firewall = {
       enable = true;
       allowPing = true;
@@ -70,7 +71,8 @@
 
   services.tailscale.useRoutingFeatures = "server";
 
+  lyte.shell.enable = false;
   home-manager.users.daniel = {
-    lyte.shell.enable = true;
+    lyte.shell.enable = false;
   };
 }