diff options
| -rw-r--r-- | archetypes/collections/desktop/default.nix | 1 | ||||
| -rw-r--r-- | archetypes/collections/desktop/pipewire.nix (renamed from nixos/pipewire.nix) | 4 | ||||
| -rw-r--r-- | archetypes/profiles/desktop/default.nix | 2 | ||||
| -rw-r--r-- | nixos/default.nix | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/archetypes/collections/desktop/default.nix b/archetypes/collections/desktop/default.nix index 62ee472..6ac79dd 100644 --- a/archetypes/collections/desktop/default.nix +++ b/archetypes/collections/desktop/default.nix @@ -7,6 +7,7 @@ ./firefox.nix ./graphics.nix ./office.nix + ./pipewire.nix ./printing.nix ./thumbnailers.nix ./utilities.nix diff --git a/nixos/pipewire.nix b/archetypes/collections/desktop/pipewire.nix index be3eaf4..d80ac90 100644 --- a/nixos/pipewire.nix +++ b/archetypes/collections/desktop/pipewire.nix @@ -1,7 +1,7 @@ { lib, config, ... }: let - cfg = config.services._pipewire; + cfg = config._archetypes.collections.desktop.pipewire; in { - options.services._pipewire = { + options._archetypes.collections.desktop.pipewire = { enable = lib.mkEnableOption "enables pipewire"; }; diff --git a/archetypes/profiles/desktop/default.nix b/archetypes/profiles/desktop/default.nix index 07cbd82..eb10c21 100644 --- a/archetypes/profiles/desktop/default.nix +++ b/archetypes/profiles/desktop/default.nix @@ -5,6 +5,7 @@ _archetypes.collections = { desktop = { firefox.enable = mkDesktop true; + pipewire.enable = mkDesktop true; printing.enable = mkDesktop true; thumbnailers.enable = mkDesktop true; utilities.enable = mkDesktop true; @@ -33,7 +34,6 @@ services = { _geoclue2.enable = mkDesktop true; - _pipewire.enable = mkDesktop true; xserver = { windowManager._awesome.enable = mkDesktop true; enableTearFree = mkDesktop true; diff --git a/nixos/default.nix b/nixos/default.nix index 6defa6b..2d70630 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -18,7 +18,6 @@ ./hosts.nix ./net-iface-labels.nix ./nix.nix - ./pipewire.nix ./polkit.nix ./powerkeys.nix ./secrets.nix |