From 4f226084d0d650ec81a0c465fd99c4d6ff9a6b21 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 3 Oct 2024 08:47:43 +0100
Subject: [PATCH] Move teams and nomachine to default install rather than work
 only

---
 system/home/desktop.nix | 11 +++++++++++
 system/home/work.nix    | 14 +-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/system/home/desktop.nix b/system/home/desktop.nix
index b38062da..fc0344ad 100644
--- a/system/home/desktop.nix
+++ b/system/home/desktop.nix
@@ -13,7 +13,9 @@
       webcord
       signal-desktop
       whatsapp-for-linux
+      teams-for-linux
       x2goclient
+      nomachine-client
     ];
     file.${config.gtk.gtk2.configLocation}.force = true; # Stop clashing with KDE
   };
@@ -57,6 +59,15 @@
       # Autostart some programs
       "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
       "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+      # Teams configuration
+      "teams-for-linux/config.json".text = builtins.toJSON {
+        awayOnSystemIdle = true;
+        closeAppOnCross = false;
+        followSystemTheme = true;
+        notificationMethod = "electron";
+        optInTeamsV2 = true;
+        spellCheckerLanguages = [ "en_GB" ];
+      };
     };
   };
 }
diff --git a/system/home/work.nix b/system/home/work.nix
index 23fcad24..9c89f687 100644
--- a/system/home/work.nix
+++ b/system/home/work.nix
@@ -6,11 +6,7 @@
 }:
 {
   imports = [ ./openfortivpn/ukaea.nix ];
-  home.packages = with pkgs; [
-    teams-for-linux
-    twinkle
-    nomachine-client
-  ];
+  home.packages = with pkgs; [ twinkle ];
   programs.git.userEmail = config.accounts.email.accounts.outlook.address;
   accounts.email.accounts = {
     proton.primary = lib.mkForce false;
@@ -19,13 +15,5 @@
   xdg.configFile = {
     "autostart/twinkle.desktop".source = "${pkgs.twinkle}/share/applications/twinkle.desktop";
     "autostart/teams-for-linux.desktop".source = "${pkgs.teams-for-linux}/share/applications/teams-for-linux.desktop";
-    "teams-for-linux/config.json".text = builtins.toJSON {
-      awayOnSystemIdle = true;
-      closeAppOnCross = false;
-      followSystemTheme = true;
-      notificationMethod = "electron";
-      optInTeamsV2 = true;
-      spellCheckerLanguages = [ "en_GB" ];
-    };
   };
 }