From 3a55413cae25b0f8f00fd86ea2ea83867c8944be Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sat, 8 Mar 2025 17:22:48 -0500
Subject: [PATCH] fix(ags4): use my fork with overlays

---
 flake.lock               | 28 ++++++++++++++++++----------
 flake.nix                | 12 +++++++++---
 inputs/default.nix       | 12 ++++++++++--
 modules/ags/default.nix  |  4 +++-
 modules/ags/packages.nix | 13 ++++---------
 5 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index abcb1f96..4b30b877 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,18 +7,22 @@
         ],
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "systems": [
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1738087375,
-        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
-        "owner": "Aylur",
+        "lastModified": 1741472109,
+        "narHash": "sha256-jQZ1zXK1yRoSz0+yuPVh/7CpYczfhwybzhnoZ7mPJ50=",
+        "owner": "matt1432",
         "repo": "ags",
-        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
+        "rev": "59e9dbcf32213398ab08d209c483e5d024ed7316",
         "type": "github"
       },
       "original": {
-        "owner": "Aylur",
+        "owner": "matt1432",
+        "ref": "overlay",
         "repo": "ags",
         "type": "github"
       }
@@ -60,18 +64,22 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "systems": [
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1741396597,
-        "narHash": "sha256-RQYpdggQLWTynaT1ISqbACo8plSTBNunG8rv8+A82g0=",
-        "owner": "Aylur",
+        "lastModified": 1741470966,
+        "narHash": "sha256-Ix4WQvwuGE/NmwRDiE1wxyqsD9FUani3NiHD2rRioyM=",
+        "owner": "matt1432",
         "repo": "astal",
-        "rev": "f38433594051ee75957720d1c36de00896a67eb6",
+        "rev": "ca9df70b99d53926643fb3567e758812b62785a0",
         "type": "github"
       },
       "original": {
-        "owner": "Aylur",
+        "owner": "matt1432",
+        "ref": "overlay",
         "repo": "astal",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cf5825b1..b9b7bd8d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,14 +5,20 @@
       inputs = {
         astal.follows = "astal";
         nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
       };
-      owner = "Aylur";
+      owner = "matt1432";
+      ref = "overlay";
       repo = "ags";
       type = "github";
     };
     astal = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      owner = "Aylur";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
+      owner = "matt1432";
+      ref = "overlay";
       repo = "astal";
       type = "github";
     };
diff --git a/inputs/default.nix b/inputs/default.nix
index c13af46b..3963e9d1 100644
--- a/inputs/default.nix
+++ b/inputs/default.nix
@@ -195,14 +195,22 @@ let
 
     agsInputs = {
       astal = mkInput {
-        owner = "Aylur";
+        # owner = "Aylur";
         repo = "astal";
+
+        # FIXME: https://github.com/Aylur/astal/pull/314
+        owner = "matt1432";
+        ref = "overlay";
       };
 
       ags = mkInput {
-        owner = "Aylur";
+        # owner = "Aylur";
         repo = "ags";
 
+        # FIXME: https://github.com/Aylur/astal/pull/314
+        owner = "matt1432";
+        ref = "overlay";
+
         inputs.astal.follows = "astal";
       };
 
diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 63b57f2e..6e08f1be 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -4,7 +4,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.inputs) virtualkeyboard-adapter;
+  inherit (self.inputs) ags astal virtualkeyboard-adapter;
   inherit (lib) hasPrefix mkIf removePrefix;
 
   # Configs
@@ -53,6 +53,8 @@ in {
     services.upower.enable = true;
 
     nixpkgs.overlays = [
+      ags.overlays.default
+      astal.overlays.default
       virtualkeyboard-adapter.overlays.default
 
       # FIXME: https://github.com/NixOS/nixpkgs/pull/377867
diff --git a/modules/ags/packages.nix b/modules/ags/packages.nix
index ef68dab2..7cb79f74 100644
--- a/modules/ags/packages.nix
+++ b/modules/ags/packages.nix
@@ -5,7 +5,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.inputs) ags astal gtk-session-lock kompass;
+  inherit (self.inputs) gtk-session-lock kompass;
 
   inherit (lib) attrValues boolToString filter getExe mkIf optionalAttrs optionals;
 
@@ -30,18 +30,13 @@ in {
   config = mkIf cfgDesktop.ags.enable {
     # Make these accessible outside these files
     programs.ags = {
-      # TODO: add overlays to upstream flake
-      package = ags.packages.${pkgs.system}.ags.override {
+      package = pkgs.ags.override {
         extraPackages = cfg.astalLibs;
-
-        # FIXME: this makes sure we use my overlayed version for gtk4-session-lock
-        # try to fix this with overlays
-        gtk4-layer-shell = pkgs.gtk4-layer-shell;
       };
 
       astalLibs = attrValues {
         inherit
-          (astal.packages.${pkgs.system})
+          (pkgs.astalLibs)
           io
           astal3
           astal4
@@ -67,7 +62,7 @@ in {
 
         # libkompass dependencies
         inherit
-          (astal.packages.${pkgs.system})
+          (pkgs.astalLibs)
           cava
           river
           ;