Added i3

user-modules/desktop/default.nix

@@ -15,6 +15,7 @@ in
     ./background/glpaper/default.nix
     ./bar/waybar.nix
     ./lock-screen/waylock.nix
+    ./window-manager/i3.nix
     ./window-manager/river.nix
   ];
 

user-modules/desktop/window-manager/i3.nix

@@ -0,0 +1,27 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.i3;
+in
+{
+  options.modules.i3.enable = lib.mkEnableOption "i3";
+
+  config = lib.mkIf cfg.enable {
+    # Set desktop type to x11
+    modules.desktop.x11 = true;
+    modules.rofi.enable = true;
+
+    modules.desktop.initScript = ''
+      i3
+    '';
+
+    xsession.windowManager.i3 = {
+      enable = true;
+    };
+  };
+}

user-modules/desktop/window-manager/river.nix

@@ -36,9 +36,10 @@ in
       river
     '';
 
-    modules.desktop.reloadScript = ''
-      ${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
-    '';
+    # TODO: Fix this
+    # modules.desktop.reloadScript = ''
+    #   ${pkgs.river}/bin/riverctl background-color 0x${config.theming.colors.bg}
+    # '';
 
     # Update background after rebuild
     # home.activation = {
@@ -60,7 +61,7 @@ in
     # River setup
     wayland.windowManager.river = {
       enable = true;
-      xwayland.enable = true;
+      xwayland.enable = false;
       settings =
         let
           layout = "filtile";