From 91a5f9790cfd4a98ee940633694fb512ecf24942 Mon Sep 17 00:00:00 2001
From: Aargh Rai <aargh.rai+git@gmail.com>
Date: Thu, 6 Aug 2026 00:29:36 +0530
Subject: i3 > hyprland & x11 > wayland

---
 nixos/desktop-environment.nix | 69 ++++++++++++++++++++++++-------------------
 nixos/environment.nix         |  1 -
 nixos/home.nix                |  2 +-
 3 files changed, 40 insertions(+), 32 deletions(-)

(limited to 'nixos')

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
+    ];
 }
diff --git a/nixos/environment.nix b/nixos/environment.nix
index c29c8bf..90ade53 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -47,7 +47,6 @@
     btop
     yazi
     scrcpy
-    wf-recorder
     cava
 
     wget
diff --git a/nixos/home.nix b/nixos/home.nix
index 95cdd2b..eb1413b 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -3,7 +3,7 @@
   users.users.${username} = {
     isNormalUser = true;
     description = "User";
-    extraGroups = [ "networkmanager" "wheel" "kvm" "adbusers" "docker" ];
+    extraGroups = [ "networkmanager" "wheel" "kvm" "adbusers" "docker" "video" "input" ];
     packages = with pkgs; [];
     shell = pkgs.fish;
   };
-- 
cgit v1.2.3