From 9d07fe0e7ea33d462decc46a34d57623d633bb3d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 19 Apr 2023 09:27:55 +0100
Subject: [PATCH] Update files for new restructure

---
 home/H0615-elitherl.nix  |  4 ++--
 home/J0162-elitherl.nix  |  4 ++--
 home/Legion-xenia.nix    |  6 +++---
 home/Northstar-xenia.nix | 12 ++++++------
 home/Vanguard-xenia.nix  | 20 ++++++++++----------
 home/common/work.nix     | 20 ++++++++++----------
 home/desktop/gtk.nix     |  3 ++-
 7 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/home/H0615-elitherl.nix b/home/H0615-elitherl.nix
index e3b28562..18953dea 100644
--- a/home/H0615-elitherl.nix
+++ b/home/H0615-elitherl.nix
@@ -1,7 +1,7 @@
 { ... }: {
   imports = [
-    ./common-work.nix
-    ./env/gtk.nix
+    ./common/work.nix
+    ./desktop/gtk.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/J0162-elitherl.nix b/home/J0162-elitherl.nix
index e3b28562..18953dea 100644
--- a/home/J0162-elitherl.nix
+++ b/home/J0162-elitherl.nix
@@ -1,7 +1,7 @@
 { ... }: {
   imports = [
-    ./common-work.nix
-    ./env/gtk.nix
+    ./common/work.nix
+    ./desktop/gtk.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/Legion-xenia.nix b/home/Legion-xenia.nix
index ea5d91b7..bdcbfbf7 100644
--- a/home/Legion-xenia.nix
+++ b/home/Legion-xenia.nix
@@ -1,8 +1,8 @@
 { ... }: {
   imports = [
-    ./common-personal.nix
-    ./packages/env/bash.nix
-    ./packages/tui
+    ./common/personal.nix
+    ./env/bash.nix
+    ./tui
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/Northstar-xenia.nix b/home/Northstar-xenia.nix
index 0352d773..6a87a2d7 100644
--- a/home/Northstar-xenia.nix
+++ b/home/Northstar-xenia.nix
@@ -1,11 +1,11 @@
 { ... }: {
   imports = [
-    ./common-personal.nix
-    ./env/gtk.nix
-    ./packages/env
-    ./packages/tui
-    ./packages/gui/browser
-    ./packages/gui/kitty.nix
+    ./common/personal.nix
+    ./desktop/gtk.nix
+    ./env
+    ./tui
+    ./gui/browser
+    ./gui/kitty.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/Vanguard-xenia.nix b/home/Vanguard-xenia.nix
index fb7ecb5e..df6c95dd 100644
--- a/home/Vanguard-xenia.nix
+++ b/home/Vanguard-xenia.nix
@@ -1,15 +1,15 @@
 { ... }: {
   imports = [
-    ./common-personal.nix
-    ./env/gtk.nix
-    ./packages/env
-    ./packages/tui
-    ./packages/gui/browser.nix
-    ./packages/gui/cloud.nix
-    ./packages/gui/gaming.nix
-    ./packages/gui/kitty.nix
-    ./packages/gui/messaging.nix
-    ./packages/gui/nomachine.nix
+    ./common/personal.nix
+    ./desktop/gtk.nix
+    ./env
+    ./tui
+    ./gui/browser.nix
+    ./gui/cloud.nix
+    ./gui/gaming.nix
+    ./gui/kitty.nix
+    ./gui/messaging.nix
+    ./gui/nomachine.nix
   ];
   home.stateVersion = "22.11";
 }
diff --git a/home/common/work.nix b/home/common/work.nix
index bc6bc694..3494d318 100644
--- a/home/common/work.nix
+++ b/home/common/work.nix
@@ -1,16 +1,16 @@
 { ... }:
 {
   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
+    ../env
+    ../tui
+    ../gui/browser.nix
+    ../gui/neovide.nix
+    ../gui/libreoffice.nix
+    ../gui/cloud.nix
+    ../gui/kitty.nix
+    ../gui/messaging.nix
+    ../gui/nomachine.nix
+    ../gui/ukaea.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
diff --git a/home/desktop/gtk.nix b/home/desktop/gtk.nix
index 81956cf9..b2ff7478 100644
--- a/home/desktop/gtk.nix
+++ b/home/desktop/gtk.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 {
   gtk = {
     enable = true;
@@ -10,5 +10,6 @@
       package = pkgs.catppuccin-gtk;
       name = "Catppuccin-Frappe-Standard-Blue-Dark";
     };
+    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
   };
 }