From 9b7c1b8f077ba950e34fc8eb703932bdf99e3b91 Mon Sep 17 00:00:00 2001
From: Jake Ginesin <jakeginesin@gmail.com>
Date: Sat, 25 Jan 2025 00:55:42 -0500
Subject: [PATCH] 285 current  2025-01-25 00:55:29  25.05.20241217.d3c42f1    
 6.6.66                          *

---
 home/programs/bspwm/default.nix |  2 ++
 system/system.nix               |  3 +-
 system/xserver/default.nix      | 51 +++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 system/xserver/default.nix

diff --git a/home/programs/bspwm/default.nix b/home/programs/bspwm/default.nix
index 798cf13..10a8ca4 100644
--- a/home/programs/bspwm/default.nix
+++ b/home/programs/bspwm/default.nix
@@ -9,6 +9,8 @@
     extraConfig = builtins.readFile ./bspwmrc;
   };
 
+  # services.xserver.windowManager.bspwm.enable = true;
+
   # home.file.".config/bspwm/bspwmrc".source = ./bspwmrc;
 
   # home.activation.sourceMyScript = lib.mkAfter ''
diff --git a/system/system.nix b/system/system.nix
index dae29e6..5d9eaf0 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -4,7 +4,8 @@
   ...
 }: {
   imports = [
-    ./wm/bspwm.nix
+    # ./wm/bspwm.nix
+    ./xserver/default.nix
     ./services/services.nix
     ./fonts/fonts.nix
     ./hardware/hardware.nix
diff --git a/system/xserver/default.nix b/system/xserver/default.nix
new file mode 100644
index 0000000..7329a56
--- /dev/null
+++ b/system/xserver/default.nix
@@ -0,0 +1,51 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  services.xserver = {
+    enable = true;
+    xkb.layout = "us";
+    xkb.variant = "";
+
+    # displayManager.defaultSession = "bspwm";
+    desktopManager.xterm.enable = false;
+
+    # windowManager.bspwm = {
+    # enable = true;
+    # # extraConfig = builtins.readFile ./bspwmrc;
+    # # configFile = ./bspwmrc; # relative import to preserve locality of config
+    # # package = "bspwm-unstable";
+    # # sxhkd.package = "sxhkd-unstable";
+    # # sxhkd.configFile = ./sxhkdrc;
+    # };
+
+    displayManager = {
+      # autoLogin.user = "synchronous";
+      # autoLogin.enable = true;
+
+      lightdm = {
+        enable = true;
+        greeters.gtk.enable = true;
+      };
+    };
+  };
+
+  # xsession.windowManager.bspwm = {
+  #   enable = true;
+  #   extraConfig = builtins.readFile ./bspwmrc;
+  # };
+
+  # services.sxhkd.enable = true;
+  # services.sxhkd.extraConfig = builtins.readFile ./sxhkdrc;
+
+  # services.displayManager.autoLogin.enable = true;
+
+  # services.displayManagrer.sddm.enable = true;
+  # services.desktopManager.plasma6.enable = true;
+
+  # services.xserver.xkb = {
+  #   layout = "us";
+  #   variant = "";
+  # }
+}