diff options
| -rw-r--r-- | archetypes/collections/desktop/default.nix | 1 | ||||
| -rw-r--r-- | archetypes/collections/desktop/printing.nix (renamed from nixos/printing.nix) | 5 | ||||
| -rw-r--r-- | archetypes/profiles/desktop/default.nix | 6 | ||||
| -rw-r--r-- | nixos/default.nix | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix index 418eb71..62ee472 100644 --- a/archetypes/collections/desktop/default.nix +++ b/archetypes/collections/desktop/default.nix @@ -7,6 +7,7 @@ ./firefox.nix ./graphics.nix ./office.nix + ./printing.nix ./thumbnailers.nix ./utilities.nix ./video.nix diff --git a/nixos/printing.nix b/archetypes/collections/desktop/printing.nix index a6df279..ed31048 100644 --- a/nixos/printing.nix +++ b/archetypes/collections/desktop/printing.nix @@ -1,7 +1,7 @@ { lib, config, ... }: let - cfg = config.services._printing; + cfg = config._archetypes.collections.desktop.printing; in { - options.services._printing = { + options._archetypes.collections.desktop.printing = { enable = lib.mkEnableOption "enables printing and avahi service"; }; @@ -15,4 +15,3 @@ in { }; }; } - diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix index 5a3443d..7cde6b2 100644 --- a/archetypes/profiles/desktop/default.nix +++ b/archetypes/profiles/desktop/default.nix @@ -4,9 +4,10 @@ nixosConfig = { _archetypes.collections = { desktop = { - utilities.enable = mkDesktop true; - thumbnailers.enable = mkDesktop true; firefox.enable = mkDesktop true; + printing.enable = mkDesktop true; + thumbnailers.enable = mkDesktop true; + utilities.enable = mkDesktop true; xserver = { enable = mkDesktop true; utilities.enable = mkDesktop true; @@ -34,7 +35,6 @@ services = { _geoclue2.enable = mkDesktop true; _pipewire.enable = mkDesktop true; - _printing.enable = mkDesktop true; xserver = { windowManager._awesome.enable = mkDesktop true; enableTearFree = mkDesktop true; diff --git a/nixos/default.nix b/nixos/default.nix index 8c8ad7a..ce2a417 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -22,7 +22,6 @@ ./pipewire.nix ./polkit.nix ./powerkeys.nix - ./printing.nix ./secrets.nix ./sudo.nix ./suspend.nix |