diff --git a/modules/system/devices/printing/default.nix b/modules/system/devices/printing/default.nix
index eb7191af..327c055b 100644
--- a/modules/system/devices/printing/default.nix
+++ b/modules/system/devices/printing/default.nix
@@ -1,19 +1,14 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
-  config = lib.mkIf config.system.desktop.enable {
-    services = {
-      printing = {
-        enable = true;
-        drivers = with pkgs; [ hplip ];
-        webInterface = false;
-      };
-      avahi = {
-        enable = true;
-        nssmdns4 = true;
-        openFirewall = true;
-      };
+  services = {
+    printing = {
+      enable = config.system.desktop.enable;
+      drivers = with pkgs; [ hplip ];
+    };
+    avahi = {
+      enable = config.services.printing.enable;
+      nssmdns4 = true;
+      openFirewall = true;
     };
-
-    environment.systemPackages = with pkgs; [ system-config-printer ];
   };
 }
diff --git a/modules/system/devices/video/nvidia/default.nix b/modules/system/devices/video/nvidia/default.nix
index 30fcf8c1..e2662244 100644
--- a/modules/system/devices/video/nvidia/default.nix
+++ b/modules/system/devices/video/nvidia/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
 
@@ -10,10 +10,8 @@
     };
 
     services.xserver.videoDrivers = [ "nvidia" ];
-
     nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
-
-    boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
+    boot.kernelParams = [ "nvidia_drm.fbdev=1" ]; # Experimental framebuffer allows tty access
 
     specialisation.nouveau.configuration.config.system.nvidia.enable = lib.mkForce false;
   };