From 513b62e6e6e0c52b0220487e66f58ee26cda5bd4 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:11:11 +0000
Subject: [PATCH] fix bspwm bs

---
 default.nix                       |  4 ++--
 modules/desktop/bspwm/default.nix | 31 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/default.nix b/default.nix
index b25a26de..ed327c29 100644
--- a/default.nix
+++ b/default.nix
@@ -83,8 +83,8 @@
 
   # xorg layout
   # change to needed
-  services.xserver.layout = "us";
-  services.xserver.xkbOptions = "grp:alt_shift_toggle, ctrl:swapcaps";
+  services.xserver.xkb.layout = "us";
+  services.xserver.xkb.options = "grp:alt_shift_toggle, ctrl:swapcaps";
 
   # already sold soul to corporations \_o_/
   nixpkgs.config.allowUnfree = true;
diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix
index b02e78a9..ef25c838 100644
--- a/modules/desktop/bspwm/default.nix
+++ b/modules/desktop/bspwm/default.nix
@@ -24,6 +24,24 @@ in {
     # keyring
     services.gnome.gnome-keyring.enable = true;
 
+    # ????????????
+    serices.libinput = {
+        enable = true;
+        # no mouse accel
+        mouse = {
+          accelProfile = "flat";
+        };
+
+        # no touchpad accel
+        touchpad = {
+          accelProfile = "flat";
+        };
+      };
+    };
+
+    # why???????????????????????
+    services.displayManager.defaultSession = "none+bspwm";
+
     services.xserver = {
       enable = true;
       windowManager = {
@@ -47,19 +65,6 @@ in {
           };
         };
       };
-      libinput = {
-        enable = true;
-
-        # no mouse accel
-        mouse = {
-          accelProfile = "flat";
-        };
-
-        # no touchpad accel
-        touchpad = {
-          accelProfile = "flat";
-        };
-      };
     };
     users.users.sako.packages = with pkgs; [
       rofi