From badd1aa7ad78379d26b4461c7761e7a475b66c15 Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 26 May 2025 15:06:22 -0700
Subject: [PATCH] feat: xsession

---
 modules/home/shell/default.nix                  |  3 +++
 modules/home/shell/xorg.nix                     | 15 +++++++++++++++
 snowflake/modules/home/xorg/default.nix         | 13 -------------
 .../modules/home/xorg/xsession/default.nix      | 17 -----------------
 4 files changed, 18 insertions(+), 30 deletions(-)
 create mode 100644 modules/home/shell/xorg.nix
 delete mode 100644 snowflake/modules/home/xorg/default.nix
 delete mode 100644 snowflake/modules/home/xorg/xsession/default.nix

diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix
index 73c624b..bef840d 100644
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -1,6 +1,9 @@
 {
   imports = [
     ./stylix.nix
+
+    ./xorg.nix
+
     ./gtk.nix
     ./qt.nix
   ];
diff --git a/modules/home/shell/xorg.nix b/modules/home/shell/xorg.nix
new file mode 100644
index 0000000..ac7ae3a
--- /dev/null
+++ b/modules/home/shell/xorg.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options.marleyos.xorg.enable = lib.mkEnableOption "xorg";
+
+  config = lib.mkIf config.marleyos.xorg.enable {
+    xsession = {
+      enable = true;
+
+      numlock.enable = true;
+    };
+  };
+}
diff --git a/snowflake/modules/home/xorg/default.nix b/snowflake/modules/home/xorg/default.nix
deleted file mode 100644
index c58300f..0000000
--- a/snowflake/modules/home/xorg/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.marleyos.xorg;
-in {
-  options.marleyos.xorg.enable = lib.mkEnableOption "xorg";
-
-  # config = lib.mkIf cfg.enable {
-  #
-  # };
-}
diff --git a/snowflake/modules/home/xorg/xsession/default.nix b/snowflake/modules/home/xorg/xsession/default.nix
deleted file mode 100644
index 4eecb4c..0000000
--- a/snowflake/modules/home/xorg/xsession/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.xorg.xsession;
-in {
-  options.marleyos.xorg.xsession.enable = lib.mkEnableOption "xsession";
-
-  config = lib.mkIf cfg.enable {
-    xsession = {
-      enable = true;
-
-      numlock.enable = true;
-    };
-  };
-}