From 303bcc7df946b7ce7eb705382deae545e2edc152 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 24 Apr 2023 17:17:34 +0100
Subject: [PATCH] Add otpclient and x2go, remove teams

---
 home/env/shell/fish.nix |  5 +++--
 home/gui/cloud.nix      |  5 +----
 home/gui/default.nix    | 15 ---------------
 home/gui/pass.nix       |  4 ++++
 home/gui/ukaea.nix      |  7 -------
 home/gui/x2go.nix       |  4 ++++
 home/gui/zoom.nix       |  4 ++++
 home/ukaea-elitherl.nix |  3 ++-
 8 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 home/gui/default.nix
 create mode 100644 home/gui/pass.nix
 delete mode 100644 home/gui/ukaea.nix
 create mode 100644 home/gui/x2go.nix
 create mode 100644 home/gui/zoom.nix

diff --git a/home/env/shell/fish.nix b/home/env/shell/fish.nix
index 0e47d6e8..eb2f54a0 100644
--- a/home/env/shell/fish.nix
+++ b/home/env/shell/fish.nix
@@ -7,10 +7,11 @@
       nr = "sudo nixos-rebuild";
       hm = "home-manager";
       lg = "lazygit";
+      nvh = "nvim --headless --listen ~/.nvim.sock";
       nv = "neovide --multigrid --maximized";
-      rnv = "neovide --multigrid --maximized --server localhost:6702";
+      rnv = "neovide --multigrid --maximized --server ~/.nvim.sock";
       xnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized";
-      rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server localhost:6702";
+      rxnv = "WINIT_UNIX_BACKEND=x11 neovide --multigrid --maximized --server ~/.nvim.sock";
     };
   };
 }
diff --git a/home/gui/cloud.nix b/home/gui/cloud.nix
index ee3a264b..2abc3a08 100644
--- a/home/gui/cloud.nix
+++ b/home/gui/cloud.nix
@@ -5,8 +5,5 @@
   #  enable = true;
   #  startInBackground = true;
   #};
-  home.packages = with pkgs; [
-    bitwarden
-    zotero
-  ];
+  home.packages = with pkgs; [ zotero ];
 }
diff --git a/home/gui/default.nix b/home/gui/default.nix
deleted file mode 100644
index caf06af3..00000000
--- a/home/gui/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./firefox.nix
-    ./cloud.nix
-    ./foot.nix
-    ./gaming.nix
-    ./kitty.nix
-    ./foot.nix
-    ./messaging.nix
-    ./nomachine.nix
-    ./ukaea.nix
-  ];
-}
diff --git a/home/gui/pass.nix b/home/gui/pass.nix
new file mode 100644
index 00000000..6de2879b
--- /dev/null
+++ b/home/gui/pass.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ bitwarden otpclient ];
+}
diff --git a/home/gui/ukaea.nix b/home/gui/ukaea.nix
deleted file mode 100644
index 1bc13cd2..00000000
--- a/home/gui/ukaea.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    teams
-    zoom-us
-  ];
-}
diff --git a/home/gui/x2go.nix b/home/gui/x2go.nix
new file mode 100644
index 00000000..6b39f597
--- /dev/null
+++ b/home/gui/x2go.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ x2goclient ];
+}
diff --git a/home/gui/zoom.nix b/home/gui/zoom.nix
new file mode 100644
index 00000000..6fc2ee9e
--- /dev/null
+++ b/home/gui/zoom.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ zoom-us ];
+}
diff --git a/home/ukaea-elitherl.nix b/home/ukaea-elitherl.nix
index 027e1d71..b8de8018 100644
--- a/home/ukaea-elitherl.nix
+++ b/home/ukaea-elitherl.nix
@@ -12,7 +12,8 @@
     ./gui/kitty.nix
     ./gui/messaging.nix
     ./gui/nomachine.nix
-    ./gui/ukaea.nix
+    ./gui/pass.nix
+    ./gui/zoom.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.