diff --git a/modules/boot.nix b/modules/boot.nix
index e0c5aad..743cb1c 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -1,7 +1,19 @@
-{
+{pkgs, ...}: {
+  systemd = {
+    targets.network-online.wantedBy = pkgs.lib.mkForce []; # Normally ["multi-user.target"]
+    services.NetworkManager-wait-online.wantedBy = pkgs.lib.mkForce []; # Normally ["network-online.target"]
+  };
+  environment.etc = {
+    "issue" = {
+      text = "[?12l[?25h";
+      mode = "0444";
+    };
+  };
   boot = {
     blacklistedKernelModules = ["nouveau" "lbm-nouveau" "pcspkr"];
-    kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "splash"];
+    kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "splash" "systemd.show_status=false" "rd.udev.log_level=3" "vt.global_cursor_default=0"];
+    consoleLogLevel = 0;
+    initrd.verbose = false;
     plymouth = {
       enable = true;
       theme = "breeze";
diff --git a/modules/smb.nix b/modules/smb.nix
deleted file mode 100644
index 9c30eca..0000000
--- a/modules/smb.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{settings, ...}: {
-  services.samba-wsdd.enable = true; # make shares visible for windows 10 clients
-  networking.firewall = {
-    allowedTCPPorts = [139 445];
-    allowedUDPPorts = [137 138];
-  };
-  services.samba = {
-    enable = true;
-    securityType = "user";
-    openFirewall = true;
-    shares = {
-      Share = {
-        path = "/home/${settings.username}/Share";
-        browseable = "no";
-        "read only" = "no";
-        "guest ok" = "no";
-        "force user" = "${settings.username}";
-        "force group" = "users";
-      };
-    };
-  };
-}
diff --git a/modules/vfio.nix b/modules/vfio.nix
index e504830..9355fcb 100644
--- a/modules/vfio.nix
+++ b/modules/vfio.nix
@@ -5,7 +5,7 @@
 }: {
   boot = {
     kernelParams = ["amd_iommu=on" "iommu=pt" "vfio_iommu_type1.allow_unsafe_interrupts=1" "kvm.ignore_msrs=1"];
-    kernelModules = ["amd-kvm" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
+    kernelModules = ["kvm-amd" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
     initrd.kernelModules = ["vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
     extraModprobeConfig = ''
       options vfio-pci ids=10de:228e,10de:2504
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 3dc56a4..7c5f526 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -12,7 +12,6 @@
     ../modules/vfio.nix
     ../modules/refreshrate.nix
     ../modules/xserver.nix
-    ../modules/smb.nix
     ../modules/zsh.nix
     ../modules/git.nix
     #../modules/mining.nix