From d0880fd36dfe1f0a0795e47cb487c33b28d59386 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Wed, 18 Jun 2025 15:48:34 -0500
Subject: [PATCH] fix hyprland build

---
 hosts/desktop/configuration.nix               |  1 +
 .../hyprland/config/kitty/default.nix         |  4 +--
 hosts/mac-nixos/hyprland/default.nix          |  3 +-
 .../hyprland/config/kitty/default.nix         |  4 +--
 .../hyprland/config/mako/default.nix          | 32 ++++++++++---------
 .../desktop-environments/hyprland/default.nix | 22 ++++++++-----
 6 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 0ef875a..dc0c3a9 100755
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -108,6 +108,7 @@ in
     ./users.nix
     ../default.nix
     ../../modules/desktop-environments/cosmic/specialisation.nix
+    ../../modules/desktop-environments/hyprland/specialisation.nix
     ../../share/amd
   ];
 
diff --git a/hosts/mac-nixos/hyprland/config/kitty/default.nix b/hosts/mac-nixos/hyprland/config/kitty/default.nix
index 8d0b81c..1917799 100755
--- a/hosts/mac-nixos/hyprland/config/kitty/default.nix
+++ b/hosts/mac-nixos/hyprland/config/kitty/default.nix
@@ -5,8 +5,8 @@
     shellIntegration.enableZshIntegration = true;
 
     font = {
-      name = "jetbrains mono nerd font";
-      package = pkgs.nerdfonts;
+      name = "nerd-fonts-jetbrains-mono";
+      package = pkgs.nerd-fonts.jetbrains-mono;
       size = 12;
     };
 
diff --git a/hosts/mac-nixos/hyprland/default.nix b/hosts/mac-nixos/hyprland/default.nix
index 62083d1..493750d 100755
--- a/hosts/mac-nixos/hyprland/default.nix
+++ b/hosts/mac-nixos/hyprland/default.nix
@@ -82,9 +82,8 @@ in
     fonts.packages = with pkgs; [
       noto-fonts
       noto-fonts-color-emoji
-      nerdfonts
       meslo-lgs-nf
-    ];
+    ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 
     fonts.fontconfig.defaultFonts = {
       emoji = [
diff --git a/modules/desktop-environments/hyprland/config/kitty/default.nix b/modules/desktop-environments/hyprland/config/kitty/default.nix
index 1bae583..6a06253 100755
--- a/modules/desktop-environments/hyprland/config/kitty/default.nix
+++ b/modules/desktop-environments/hyprland/config/kitty/default.nix
@@ -5,8 +5,8 @@
     shellIntegration.enableZshIntegration = true;
 
     font = {
-      name = "jetbrains mono nerd font";
-      package = pkgs.nerdfonts;
+      name = "nerd-fonts-jetbrains-mono";
+      package = pkgs.nerd-fonts.jetbrains-mono;
       size = 12;
     };
 
diff --git a/modules/desktop-environments/hyprland/config/mako/default.nix b/modules/desktop-environments/hyprland/config/mako/default.nix
index 4775ced..3cafb99 100755
--- a/modules/desktop-environments/hyprland/config/mako/default.nix
+++ b/modules/desktop-environments/hyprland/config/mako/default.nix
@@ -1,21 +1,23 @@
 {
   services.mako = {
     enable = true;
-    font = "monospace 12";
-    icons = false;
-    width = 500;
-    height = 110;
-    layer = "overlay";
-    borderRadius = 15;
-    borderSize = 2;
-    maxIconSize = 64;
-    defaultTimeout = 5000;
-    sort = "-time";
-    ignoreTimeout = true;
+    settings = {
+      font = "monospace 12";
+      icons = false;
+      ignore-timeout = true;
+      sort = "-time";
+      width = 500;
+      height = 110;
+      layer = "overlay";
+      border-radius = 15;
+      border-size = 2;
+      max-icon-size = 64;
+      default-timeout = 5000;
 
-    backgroundColor = "#24273a";
-    textColor = "#cad3f5";
-    borderColor = "#8aadf4";
-    progressColor = "over #363a4f";
+      background-color = "#24273a";
+      text-color = "#cad3f5";
+      border-color = "#8aadf4";
+      progress-color = "over #363a4f";
+    };
   };
 }
diff --git a/modules/desktop-environments/hyprland/default.nix b/modules/desktop-environments/hyprland/default.nix
index bc6bf39..0ef95e5 100755
--- a/modules/desktop-environments/hyprland/default.nix
+++ b/modules/desktop-environments/hyprland/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 let
   sddmTheme = "catppuccin-mocha";
 in
@@ -10,12 +10,19 @@ in
   home-manager.users.matt = import ./home.nix;
 
   services = {
-    displayManager.sddm.enable = true;
-    displayManager.sddm.package = pkgs.kdePackages.sddm;
-    displayManager.sddm.theme = sddmTheme;
-    displayManager.defaultSession = "hyprland";
+    displayManager = {
+      sddm = {
+        enable = true;
+        package = pkgs.kdePackages.sddm;
+        theme = sddmTheme;
+        wayland.enable = true;
+      };
+      gdm.enable = lib.mkForce false;
+      defaultSession = "hyprland";
+    };
     # disable plasma
-    desktopManager.plasma6.enable = false;
+    desktopManager.plasma6.enable = lib.mkForce false;
+    desktopManager.gnome.enable = lib.mkForce false;
 
     dbus.enable = true;
 
@@ -86,9 +93,8 @@ in
     font-awesome
     noto-fonts
     noto-fonts-color-emoji
-    nerdfonts
     meslo-lgs-nf
-  ];
+  ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 
   fonts.fontconfig.defaultFonts = {
     emoji = [