i3 > hyprland & x11 > wayland

1 files changed, 39 insertions, 30 deletions

diff --git a/nixos/desktop-environment.nix b/nixos/desktop-environment.nix
index a6bb6fd..bde2730 100644
--- a/nixos/desktop-environment.nix
+++ b/nixos/desktop-environment.nix
@@ -1,38 +1,47 @@
-{ config, pkgs, quickshell, sessions, ... }:
+{ config, pkgs, sessions, ... }:
 {
   services.xserver.enable = true;
   services.xserver.displayManager.startx.enable = true;
   services.displayManager.ly.enable = true;
-  services.desktopManager.gnome.enable = false;
   services.desktopManager.plasma6.enable = true;
-  programs.hyprland.enable = sessions.hyprland_wayland;
-  programs.hyprlock.enable = sessions.hyprland_wayland;
-  programs.foot.enable = true;
+  services.xserver.windowManager.i3.enable = sessions.i3_x11;
+  services.xserver.windowManager.twm.enable = true;
   programs.dconf.enable = true;
+
+  services.desktopManager.gnome.enable = false;
+  programs.hyprland.enable = false;
+  programs.hyprlock.enable = false;
+
   environment.systemPackages = with pkgs; [
-    playerctl
-    libnotify
-    libGL
-    lm_sensors
-    slurp
-  ] ++ (if sessions.hyprland_wayland then [
-    quickshell.packages.${pkgs.system}.quickshell
-    qt6.qtwayland
-    catppuccin-cursors.mochaMauve
-    grim
-    awww
-    hyprcursor
-    hyprsunset
-    hyprpicker
-    wl-clipboard
-  ] else []) ++ (if sessions.plasma_x11 then [
-    xclip
-    libx11
-    libxrandr
-    libxinerama
-    libxcursor
-    libxi
-    libxext
-    libxfixes
-  ] else []);
+      playerctl
+      libnotify
+      libGL
+      lm_sensors
+      slurp
+      xclip
+      libx11
+      libxrandr
+      libxinerama
+      libxcursor
+      libxi
+      libxext
+      libxfixes
+      kitty
+      mesa-demos
+      xmodmap
+      xwallpaper
+
+      lxqt.lxqt-notificationd
+      lxqt.lxqt-powermanagement
+      lxqt.pavucontrol-qt
+      lxqt.pcmanfm-qt
+      lxqt.qlipper
+      lxqt.lxqt-config
+      lxqt.lxqt-themes
+
+      # Useful i3 tools
+      dmenu
+      i3status
+      i3lock
+    ];
 }