From 449545922933f7a96e05c75db60dcce95cfe0e12 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 9 Sep 2024 23:08:01 -0400 Subject: [PATCH] meta: Move sakaya to containers module --- modules/containers.nix | 5 +++++ modules/desktop.nix | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/containers.nix b/modules/containers.nix index 669c935c..3eab4926 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -2,6 +2,7 @@ config, nix-config, lib, + pkgs, ... }: @@ -53,6 +54,10 @@ in { systemd.tmpfiles.rules = [ "d /run/user/1000 0700 ${username} users -" ]; + environment.systemPackages = mkIf (pkgs.system == "x86_64-linux") ( + with nix-config.inputs.sakaya.packages.${pkgs.system}; [ sakaya ] + ); + containers = mkIf enableContainers { wine = template // { hostAddress = "192.168.100.34"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 19aee00d..12bae204 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -147,10 +147,6 @@ in ] )) - (mkIf (pkgs.system == "x86_64-linux") ( - with nix-config.inputs.sakaya.packages.${pkgs.system}; [ sakaya ] - )) - (with pkgs; [ anki pulseaudio