From 6d10e51a45059ec1e08bfcf27779577881dd0b66 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 20 Jun 2023 07:27:07 +0100
Subject: [PATCH] Temp hyprland import needed to make sway work, todo fix...

---
 desktop/hyprland.nix          | 1 -
 machines/N0245/default.nix    | 1 +
 machines/Vanguard/default.nix | 1 +
 machines/Vanguard/xenia.nix   | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/desktop/hyprland.nix b/desktop/hyprland.nix
index de910413..03508969 100644
--- a/desktop/hyprland.nix
+++ b/desktop/hyprland.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  imports = [./default.nix];
   nixpkgs.overlays = [
     (self: super: {
       waybar = super.waybar.overrideAttrs (oldAttrs: {
diff --git a/machines/N0245/default.nix b/machines/N0245/default.nix
index 1ec65f3e..2c26e780 100644
--- a/machines/N0245/default.nix
+++ b/machines/N0245/default.nix
@@ -4,6 +4,7 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
+    ../../desktop/hyprland.nix
     ../../services/syncthing/N0245.nix
   ];
 
diff --git a/machines/Vanguard/default.nix b/machines/Vanguard/default.nix
index f7717e14..f0b2dbad 100644
--- a/machines/Vanguard/default.nix
+++ b/machines/Vanguard/default.nix
@@ -4,6 +4,7 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
+    ../../desktop/hyprland.nix
     ../../services/sshd
   ];
   networking = {
diff --git a/machines/Vanguard/xenia.nix b/machines/Vanguard/xenia.nix
index 5d509dca..ce455af7 100644
--- a/machines/Vanguard/xenia.nix
+++ b/machines/Vanguard/xenia.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../home/personal.nix
     ../../home/gui
-    ../../home/desktop/sway.nix
+    ../../home/desktop/swayfx.nix
   ];
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";