From 973b35d6908f704026e955bd81a031fedffe1678 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 4 Apr 2023 17:42:50 +0100
Subject: [PATCH] Switch to use xfce desktop environment

---
 nixos/H0615-elitherl.nix              | 17 +----------------
 nixos/J0162-elitherl.nix              |  2 +-
 nixos/home-manager/ukaea-elitherl.nix |  1 +
 nixos/home-manager/vanguard-xenia.nix |  1 +
 nixos/vanguard-xenia.nix              |  2 +-
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/nixos/H0615-elitherl.nix b/nixos/H0615-elitherl.nix
index 515b71bf..3ff58004 100644
--- a/nixos/H0615-elitherl.nix
+++ b/nixos/H0615-elitherl.nix
@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/plasma.nix
+    ./desktop/xfce.nix
   ];
 
   networking.hostName = "H0615"; # Define your hostname.
@@ -23,19 +23,4 @@
 
   # Set up home manager for user
   home-manager.users.elitherl = import ./home-manager/ukaea-elitherl.nix;
-
-  #services.jupyter = {
-  #  enable = true;
-  #  user = "elitherl";
-  #  password = "argon2:$argon2id$v=19$m=10240,t=10,p=8$1xahwwyEqV2fxQh2JjLuTg$bQ36U9SQQSk8IgtXZQkS2E2P9VISTCO+nFI4w7Ebt3M";
-  #  group = "users";
-  #};
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.11"; # Did you read the comment?
 }
diff --git a/nixos/J0162-elitherl.nix b/nixos/J0162-elitherl.nix
index aae252b6..f0da4eb7 100644
--- a/nixos/J0162-elitherl.nix
+++ b/nixos/J0162-elitherl.nix
@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/plasma.nix
+    ./desktop/xfce.nix
   ];
 
   networking.hostName = "J0162"; # Define your hostname.
diff --git a/nixos/home-manager/ukaea-elitherl.nix b/nixos/home-manager/ukaea-elitherl.nix
index c9db2cab..127fbcd8 100644
--- a/nixos/home-manager/ukaea-elitherl.nix
+++ b/nixos/home-manager/ukaea-elitherl.nix
@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./common.nix
+    ./env
     ./packages
     ./packages/gui/ukaea.nix
     ./packages/gui/nomachine.nix
diff --git a/nixos/home-manager/vanguard-xenia.nix b/nixos/home-manager/vanguard-xenia.nix
index eeb03165..f3495ec9 100644
--- a/nixos/home-manager/vanguard-xenia.nix
+++ b/nixos/home-manager/vanguard-xenia.nix
@@ -1,6 +1,7 @@
 { ... }: {
   imports = [
     ./common.nix
+    ./env
     ./packages
     ./packages/gui/gaming.nix
     ./packages/gui/nomachine.nix
diff --git a/nixos/vanguard-xenia.nix b/nixos/vanguard-xenia.nix
index f95e0e71..534a582d 100644
--- a/nixos/vanguard-xenia.nix
+++ b/nixos/vanguard-xenia.nix
@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/plasma.nix
+    ./desktop/xfce.nix
   ];
 
   networking.hostName = "Vanguard"; # Define your hostname.