From f9d328f9eb1dfd59e07b46022a1b000683464bf1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 18 Apr 2023 12:00:56 +0100
Subject: [PATCH] Add neovide and libreoffice, consolidate some options to
 common files

---
 home/H0615-elitherl.nix           |  8 --------
 home/J0162-elitherl.nix           |  8 --------
 home/common-work.nix              | 12 ++++++++++++
 home/common.nix                   |  2 +-
 home/packages/env/fish.nix        |  3 ++-
 home/packages/gui/kitty.nix       |  2 +-
 home/packages/gui/libreoffice.nix |  4 ++++
 home/packages/gui/neovide.nix     |  4 ++++
 8 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 home/packages/gui/libreoffice.nix
 create mode 100644 home/packages/gui/neovide.nix

diff --git a/home/H0615-elitherl.nix b/home/H0615-elitherl.nix
index 1482b1b0..e3b28562 100644
--- a/home/H0615-elitherl.nix
+++ b/home/H0615-elitherl.nix
@@ -2,14 +2,6 @@
   imports = [
     ./common-work.nix
     ./env/gtk.nix
-    ./packages/env
-    ./packages/tui
-    ./packages/gui/browser.nix
-    ./packages/gui/cloud.nix
-    ./packages/gui/kitty.nix
-    ./packages/gui/messaging.nix
-    ./packages/gui/nomachine.nix
-    ./packages/gui/ukaea.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/J0162-elitherl.nix b/home/J0162-elitherl.nix
index 1482b1b0..e3b28562 100644
--- a/home/J0162-elitherl.nix
+++ b/home/J0162-elitherl.nix
@@ -2,14 +2,6 @@
   imports = [
     ./common-work.nix
     ./env/gtk.nix
-    ./packages/env
-    ./packages/tui
-    ./packages/gui/browser.nix
-    ./packages/gui/cloud.nix
-    ./packages/gui/kitty.nix
-    ./packages/gui/messaging.nix
-    ./packages/gui/nomachine.nix
-    ./packages/gui/ukaea.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/common-work.nix b/home/common-work.nix
index 4f66daf1..bc6bc694 100644
--- a/home/common-work.nix
+++ b/home/common-work.nix
@@ -1,5 +1,17 @@
 { ... }:
 {
+  imports = [
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/neovide.nix
+    ./packages/gui/libreoffice.nix
+    ./packages/gui/cloud.nix
+    ./packages/gui/kitty.nix
+    ./packages/gui/messaging.nix
+    ./packages/gui/nomachine.nix
+    ./packages/gui/ukaea.nix
+  ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home.username = "elitherl";
diff --git a/home/common.nix b/home/common.nix
index de030038..089557ec 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -2,5 +2,5 @@
 
 {
   nixpkgs.config.allowUnfree = true;
-  programs.home-manager.enable = true;
+  # programs.home-manager.enable = true;
 }
diff --git a/home/packages/env/fish.nix b/home/packages/env/fish.nix
index 39597f61..8015721c 100644
--- a/home/packages/env/fish.nix
+++ b/home/packages/env/fish.nix
@@ -5,8 +5,9 @@
   programs.fish = {
     enable = true;
     shellAbbrs = {
-      update = "sudo nixos-rebuild switch --upgrade";
+      update = "sudo nixos-rebuild switch --upgrade && home-manager switch -b backup";
       nr = "sudo nixos-rebuild";
+      hm = "home-manager";
       lg = "lazygit";
     };
   };
diff --git a/home/packages/gui/kitty.nix b/home/packages/gui/kitty.nix
index e50c6f59..87e01b57 100644
--- a/home/packages/gui/kitty.nix
+++ b/home/packages/gui/kitty.nix
@@ -10,7 +10,7 @@
       size = 14;
     };
     settings = {
-      background_opacity = "0.90";
+      # background_opacity = "0.90";
       disable_ligatures = "cursor";
       show_hyperlink_targets = true;
       copy_on_select = true;
diff --git a/home/packages/gui/libreoffice.nix b/home/packages/gui/libreoffice.nix
new file mode 100644
index 00000000..266ceaea
--- /dev/null
+++ b/home/packages/gui/libreoffice.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ libreoffice-fresh ];
+}
diff --git a/home/packages/gui/neovide.nix b/home/packages/gui/neovide.nix
new file mode 100644
index 00000000..ace5de72
--- /dev/null
+++ b/home/packages/gui/neovide.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ neovide ];
+}