From 06a8d50fb1419d69d8a886ac89e105e5db04bfb0 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 5 Mar 2024 19:37:09 -0500
Subject: [PATCH] feat(ags): add gtk4 version of ags astal

---
 flake.lock              | 21 +++++++++++++++++++++
 flake.nix               |  7 +++++++
 modules/ags/default.nix | 14 ++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/flake.lock b/flake.lock
index 8697bdf..19f5d90 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,6 +43,26 @@
         "type": "github"
       }
     },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709473082,
+        "narHash": "sha256-8af1Ks+HrQO1/EvzZhpXdB4hrm0A85swHwYqPDUiNw8=",
+        "owner": "Aylur",
+        "repo": "Astal",
+        "rev": "5a192cce097189ef37b97e2d69fda37b4c51fd84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "Astal",
+        "type": "github"
+      }
+    },
     "bat-theme-src": {
       "flake": false,
       "locked": {
@@ -1359,6 +1379,7 @@
       "inputs": {
         "ags": "ags",
         "arion": "arion",
+        "astal": "astal",
         "bat-theme-src": "bat-theme-src",
         "caddy-plugins": "caddy-plugins",
         "coc-stylelintplus": "coc-stylelintplus",
diff --git a/flake.nix b/flake.nix
index 2f50874..7ffc128 100644
--- a/flake.nix
+++ b/flake.nix
@@ -249,6 +249,13 @@
 
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    astal = {
+      type = "github";
+      owner = "Aylur";
+      repo = "Astal";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     coc-stylelintplus = {
       type = "github";
diff --git a/modules/ags/default.nix b/modules/ags/default.nix
index 37c92c7..2da2752 100644
--- a/modules/ags/default.nix
+++ b/modules/ags/default.nix
@@ -1,5 +1,6 @@
 {
   ags,
+  astal,
   config,
   pkgs,
   ...
@@ -8,10 +9,15 @@
 
   isTouchscreen = config.hardware.sensor.iio.enable;
 in {
+  # Enable pam for ags and astal
+  security.pam.services.ags = {};
+  security.pam.services.astal = {};
+
   services.upower.enable = true;
 
   home-manager.users.${mainUser}.imports = [
     ags.homeManagerModules.default
+    astal.homeManagerModules.default
 
     ({
       config,
@@ -25,6 +31,14 @@ in {
       agsTypes = config.home.file.".local//share/com.github.Aylur.ags/types";
       agsConfigDir = ".nix/modules/ags/config";
     in {
+      # Experimental Gtk4 ags
+      programs.astal = {
+        enable = true;
+        extraPackages = with pkgs; [
+          libadwaita
+        ];
+      };
+
       programs.ags.enable = true;
 
       home = {