From 7d10c8e7d2ed785cf5ab063a0ce02d45ac5697c0 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Sat, 5 Oct 2024 16:20:26 +0200
Subject: [PATCH] Make new nixos i3 config file

---
 modules/nixos/{x11 => i3}/default.nix | 19 ++-----------------
 systems/x86_64-linux/aspi/default.nix | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 19 deletions(-)
 rename modules/nixos/{x11 => i3}/default.nix (76%)

diff --git a/modules/nixos/x11/default.nix b/modules/nixos/i3/default.nix
similarity index 76%
rename from modules/nixos/x11/default.nix
rename to modules/nixos/i3/default.nix
index 289027b..14771db 100644
--- a/modules/nixos/x11/default.nix
+++ b/modules/nixos/i3/default.nix
@@ -21,10 +21,10 @@
 }:
 
 let
-  cfg = config.modules.x11;
+  cfg = config.modules.i3;
 in
 {
-  options.modules.x11 = {
+  options.modules.i3 = {
     enable = lib.mkOption { default = false; };
   };
 
@@ -32,25 +32,10 @@ in
     services.xserver.windowManager.i3.enable = true;
     services.xserver.windowManager.i3.package = pkgs.i3-gaps;
 
-    services.xserver.wacom.enable = true;
-
-    # TODO: move into i3 module
     programs.xss-lock = {
       # responds to "loginctl lock-session" via dbus
       enable = true;
       lockerCommand = "${pkgs.i3lock}/bin/i3lock --ignore-empty-password --color=000000";
     };
-    # services.xserver.xautolock = { # TODO: does not work
-    #   enable = true;
-    #   time = 1;
-    # };
-
-    # Configure keymap in X11
-    services.xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      xkb.layout = "de";
-      xkb.variant = "";
-    };
   };
 }
diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index 05cd9a5..247a0d4 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -75,7 +75,7 @@
     pcmanfm.enable = true;
     wayland.enable = true;
     hyprland.enable = true;
-    x11.enable = true;
+    # i3.enable = true;
   };
 
   nix.settings.auto-optimise-store = true;
@@ -97,9 +97,22 @@
     ];
   };
 
-  # Enable the X11 windowing system.
   hardware.opengl.enable = true;
 
+  services.xserver.wacom.enable = true;
+  # services.xserver.xautolock = { # TODO: does not work
+  #   enable = true;
+  #   time = 1;
+  # };
+
+  # Configure keymap in X11
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+    xkb.layout = "de";
+    xkb.variant = "";
+  };
+
   nix.gc = {
     automatic = true;
     dates = "weekly";