system/default.nix

@@ -32,7 +32,6 @@
       substituters = [ "https://nix.xenia.me.uk" ];
       trusted-public-keys = [ "nix.xenia.me.uk:tlgwOaG5KMLjQUk2YaErS8mAG69ZCr3PaHXZYi+Y5eI=" ];
     };
-    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     channel.enable = true;
     gc = {
       automatic = true;

system/home/desktop.nix

@@ -13,6 +13,8 @@
       webcord
       signal-desktop
       whatsapp-for-linux
+      teams-for-linux
+      x2goclient
       nomachine-client
     ];
     file.${config.gtk.gtk2.configLocation}.force = true; # Stop clashing with KDE
@@ -53,6 +55,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" ];
+      };
     };
   };
 }

system/home/work.nix

@@ -6,10 +6,7 @@
 }:
 {
   imports = [ ./openfortivpn/ukaea.nix ];
-  home.packages = with pkgs; [
+  home.packages = with pkgs; [ twinkle ];
-    teams-for-linux
-    twinkle
-  ];
   programs.git.userEmail = config.accounts.email.accounts.outlook.address;
   accounts.email.accounts = {
     proton.primary = lib.mkForce false;
@@ -19,13 +16,4 @@
     "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 configuration
-  "teams-for-linux/config.json".text = builtins.toJSON {
-    awayOnSystemIdle = true;
-    closeAppOnCross = false;
-    followSystemTheme = true;
-    notificationMethod = "electron";
-    optInTeamsV2 = true;
-    spellCheckerLanguages = [ "en_GB" ];
-  };
 }