From f47686d5892c09940081ced9ad7627bc8a34f26c Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Wed, 10 Jul 2024 02:07:06 +0530
Subject: [PATCH] fix: Fix the issues with the linux flakes

---
 common/gui.nix     |  4 ++--
 flake.nix          |  8 ++++++++
 linux/hyprland.nix |  2 +-
 nixos/ryu.nix      |  5 ++---
 overlays.nix       | 15 +++++++++++++++
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/common/gui.nix b/common/gui.nix
index d4f6faa3..fa957bd6 100644
--- a/common/gui.nix
+++ b/common/gui.nix
@@ -41,8 +41,8 @@ lib.attrsets.optionalAttrs device.hasGui {
       catppuccinThemes.gtk
       catppuccinThemes.papirus-folders
 
-      gnome.seahorse
-      gnome.nautilus
+      seahorse
+      nautilus
       nextcloud-client
       gparted
       polkit_gnome
diff --git a/flake.nix b/flake.nix
index 2574ec0d..2b6e7962 100644
--- a/flake.nix
+++ b/flake.nix
@@ -204,6 +204,14 @@
       };
 
     packages = inputs.neovim.packages;
+    # // {
+    #   x86_64-linux.fprintd =
+    #     (import nixpkgs {
+    #       inherit overlays;
+    #       system = "x86_64-linux";
+    #     })
+    #     .fprintd;
+    # };
 
     cachix = let
       cachix-deploy-lib = inputs.cachix-deploy.lib nixpkgs.legacyPackages.x86_64-linux;
diff --git a/linux/hyprland.nix b/linux/hyprland.nix
index 2c08ae87..3cbca13d 100644
--- a/linux/hyprland.nix
+++ b/linux/hyprland.nix
@@ -99,7 +99,7 @@
 
       master = {
         # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_is_master = true;
+        new_status = "master";
       };
 
       gestures = {
diff --git a/nixos/ryu.nix b/nixos/ryu.nix
index 0e36c0b4..e0a31736 100644
--- a/nixos/ryu.nix
+++ b/nixos/ryu.nix
@@ -16,10 +16,9 @@
     };
   };
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
   virtualisation.libvirtd.enable = true;
diff --git a/overlays.nix b/overlays.nix
index 77de95c4..c5a1d93f 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -218,6 +218,21 @@
           final.doctest
         ];
     });
+    fprintd = prev.fprintd.overrideAttrs (oldAttrs: rec {
+      version = "1.94.3";
+      src = final.fetchFromGitLab {
+        domain = "gitlab.freedesktop.org";
+        owner = "libfprint";
+        repo = "fprintd";
+        rev = "v${version}";
+        sha256 = "sha256-shH+ctQAx4fpTMWTmo3wB45ZS38Jf8RknryPabfZ6QE=";
+      };
+      patches = [];
+      mesonCheckFlags = [
+        "--no-suite" "fprintd:PAM"
+        "--no-suite" "fprintd:TestPamFprintd"
+      ];
+    });
   };
   # _1password = final: prev: {
   #   _1password-gui = prev._1password-gui.override {