diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 1282776..2fe6657 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -14,6 +14,7 @@ services = { fstrim.enable = lib.mkDefault true; thermald.enable = true; + printing.enable = true; }; virtualisation.docker.enable = true; @@ -65,7 +66,6 @@ kanata.enable = true; uwsm.enable = false; greetd.enable = false; - cups.enable = true; media.mpd = { enable = true; diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 4ac32e3..f5e234d 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -70,7 +70,6 @@ thunderbird trash-cli typst - ungoogled-chromium util-linux v4l-utils vlc diff --git a/modules/services/kanata/module.nix b/modules/services/kanata/module.nix index c919c5b..b7164d5 100644 --- a/modules/services/kanata/module.nix +++ b/modules/services/kanata/module.nix @@ -22,11 +22,6 @@ in { devices = ["/dev/input/by-path/platform-i8042-serio-0-event-kbd"]; config = builtins.readFile (./. + "/main.kbd"); }; - - keyboards.dell-keyboard = { - devices = ["/dev/input/by-path/usb-Dell_Dell_USB_Keyboard-event-kbd "]; - config = builtins.readFile (./. + "/main.kbd"); - }; }; }; } diff --git a/modules/services/printing/module.nix b/modules/services/printing/module.nix deleted file mode 100644 index 5df6b53..0000000 --- a/modules/services/printing/module.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - pkgs, - ... -}: let - inherit (lib.options) mkEnableOption; -in { - options.modules.services.cups.enable = mkEnableOption "CUPS, the Common UNIX printing system"; - - config = { - services = { - # enable CUPS, the Common UNIX printing system. - printing = { - enable = true; - - # Move CUPSd's temporary directory. - # By default, it resides in /tmp. - tempDir = "/tmp/cups"; - - # Do not advertise shared printers. - browsing = false; - - # Enable the CUPS webinterface, accessible at localhost:631. - webInterface = true; - - # Some local or network printers might need additional drivers. - # These can be added into here. - drivers = [ - pkgs.cups-kyocera-ecosys-m552x-p502x - ]; - }; - - # Add and autodiscover printers on the network via the IPP everywhere[1] protocol. - # [1] https://www.pwg.org/ipp/everywhere.html - avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - }; - }; -}