From 0f524aeb0168ed6fc87a0587838c47f41c166198 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 2 Mar 2021 17:01:19 +0000
Subject: [PATCH] Moved arc cache to common. Fixed scream service.

---
 config/common/default.nix              |  3 +++
 config/hosts/samhain/configuration.nix | 30 +++++++++++++-------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/config/common/default.nix b/config/common/default.nix
index 3aff6fbb..2d7f22d9 100644
--- a/config/common/default.nix
+++ b/config/common/default.nix
@@ -18,6 +18,9 @@ in {
       "NUR=${sources.NUR}"
       "arc=${sources.arc-nixexprs}"
     ];
+    binaryCaches = [ "https://arc.cachix.org" ];
+    binaryCachePublicKeys =
+      [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" ];
     gc.automatic = lib.mkDefault true;
     gc.options = lib.mkDefault "--delete-older-than 1w";
     trustedUsers = [ "root" "@wheel" ];
diff --git a/config/hosts/samhain/configuration.nix b/config/hosts/samhain/configuration.nix
index 8f47f6b9..8aaead50 100644
--- a/config/hosts/samhain/configuration.nix
+++ b/config/hosts/samhain/configuration.nix
@@ -72,21 +72,21 @@ in {
     pkgs.cachix # arc caching
   ];
 
-  # arc caching
-  nix = {
-    binaryCaches = [ "https://arc.cachix.org" ];
-    binaryCachePublicKeys =
-      [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" ];
-  };
-
-  # audio for vm on startup
-  systemd.user.services.scream = {
-    enable = true;
-    wantedBy = [ "multi-user.target" ];
-    description = "Scream - Audio forwarding from the VM.";
-    serviceConfig = {
-      ExecStart = "${pkgs.arc.pkgs.scream-arc}/bin/scream -i virbr0 -o pulse";
-      Restart = "always";
+  home-manager.users.kat = {
+      # audio for vm on startup
+    systemd.user.services = {
+      scream = {
+        Unit = {
+          Description = "Scream - Audio forwarding from the VM.";
+        };
+        Service = {
+          ExecStart = "${pkgs.arc.pkgs.scream-arc}/bin/scream -i virbr0 -o pulse";
+          Restart = "always";
+        };
+        Install = {
+          WantedBy = [ "default.target" ];
+        };
+      };
     };
   };