From caf53f27358449589a73fbd7916fd5884befb7dc Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Wed, 14 Aug 2024 09:41:20 +0900
Subject: [PATCH] Update syncthing and update audio for rdesktop

---
 lib/default.nix                           | 2 +-
 nixos/containers/rdesktop/default.nix     | 5 ++++-
 nixos/hosts/nixos-desktop/syncthing.nix   | 2 +-
 nixos/hosts/nixos-framework/syncthing.nix | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index a2326873..2e76e557 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -41,7 +41,7 @@
     unfree    ? false,
     ip        ? null,
     ephemeral ? false,
-    deployment_type ? "containers",
+    deployment_type ? "containers", # Currently used to change where secrets are searched for 
     pkgs          ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs,
     pkgs-unstable ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable,
   }: { 
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index fd09ac3c..cfa87909 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, desktop, username, lib, ... }: {
+{ pkgs, desktop, username, ... }: {
   imports = [
     ../../users/${username}
     ../../common/desktops/${desktop}
@@ -7,8 +7,11 @@
     ../../common/services/gnupg-agent.nix
     ../../common/software/cli/clean-hm.nix
     ../../common/services/tailscale-autoconnect.nix
+    ./syncthing.nix
   ];
 
+  hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
+
   services.xrdp = {
     enable = true;
     openFirewall = true;
diff --git a/nixos/hosts/nixos-desktop/syncthing.nix b/nixos/hosts/nixos-desktop/syncthing.nix
index ac9cae51..6bdef1c9 100644
--- a/nixos/hosts/nixos-desktop/syncthing.nix
+++ b/nixos/hosts/nixos-desktop/syncthing.nix
@@ -17,7 +17,7 @@
                 "notes" = {
                   id = "notes";
                   path = "/home/${username}/notes";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
+                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ];
                 };
             };
         };
diff --git a/nixos/hosts/nixos-framework/syncthing.nix b/nixos/hosts/nixos-framework/syncthing.nix
index ac9cae51..058fe454 100644
--- a/nixos/hosts/nixos-framework/syncthing.nix
+++ b/nixos/hosts/nixos-framework/syncthing.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, hostname, username, ... }: {
+{ username, ... }: {
     imports = [ ../../common/services/syncthing.nix ];
 
     services.syncthing = {
@@ -17,7 +17,7 @@
                 "notes" = {
                   id = "notes";
                   path = "/home/${username}/notes";
-                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" ];
+                  devices = [  "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ];
                 };
             };
         };