From c2d6b126b71de4c84932521941efaf06ffb09323 Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Thu, 9 Jan 2025 20:23:22 -0600
Subject: [PATCH] nix: use freerdp3 nixpkgs fork

Signed-off-by: Myned <dev@bjork.tech>
---
 configuration.nix | 11 ++++++-----
 flake.in.nix      |  7 ++++---
 flake.nix         |  5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 130ab8b..b8d02e3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -48,21 +48,22 @@
 
           stable = nixpkgs "stable";
           unstable = nixpkgs "unstable";
-          staging-next = nixpkgs "staging-next";
+          master = nixpkgs "master";
+          dcsunset = nixpkgs "dcsunset";
           #// local = nixpkgs "local";
         in {
           # Overlay nixpkgs branches
           #?? nixpkgs.BRANCH.PACKAGE
-          inherit stable unstable staging-next;
+          inherit stable unstable master;
 
           ### Packages
           # BUG: Build tests often fail on unstable
           # https://github.com/NixOS/nixpkgs/issues/333946
           fprintd = stable.fprintd;
 
-          # BUG: Empty password regression, remove > v3.9.0 on unstable
-          # https://github.com/FreeRDP/FreeRDP/issues/10784
-          freerdp3 = stable.freerdp3;
+          # TODO: Remove when on unstable
+          # https://github.com/NixOS/nixpkgs/pull/369808
+          freerdp3 = dcsunset.freerdp3;
 
           ### Development
           #// ciscoPacketTracer8 = local.ciscoPacketTracer8;
diff --git a/flake.in.nix b/flake.in.nix
index 925aa91..905fd3b 100644
--- a/flake.in.nix
+++ b/flake.in.nix
@@ -36,7 +36,7 @@
     stylix-stable = flake "github:danth/stylix/release-24.11" // stable "nixpkgs";
 
     ### Unstable
-    nixpkgs-unstable = flake "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs-unstable = flake "github:NixOS/nixpkgs/nixos-unstable";
 
     aagl-gtk-on-nix-unstable = flake "github:ezKEa/aagl-gtk-on-nix" // unstable "nixpkgs";
     agenix = flake "github:ryantm/agenix" // unstable "nixpkgs";
@@ -66,8 +66,9 @@
     stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
     walker = flake "github:abenz1267/walker?ref=v0.10.15" // unstable "nixpkgs";
 
-    ### Staging
-    nixpkgs-staging-next = flake "github:NixOS/nixpkgs/staging-next";
+    ### Branches
+    nixpkgs-dcsunset = flake "github:DCsunset/nixpkgs/update-freerdp3";
+    nixpkgs-master = flake "github:NixOS/nixpkgs/master";
 
     ### Development
     #// nixpkgs-local = flake "git+file:///home/myned/SYNC/dev/repo/nixpkgs";
diff --git a/flake.nix b/flake.nix
index 0601f3e..a098dc0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,9 +121,10 @@
       url = "github:nix-community/nixd";
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware";
+    nixpkgs-dcsunset.url = "github:DCsunset/nixpkgs/update-freerdp3";
+    nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
-    nixpkgs-staging-next.url = "github:NixOS/nixpkgs/staging-next";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     steamtinkerlaunch = {
       flake = false;
       url = "github:sonic2kk/steamtinkerlaunch";