From 3d5ac7673b731112cedc2bdcf224c495ced5f414 Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Sat, 21 Jun 2025 22:59:58 +0200
Subject: [PATCH] Fix neo layout

---
 modules/default.nix            |  1 +
 modules/neo.nix                |  7 +++++++
 users/jalr/modules/default.nix |  1 -
 users/jalr/modules/neo.nix     | 17 -----------------
 4 files changed, 8 insertions(+), 18 deletions(-)
 create mode 100644 modules/neo.nix
 delete mode 100644 users/jalr/modules/neo.nix

diff --git a/modules/default.nix b/modules/default.nix
index 80aac79..f164fb0 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -38,6 +38,7 @@
     ./matrix
     ./mobile-network.nix
     ./mute-indicator.nix
+    ./neo.nix
     ./networking
     ./nix.nix
     ./obs.nix
diff --git a/modules/neo.nix b/modules/neo.nix
new file mode 100644
index 0000000..b9c299c
--- /dev/null
+++ b/modules/neo.nix
@@ -0,0 +1,7 @@
+{
+  environment.variables = {
+    XKB_DEFAULT_LAYOUT = "de,de";
+    XKB_DEFAULT_VARIANT = "neo,";
+    XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
+  };
+}
diff --git a/users/jalr/modules/default.nix b/users/jalr/modules/default.nix
index 76f8f9e..ec2e23d 100644
--- a/users/jalr/modules/default.nix
+++ b/users/jalr/modules/default.nix
@@ -22,7 +22,6 @@
     ./mpv.nix
     ./mute-indicator.nix
     ./mycli
-    ./neo.nix
     ./neovim
     ./nix-index.nix
     ./obs-studio
diff --git a/users/jalr/modules/neo.nix b/users/jalr/modules/neo.nix
deleted file mode 100644
index 4d668d0..0000000
--- a/users/jalr/modules/neo.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-let
-  xkb_layout = "de,de";
-  xkb_variant = "neo,";
-  xkb_options = "grp:win_space_toggle";
-in
-{
-  home.sessionVariables = {
-    XKB_DEFAULT_LAYOUT = xkb_layout;
-    XKB_DEFAULT_VARIANT = xkb_variant;
-    XKB_DEFAULT_OPTIONS = xkb_options;
-  };
-  wayland.windowManager.sway.config.input."type:keyboard" = {
-    inherit xkb_layout;
-    inherit xkb_variant;
-    inherit xkb_options;
-  };
-}