diff options
| -rw-r--r-- | hosts/mercury/config.nix | 1 | ||||
| -rw-r--r-- | hosts/mercury/nixos.nix | 2 | ||||
| -rw-r--r-- | modules/system/nixos/default.nix | 1 | ||||
| -rw-r--r-- | modules/system/nixos/printing.nix | 3 | ||||
| -rw-r--r-- | modules/system/options.nix | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/hosts/mercury/config.nix b/hosts/mercury/config.nix index cdf24d9..0fe641a 100644 --- a/hosts/mercury/config.nix +++ b/hosts/mercury/config.nix @@ -41,6 +41,7 @@ audio.enable = true; bluetooth.enable = true; + printing.enable = true; }; terminal = { diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix index 22ea90b..8c98245 100644 --- a/hosts/mercury/nixos.nix +++ b/hosts/mercury/nixos.nix @@ -29,8 +29,6 @@ } ]; - services.printing.enable = true; - environment.defaultPackages = lib.mkForce []; # im not a noob security.pki.certificates = [ diff --git a/modules/system/nixos/default.nix b/modules/system/nixos/default.nix index 132d99c..035c5be 100644 --- a/modules/system/nixos/default.nix +++ b/modules/system/nixos/default.nix @@ -5,5 +5,6 @@ ./audio.nix ./bluetooth.nix ./polkit.nix + ./printing.nix ]; } diff --git a/modules/system/nixos/printing.nix b/modules/system/nixos/printing.nix new file mode 100644 index 0000000..bb6af7c --- /dev/null +++ b/modules/system/nixos/printing.nix @@ -0,0 +1,3 @@ +{config, ...}: { + services.printing.enable = config.collinux.system.printing.enable; +} diff --git a/modules/system/options.nix b/modules/system/options.nix index d827387..8126b6a 100644 --- a/modules/system/options.nix +++ b/modules/system/options.nix @@ -70,6 +70,7 @@ in { audio.enable = mkEnableOption "pipewire and wireplumber"; bluetooth.enable = mkEnableOption "bluetooth"; + printing.enable = mkEnableOption "cups printing server"; }; config.assertions = [ |