diff --git a/flake.nix b/flake.nix
index b2bf100..e0e326c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,9 +15,14 @@
         "x86_64-darwin"
         "aarch64-darwin"
       ];
-      forEachSupportedSystem = nixpkgs.lib.genAttrs supportedSystems (system: {
-        pkgs = import nixpkgs { inherit system; };
-      });
+      forEachSupportedSystem =
+        f:
+        nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            pkgs = import nixpkgs { inherit system; };
+          }
+        );
       # args will later be used in outputs to inherit the flake and its inputs for use in modules.
       args = { inherit self inputs; };
       # mkSystem lets us repeat the same config for multiple systems, called later in outputs.
diff --git a/users/modules/de.nix b/users/modules/de.nix
index 5e827ae..cebc300 100644
--- a/users/modules/de.nix
+++ b/users/modules/de.nix
@@ -6,9 +6,9 @@
     ./programs/hyprland.nix
     ./programs/kitty.nix
     ./programs/spicetify.nix
-    ./programs/waybar.nix
     ./programs/hyprlock.nix
     ./programs/fuzzel.nix
     ./programs/hyprshade.nix
+    ./programs/ags.nix
   ];
 }
diff --git a/users/modules/programs/ags.nix b/users/modules/programs/ags.nix
new file mode 100644
index 0000000..143cf93
--- /dev/null
+++ b/users/modules/programs/ags.nix
@@ -0,0 +1,20 @@
+{ inputs, pkgs, ... }:
+{
+  imports = [ inputs.ags.homeManagerModules.default ];
+
+  # Expose the cli tools to the home environment
+  home.packages = [ inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io ];
+
+  programs.ags = {
+    enable = true;
+    configDir = ./ags; # ~/.config/ags
+    systemd.enable = false;
+
+    # The module only includes the core astal3, astal4 and astal-io libraries
+    extraPackages = with pkgs; [
+      # add packages to runtime
+      # inputs.ags.packages.${pkgs.system}.battery
+      # fzf
+    ];
+  };
+}
diff --git a/users/modules/programs/ags/test b/users/modules/programs/ags/test
new file mode 100644
index 0000000..e69de29