From 8f2890fc76115ea6a2a08659e05122edbfa2ce94 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 29 Mar 2023 11:48:42 +0100
Subject: [PATCH] Move common gui packages into separate expression

---
 nixos/home-H0615-elitherl.nix | 3 ++-
 nixos/home-vanguard-xenia.nix | 6 ------
 nixos/home/common.nix         | 5 -----
 nixos/home/gui.nix            | 7 +++++++
 4 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 nixos/home/gui.nix

diff --git a/nixos/home-H0615-elitherl.nix b/nixos/home-H0615-elitherl.nix
index 1b7127ff..0502db2d 100644
--- a/nixos/home-H0615-elitherl.nix
+++ b/nixos/home-H0615-elitherl.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ./home/common.nix
+    ./home/messaging.nix
     ./home/dev.nix
     ./home/nomachine.nix
     ./home/python310.nix
@@ -11,7 +12,7 @@
   home.homeDirectory = "/home/elitherl";
 
   home.packages = with pkgs; [
-    microsoft-edge
+    teams
   ];
 
   programs.git = {
diff --git a/nixos/home-vanguard-xenia.nix b/nixos/home-vanguard-xenia.nix
index e8bd184d..7675a3b0 100644
--- a/nixos/home-vanguard-xenia.nix
+++ b/nixos/home-vanguard-xenia.nix
@@ -12,12 +12,6 @@
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
 
-  nixpkgs.config.allowUnfree = true;
-
-  home.packages = with pkgs; [
-    firefox
-  ];
-
   programs.git = {
     userEmail = "evie@xenia.me.uk";
   };
diff --git a/nixos/home/common.nix b/nixos/home/common.nix
index 44e3321b..ebea0362 100644
--- a/nixos/home/common.nix
+++ b/nixos/home/common.nix
@@ -27,9 +27,4 @@
     enableFishIntegration = true;
     settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
   };
-
-  home.packages = with pkgs; [
-    wezterm
-    bitwarden
-  ];
 }
diff --git a/nixos/home/gui.nix b/nixos/home/gui.nix
new file mode 100644
index 00000000..21a28cf4
--- /dev/null
+++ b/nixos/home/gui.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    wezterm
+    firefox
+    bitwarden
+  ];
+}