diff --git a/flake.lock b/flake.lock
index 60234c7..721b41d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,24 @@
 {
   "nodes": {
+    "ags": {
+      "inputs": {
+        "astal": "astal",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1762046771,
+        "narHash": "sha256-baVZvZZN0t9F3fvVhxmQA1/oNykXGd/YhlF19JqCLc8=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "fe13af2daec716226ccdb3158606a8577853e0ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -33,6 +52,27 @@
         "type": "github"
       }
     },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "ags",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762012522,
+        "narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "671d4229c798834190a50fb8b8d8addd19b529e9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -178,7 +218,7 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems",
         "xdph": "xdph"
@@ -372,6 +412,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1761114652,
         "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
@@ -387,7 +443,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1761468971,
         "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
@@ -403,7 +459,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1759036355,
         "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
@@ -444,9 +500,10 @@
     },
     "root": {
       "inputs": {
+        "ags": "ags",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "vicinae": "vicinae"
       }
     },
@@ -483,7 +540,7 @@
     "vicinae": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1761603305,
diff --git a/flake.nix b/flake.nix
index 72e2b43..ea76409 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,14 +16,19 @@
     # Vicinae - Application launcher
     vicinae.url = "github:vicinaehq/vicinae";
     
-    # AGS - Aylur's GTK Shell for custom widgets/bar
-    ags.url = "github:Aylur/ags";
+    # Astal - Required for AGS
+    astal.url = "github:aylur/astal";
+    astal.inputs.nixpkgs.follows = "nixpkgs";
+    
+    # AGS - Aylur's GTK Shell for custom widgets/bar (v1)
+    ags.url = "github:Aylur/ags/v1";
+    ags.inputs.nixpkgs.follows = "nixpkgs";
     
     # Optional: Other useful inputs
     # nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
-  outputs = { self, nixpkgs, home-manager, hyprland, vicinae, ags, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, hyprland, vicinae, astal, ags, ... }@inputs: {
     # NixOS configuration for your hostname(s)
     nixosConfigurations = {
       # Desktop PC configuration
diff --git a/home/ags.nix b/home/ags.nix
index 266e094..f9be094 100644
--- a/home/ags.nix
+++ b/home/ags.nix
@@ -7,11 +7,14 @@
   programs.ags = {
     enable = true;
     
+    # null = use ~/.config/ags, or set to a path to symlink
+    configDir = null;
+    
     # Add additional packages needed for AGS
     extraPackages = with pkgs; [
-      gtksourceview
-      webkitgtk
-      accountsservice
+      inputs.astal.packages.${pkgs.system}.battery
+      inputs.astal.packages.${pkgs.system}.bluetooth
+      inputs.astal.packages.${pkgs.system}.network
     ];
   };
   
diff --git a/home/home.nix b/home/home.nix
index 48d3014..f92226a 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./hyprland.nix
-    ./ags.nix
   ];
 
   # Home Manager configuration for user-level dotfiles and applications
@@ -58,10 +57,10 @@
     # obs-studio
     
     # Hyprland essentials
-    # waybar  # Status bar - replaced by AGS
+    waybar  # Status bar
     dunst  # Notifications
     wofi  # App launcher
-    rofi-bluetooth  # Bluetooth menu for Waybar
+    rofi-bluetooth  # Bluetooth menu
     networkmanagerapplet  # WiFi manager applet for system tray
     # rofi-wayland  # Alternative launcher
     
diff --git a/home/hyprland.nix b/home/hyprland.nix
index 5c4bc13..a045baf 100644
--- a/home/hyprland.nix
+++ b/home/hyprland.nix
@@ -20,7 +20,7 @@
         "mpvpaper -o 'no-audio loop' DP-2 ~/nix-flake/assets/wallpaper.mp4"
         "mpvpaper -o 'no-audio loop' DP-1 ~/nix-flake/assets/wallpaper.mp4"
         
-        "ags"              # Start AGS (bar and widgets)
+        "ags run"          # Start AGS (bar and widgets)
         "dunst"
         "nm-applet --indicator"  # WiFi manager in system tray
         "vicinae server"         # Start Vicinae server