diff --git a/flake.lock b/flake.lock
index 7e40267..9e16e9c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,22 +1,22 @@
 {
   "nodes": {
-    "astal-river": {
+    "astal": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1721999404,
-        "narHash": "sha256-4xnWTJleUmcnO4MBrWZjSPRbUqEWDBUJ725IgGq1Bvw=",
-        "owner": "astal-sh",
-        "repo": "river",
-        "rev": "0a8a39d18bb1c2e36923aa034d03bfd33869dfe8",
+        "lastModified": 1726848080,
+        "narHash": "sha256-7vhUWi4h0sTQFIWQU2XbSnsZ6vQ5R0lsq6ntSLgKxVo=",
+        "owner": "zoriya",
+        "repo": "astal",
+        "rev": "c1443c5786277ac4ea03cbe33292a624f66aad87",
         "type": "github"
       },
       "original": {
-        "owner": "astal-sh",
-        "repo": "river",
+        "owner": "zoriya",
+        "repo": "astal",
         "type": "github"
       }
     },
@@ -76,11 +76,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1726153070,
+        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1726114145,
-        "narHash": "sha256-f+oeL//GJYkEQONQUhlidz9Tb9azACunbCEoU/jqmAE=",
+        "lastModified": 1726802692,
+        "narHash": "sha256-ERxVj+2nOQ+Vw7shGEo7CEu+eLiAjsXDw2WfZ6YFbYk=",
         "ref": "refs/heads/main",
-        "rev": "3558ac9a5335f8d0d008ed9ae7152e47ec3a49d1",
-        "revCount": 7275,
+        "rev": "a503e0250ef89a00f704541e77db72a86637af25",
+        "revCount": 7375,
         "type": "git",
         "url": "ssh://git@github.com/mitchellh/ghostty"
       },
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725513492,
-        "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
+        "lastModified": 1726745158,
+        "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
+        "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726113560,
-        "narHash": "sha256-6pXnXYAKIkAQWzfbSBMTDlw2moyvSqZiR6QltTCi4jw=",
+        "lastModified": 1726814269,
+        "narHash": "sha256-eXI81wCtybqgK05ky5/tmj4AZDKmtoNQcGZEX0vnoe8=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "e2aaa29736ba7200012470f818f9111e41b77c1a",
+        "rev": "25aca068d0bd63c6db17c29bd3641256ea62a2c1",
         "type": "github"
       },
       "original": {
@@ -320,11 +320,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1726086728,
-        "narHash": "sha256-cW8RaE7XDx95GMhWF01fGe9j1thysEMiovnDGzCH7jk=",
+        "lastModified": 1726786786,
+        "narHash": "sha256-SMRChiJK6Td+TtiphiXP+fc8ZNElfmAeHTF2y2y9y9w=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "98ba65b8be8cb2dde839502357e70916c4a3e37a",
+        "rev": "f01c764cc6f82399edfa0d47a7bafbf7c95e2747",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725765290,
-        "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
+        "lastModified": 1726449931,
+        "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
+        "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1725885300,
-        "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
+        "lastModified": 1726724509,
+        "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
+        "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
         "type": "github"
       },
       "original": {
@@ -378,11 +378,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725882169,
-        "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
+        "lastModified": 1726477654,
+        "narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
+        "rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1725983898,
-        "narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=",
+        "lastModified": 1726463316,
+        "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43",
+        "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
         "type": "github"
       },
       "original": {
@@ -425,7 +425,7 @@
     },
     "root": {
       "inputs": {
-        "astal-river": "astal-river",
+        "astal": "astal",
         "flood": "flood",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index a3e7939..edd99bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,8 +30,9 @@
       url = "github:zoriya/flood";
       flake = false;
     };
-    astal-river = {
-      url = "github:astal-sh/river";
+    astal = {
+      # url = "github:aylur/astal";
+      url = "github:zoriya/astal";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     river-src = {
diff --git a/modules/wm/ags/default.nix b/modules/wm/ags/default.nix
index 634abd1..52cf871 100644
--- a/modules/wm/ags/default.nix
+++ b/modules/wm/ags/default.nix
@@ -21,7 +21,7 @@
       prev.buildInputs
       ++ [
         pkgs.libdbusmenu-gtk3
-        inputs.astal-river.packages.x86_64-linux.default
+        inputs.astal.packages.x86_64-linux.river
       ];
   });
 in {
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index 21f6fae..1c92def 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -45,7 +45,7 @@
   services.avahi.enable = true;
 
   environment.systemPackages = with pkgs; [
-    gnome.gnome-bluetooth
+    gnome-bluetooth
     polkit_gnome
   ];