diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 7c61932..8b71537 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -107,8 +107,6 @@ in hardware.framework.amd-7040.preventWakeOnAC = true; # Yubikey services.yubikey-agent.enable = true; - # Enable CUPS to print documents. - services.printing.enable = true; # Bluetooth hardware.bluetooth.settings.General = { ControllerMode = "bredr"; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 841452b..ead2434 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -17,6 +17,7 @@ in ./gnome.nix ./tiler ./stylix + ./printers.nix ]; options = { diff --git a/modules/nixos/desktop/printers.nix b/modules/nixos/desktop/printers.nix new file mode 100644 index 0000000..ef13ff6 --- /dev/null +++ b/modules/nixos/desktop/printers.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, ... }: +{ + config = { + services.printing = lib.mkIf cfg.desktop.enable { + enable = true; + drivers = with pkgs; [ + gutenprint + hplip + splix + epson-escpr2 + epson-escpr + epsonscan2 + gutenprint + ]; + }; + }; +} diff --git a/modules/nixos/desktop/tiler/default.nix b/modules/nixos/desktop/tiler/default.nix index ef243fc..31fbd73 100644 --- a/modules/nixos/desktop/tiler/default.nix +++ b/modules/nixos/desktop/tiler/default.nix @@ -40,7 +40,7 @@ in xwayland-satellite libnotify # Notifications - # wofi + # wofi # rofi # Control Tools pavucontrol @@ -54,7 +54,8 @@ in # Screen capture and recording tools # grim # replaced for now with dms satty # image annotation - slurp wf-recorder # video capture + slurp + wf-recorder # video capture ]; }; }