From 7715f767ade290842ae9f6c099b2273f2996c2a5 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 22 Mar 2022 11:04:22 +0100
Subject: [PATCH] Move ratbagd/piper config to desktop module

---
 machines/loki/configuration.nix | 10 +---------
 modules/desktop/default.nix     |  5 +++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 4b615fe..f9fe7f0 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -62,15 +62,7 @@
   #   '';
   # };
 
-  services = {
-    openssh.enable = true;
-
-    ratbagd.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    piper
-  ];
+  services.openssh.enable = true;
 
   sops.defaultSopsFile = ./secrets.yaml;
   sops.secrets = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 35cc09e..5e2b497 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -253,6 +253,7 @@ in {
       avahi.publish.workstation = true;
       gvfs.enable = true;
       pcscd.enable = true;
+      ratbagd.enable = true;
     };
 
     security = {
@@ -287,6 +288,10 @@ in {
       etc = {
         "X11/xkb".source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
       };
+
+      systemPackages = with pkgs; [
+        piper
+      ];
     };
   };
 }