Move all locale information into locales, move dconf to common and remove desktop default

common.nix

@@ -31,6 +31,7 @@ in {
   virtualisation.podman.enable = true;
   programs = {
     ssh.startAgent = true;
+    dconf.enable = true;
     fish.enable = true;
     zsh.enable = true;
   };

desktop/default.nix

@@ -1,4 +0,0 @@
-{...}: {
-  console.keyMap = "uk";
-  programs.dconf.enable = true;
-}

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";
 

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
   ];
 

machines/Vanguard/default.nix

@@ -4,7 +4,6 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
-    ../../desktop/hyprland.nix
     ../../services/sshd
   ];
   networking = {

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";