merge conflict

system/optional/desktop.nix

@@ -1,15 +1,23 @@
-{ config, lib, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  hyprland,
+  ...
+}:
+{
   options.desktop.enable = lib.mkEnableOption "Enable Wayland compositor with hyprland login";
 
   config = lib.mkIf config.desktop.enable {
     hardware.graphics.enable = true;
-  
+
     security.polkit.enable = true;
-    security.pam.services.hyprlock = {};
+    security.pam.services.hyprlock = { };
 
     services.dbus.enable = true;
 
     programs.hyprland.enable = true;
+    programs.hyprland.package = hyprland.packages.${pkgs.system}.hyprland;
 
     services.greetd = {
       enable = true;

system/optional/stylix.nix

@@ -1,4 +1,11 @@
-{pkgs, stylix, config, lib, ...}: {
+{
+  pkgs,
+  stylix,
+  config,
+  lib,
+  ...
+}:
+{
   imports = [ stylix.nixosModules.stylix ];
 
   options.auto_styling.enable = lib.mkEnableOption "Enable Stylix";
@@ -16,6 +23,16 @@
       };
 
       fonts = {
+        serif = {
+          package = pkgs.dejavu_fonts;
+          name = "DejaVu Serif";
+        };
+
+        sansSerif = {
+          package = pkgs.dejavu_fonts;
+          name = "DejaVu Sans";
+        };
+
         monospace = {
           package = pkgs.nerd-fonts.jetbrains-mono;
           name = "JetBrainsMono Nerd Font";
@@ -26,12 +43,18 @@
           name = "Twemoji";
         };
 
-        sizes = { applications = 14; desktop = 12; popups = 12; terminal = 14; };
+        sizes = {
+          applications = 14;
+          desktop = 12;
+          popups = 12;
+          terminal = 14;
+        };
       };
 
       cursor = {
         package = pkgs.rose-pine-cursor;
         name = "Rosé Pine";
+        size = 10;
       };
     };
   };