From a8a2338388632e2b47bd1ff8f162e08c8cbb9bd6 Mon Sep 17 00:00:00 2001
From: Maaz Khokhar <khokharmaaz@gmail.com>
Date: Thu, 18 Jun 2026 20:38:06 -0500
Subject: [PATCH] did some stuff + nix flake works

---
 home/desktop/hyprland/default.nix          |  9 ---------
 home/desktop/hyprland/hyprland.lua         |  0
 home/desktop/plasma/default.nix            |  0
 hosts/laptop/configuration.nix             |  2 ++
 modules/desktop/hyprland/default.nix       | 22 ++++++++++++++++++++++
 {home => modules}/desktop/niri/default.nix |  0
 modules/desktop/plasma/default.nix         |  9 +++++++++
 7 files changed, 33 insertions(+), 9 deletions(-)
 delete mode 100644 home/desktop/hyprland/default.nix
 delete mode 100644 home/desktop/hyprland/hyprland.lua
 delete mode 100644 home/desktop/plasma/default.nix
 create mode 100644 modules/desktop/hyprland/default.nix
 rename {home => modules}/desktop/niri/default.nix (100%)
 create mode 100644 modules/desktop/plasma/default.nix

diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix
deleted file mode 100644
index d61d2f2..0000000
--- a/home/desktop/hyprland/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.hyprland = {
-    enable = true;
-    withUWSM = false;
-    xwayland.enable = true;
-  };
-}
diff --git a/home/desktop/hyprland/hyprland.lua b/home/desktop/hyprland/hyprland.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/home/desktop/plasma/default.nix b/home/desktop/plasma/default.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index a2d417a..cbdcefc 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -9,6 +9,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../modules/virtualization
+    ../../modules/desktop/plasma
   ];
 
   boot = {
@@ -60,6 +61,7 @@
     ghostty
     starship
     tmux
+    mpv
     zoxide
     fd
     ripgrep
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix
new file mode 100644
index 0000000..b391efe
--- /dev/null
+++ b/modules/desktop/hyprland/default.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    hyprland
+    quickshell
+    hyprlock
+    mpvpaper
+    hyprsunset
+    hyprpicker
+    hyprpolkitagent
+    hyprshot
+  ];
+  programs.hyprland.enable = true;
+  services.displayManager.sddm = {
+    enable = true;
+    wayland.enable = true;
+  }
+
+  # Fingerprint
+  services.fprintd.enable = true;
+}
diff --git a/home/desktop/niri/default.nix b/modules/desktop/niri/default.nix
similarity index 100%
rename from home/desktop/niri/default.nix
rename to modules/desktop/niri/default.nix
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
new file mode 100644
index 0000000..b934a71
--- /dev/null
+++ b/modules/desktop/plasma/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  services = {
+    desktopManager.plasma6.enable = true;
+    displayManager.plasma-login-manager.enable = true;
+  };
+  services.fprintd.enable = true;
+}