diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 990e772..e9d1316 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -83,7 +83,7 @@ device = { roles = { type = "laptop"; - virtual-machine = false; + virtual-machine = false; }; cpu.type = "amd"; gpu.type = "amd"; @@ -93,15 +93,12 @@ security = { auditd = { enable = true; - autoPrune.enable = true; + autoPrune.enable = true; }; }; workstation = { - printing = { - enable = true; - hplip.enable = true; - }; + printing.enable = true; }; home-manager = { @@ -110,18 +107,18 @@ git = { userName = "ItsDrike"; - userEmail = "itsdrike@protonmail.com"; - signing = { - enable = true; + userEmail = "itsdrike@protonmail.com"; + signing = { + enable = true; key = "FA2745890B7048C0"; - }; + }; }; wms.hyprland = { enable = true; - monitor = [ - "eDP-1, 1920x1080@60, 0x0, 1" - ]; + monitor = [ + "eDP-1, 1920x1080@60, 0x0, 1" + ]; }; programs = { diff --git a/options/workstation/default.nix b/options/workstation/default.nix index d47b613..05c4c70 100644 --- a/options/workstation/default.nix +++ b/options/workstation/default.nix @@ -11,10 +11,6 @@ in Also adds some drivers for common printers. ''; - - hplip.enable = mkEnableOption '' - HP printing support using hplip software. - ''; }; }; } diff --git a/system/roles/workstation/services/printing.nix b/system/roles/workstation/services/printing.nix index 4f459f7..9460c12 100644 --- a/system/roles/workstation/services/printing.nix +++ b/system/roles/workstation/services/printing.nix @@ -1,5 +1,5 @@ { pkgs, lib, config, ...}: let - inherit (lib) mkIf optional; + inherit (lib) mkIf; deviceType = config.myOptions.device.roles.type; acceptedTypes = ["laptop" "desktop"]; @@ -26,8 +26,5 @@ in { openFirewall = true; }; }; - - environment.systemPackages = optional cfg.hplip.enable pkgs.hplip; - myOptions.system.impermanence.home.extraDirectories = optional cfg.hplip.enable ".hplip"; }; }