diff --git a/modules/base/default.nix b/modules/base/default.nix
index 9d527f5..4a40374 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -60,7 +60,7 @@ in
       fontconfig.enable = true;
       neovim.enable = true;
       systemd-boot.enable = true;
-      tuigreet.enable = true;
+      tuigreet.enable = true; # TODO: Re-enable
     };
 
     # TODO: Remove everything below, it is here out of convenience and should be elsewhere
@@ -99,5 +99,39 @@ in
     # TODO: Move to USB module
     # services.gvfs.enable = true;
     services.udisks2.enable = true;
+
+    # TODO: Remove?
+    # Temporarily disable nvidia dgpu
+    # boot.extraModprobeConfig = ''
+    #   blacklist nouveau
+    #   options nouveau modeset=0
+    # '';
+    # services.udev.extraRules = ''
+    #   # Remove NVIDIA USB xHCI Host Controller devices, if present
+    #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
+
+    #   # Remove NVIDIA USB Type-C UCSI devices, if present
+    #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
+
+    #   # Remove NVIDIA Audio devices, if present
+    #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
+
+    #   # Remove NVIDIA VGA/3D controller devices
+    #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
+    # '';
+    # boot.blacklistedKernelModules = [
+    #   "nouveau"
+    #   "nvidia"
+    # ];
+
+    # TODO: Move to module
+    # Adds gnome as DE
+    # modules.greetd.enable = lib.mkForce false;
+    # modules.tuigreet.enable = lib.mkForce false;
+    # services.xserver = {
+    #   enable = true;
+    #   displayManager.gdm.enable = true;
+    #   desktopManager.gnome.enable = true;
+    # };
   };
 }
diff --git a/user-modules/desktop/default.nix b/user-modules/desktop/default.nix
index 4bfdb17..85daf17 100644
--- a/user-modules/desktop/default.nix
+++ b/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
   ];
 
diff --git a/user-modules/desktop/window-manager/i3.nix b/user-modules/desktop/window-manager/i3.nix
new file mode 100644
index 0000000..12359ab
--- /dev/null
+++ b/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;
+    };
+  };
+}
diff --git a/user-modules/desktop/window-manager/river.nix b/user-modules/desktop/window-manager/river.nix
index d29babd..dcebe62 100644
--- a/user-modules/desktop/window-manager/river.nix
+++ b/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";
diff --git a/users/jan.nix b/users/jan.nix
index 514109d..1a9ada2 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -19,6 +19,7 @@
       signal-desktop
       prusa-slicer
       freecad-wayland
+      inkscape
       # appflowy
     ];
 
@@ -39,10 +40,11 @@
       theming.enable = true;
 
       # Window manager
-      river.enable = true;
-      waylock.enable = true;
-      waybar.enable = true;
-      glpaper.enable = false;
+      i3.enable = true;
+      # river.enable = true;
+      # waylock.enable = true;
+      # waybar.enable = true;
+      # glpaper.enable = false;
 
       # Desktop environment
       mako.enable = true;
@@ -107,6 +109,16 @@
       tex.enable = true;
       jupyter.enable = true;
 
+      python.extraPythonPackages = p: [
+        p.numpy
+        p.scikit-learn
+        p.scipy
+        p.pandas
+        p.matplotlib
+        p.torch
+        p.torchvision
+      ];
+
       # Enable unfree
       unfree.enable = true;
     };