From 95c41383ccfbf2d3478e1a30740d4c1cec38ed4d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 26 Dec 2023 10:29:20 +0000
Subject: [PATCH] Only install nomachine on work machines

---
 hosts/Ronin/configuration.nix  |  7 ++-----
 hosts/Scorch/configuration.nix | 15 ++++++++-------
 system/desktop.nix             |  1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/hosts/Ronin/configuration.nix b/hosts/Ronin/configuration.nix
index fdfa17a1..a265850e 100644
--- a/hosts/Ronin/configuration.nix
+++ b/hosts/Ronin/configuration.nix
@@ -1,7 +1,4 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
   # Setup keyfile
   boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
 
@@ -15,6 +12,6 @@
     etc."ppp/options".text = ''
       ipcp-accept-remote
     '';
-    systemPackages = with pkgs; [ openfortivpn samba ];
+    systemPackages = with pkgs; [ openfortivpn samba nomachine-client ];
   };
 }
diff --git a/hosts/Scorch/configuration.nix b/hosts/Scorch/configuration.nix
index 02284467..52b439c3 100644
--- a/hosts/Scorch/configuration.nix
+++ b/hosts/Scorch/configuration.nix
@@ -1,10 +1,4 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
+{ pkgs, ... }: {
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
   # Setup keyfile
@@ -15,4 +9,11 @@
     "/dev/disk/by-uuid/47d34268-5100-4eba-b34d-220f4239c1cb";
   boot.initrd.luks.devices."luks-47d34268-5100-4eba-b34d-220f4239c1cb".keyFile =
     "/crypto_keyfile.bin";
+
+  environment = {
+    etc."ppp/options".text = ''
+      ipcp-accept-remote
+    '';
+    systemPackages = with pkgs; [ openfortivpn samba nomachine-client ];
+  };
 }
diff --git a/system/desktop.nix b/system/desktop.nix
index 7d21d68b..e9f39d63 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -16,7 +16,6 @@
     libreoffice
     remmina
     minesweep-rs
-    nomachine-client
   ];
 
   security = {