From 195aa9e72252fdb144f949362000a05e92c07982 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 20 Jun 2023 07:17:15 +0100
Subject: [PATCH] Move all locale information into locales, move dconf to
 common and remove desktop default

---
 common.nix                    |  1 +
 desktop/default.nix           |  4 ----
 locales/en_GB.nix             | 12 +++++++-----
 machines/N0245/default.nix    |  1 -
 machines/Vanguard/default.nix |  1 -
 machines/Vanguard/xenia.nix   |  2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 desktop/default.nix

diff --git a/common.nix b/common.nix
index 5db35b21..41333d61 100644
--- a/common.nix
+++ b/common.nix
@@ -31,6 +31,7 @@ in {
   virtualisation.podman.enable = true;
   programs = {
     ssh.startAgent = true;
+    dconf.enable = true;
     fish.enable = true;
     zsh.enable = true;
   };
diff --git a/desktop/default.nix b/desktop/default.nix
deleted file mode 100644
index e41b5947..00000000
--- a/desktop/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}: {
-  console.keyMap = "uk";
-  programs.dconf.enable = true;
-}
diff --git a/locales/en_GB.nix b/locales/en_GB.nix
index 3ab3785f..e2a4742a 100644
--- a/locales/en_GB.nix
+++ b/locales/en_GB.nix
@@ -1,8 +1,10 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
+  services.xserver = {
+    layout = "gb";
+    xkbVariant = "";
+  };
+  console.keyMap = "uk";
+
   # Set your time zone.
   time.timeZone = "Europe/London";
 
diff --git a/machines/N0245/default.nix b/machines/N0245/default.nix
index 2c26e780..1ec65f3e 100644
--- a/machines/N0245/default.nix
+++ b/machines/N0245/default.nix
@@ -4,7 +4,6 @@
     ../../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 f0b2dbad..f7717e14 100644
--- a/machines/Vanguard/default.nix
+++ b/machines/Vanguard/default.nix
@@ -4,7 +4,6 @@
     ../../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 ce455af7..5d509dca 100644
--- a/machines/Vanguard/xenia.nix
+++ b/machines/Vanguard/xenia.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../home/personal.nix
     ../../home/gui
-    ../../home/desktop/swayfx.nix
+    ../../home/desktop/sway.nix
   ];
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";