Move alacritty into own file in terminal directory

Move teams to only be installed/configured on work machines

Install nomachine-client on work machines, issues with flatpak version

system/default.nix

@@ -61,6 +61,7 @@
         "steam-original"
         "steam-run"
         "steamcmd"
+        "nomachine-client"
       ];
     overlays = [ (final: prev: { inherit (inputs.plasma-manager.packages.${prev.system}) rc2nix; }) ];
   };

system/home/desktop.nix

@@ -3,38 +3,20 @@
   imports = [
     ./sway/default.nix
     ./emacs/default.nix
+    ./terminal/default.nix
     ./browser/default.nix
     ./zathura/default.nix
     ./services/email/default.nix
   ];
   home.packages = with pkgs; [
-    x2goclient
     libreoffice-fresh
     webcord
     signal-desktop
     whatsapp-for-linux
-    teams-for-linux
+    x2goclient
   ];
   services.syncthing.enable = true;
-  programs = {
+  programs.mpv.enable = true;
-    mpv.enable = true;
-    alacritty = {
-      enable = true;
-      settings = {
-        shell = "${config.programs.zsh.package}/bin/zsh";
-        window = {
-          dynamic_title = true;
-          padding = {
-            x = 5;
-            y = 5;
-          };
-        };
-        live_config_reload = true;
-        selection.save_to_clipboard = true;
-        mouse.hide_when_typing = true;
-      };
-    };
-  };
   xdg = {
     mime.enable = true;
     mimeApps =
@@ -44,12 +26,7 @@
       {
         enable = true;
         inherit defaultApplications;
-        associations = {
+        associations.added = defaultApplications;
-          added = defaultApplications;
-          removed = {
-            "x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http";
-          };
-        };
       };
     userDirs = {
       enable = true;
@@ -61,14 +38,6 @@
     configFile = {
       "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-for-linux/config.json".text = builtins.toJSON {
-        awayOnSystemIdle = true;
-        closeAppOnCross = true;
-        followSystemTheme = true;
-        notificationMethod = "electron";
-        optInTeamsV2 = true;
-        spellCheckerLanguages = [ "en_GB" ];
-      };
     };
   };
 }

system/home/terminal/alacritty.nix

@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      shell = "${config.programs.zsh.package}/bin/zsh";
+      window = {
+        dynamic_title = true;
+        padding = {
+          x = 5;
+          y = 5;
+        };
+      };
+      live_config_reload = true;
+      selection.save_to_clipboard = true;
+      mouse.hide_when_typing = true;
+    };
+  };
+}

system/home/terminal/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ./alacritty.nix ];
+}

system/home/work.nix

@@ -6,10 +6,25 @@
 }:
 {
   imports = [ ./openfortivpn/ukaea.nix ];
-  home.packages = [ pkgs.twinkle ];
+  home.packages = with pkgs; [
+    teams-for-linux
+    twinkle
+    nomachine-client
+  ];
   programs.git.userEmail = config.accounts.email.accounts.outlook.address;
   accounts.email.accounts = {
     proton.primary = lib.mkForce false;
     outlook.primary = lib.mkForce true;
   };
+  xdg.configFile = {
+    "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" ];
+    };
+  };
 }