Don't double configure printing

This commit is contained in:
Bun 2025-03-30 11:04:01 -04:00
parent 889bbb57d5
commit 0da3e4a95f
2 changed files with 12 additions and 19 deletions

View file

@ -1,19 +1,14 @@
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
{ {
config = lib.mkIf config.system.desktop.enable { services = {
services = { printing = {
printing = { enable = config.system.desktop.enable;
enable = true; drivers = with pkgs; [ hplip ];
drivers = with pkgs; [ hplip ]; };
webInterface = false; avahi = {
}; enable = config.services.printing.enable;
avahi = { nssmdns4 = true;
enable = true; openFirewall = true;
nssmdns4 = true;
openFirewall = true;
};
}; };
environment.systemPackages = with pkgs; [ system-config-printer ];
}; };
} }

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, ... }:
{ {
options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack"; options.system.nvidia.enable = lib.mkEnableOption "Enable the Nvidia graphics stack";
@ -10,10 +10,8 @@
}; };
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];
nixpkgs.allowUnfreePackages = [ "nvidia-x11" ]; nixpkgs.allowUnfreePackages = [ "nvidia-x11" ];
boot.kernelParams = [ "nvidia_drm.fbdev=1" ]; # Experimental framebuffer allows tty access
boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
specialisation.nouveau.configuration.config.system.nvidia.enable = lib.mkForce false; specialisation.nouveau.configuration.config.system.nvidia.enable = lib.mkForce false;
}; };