diff --git a/flake.nix b/flake.nix
index eb71fa0..1a3f68d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -295,6 +295,8 @@
             electron = pkgs.electron_22;
           };
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
+          hyprland-autoname-workspaces =
+            pkgs.callPackage ./packages/workspace-renamer/default.nix { };
         };
       });
 }
diff --git a/home-manager/linux/programs/hyprland.nix b/home-manager/linux/programs/hyprland.nix
index 48e4e0a..8cd50ed 100644
--- a/home-manager/linux/programs/hyprland.nix
+++ b/home-manager/linux/programs/hyprland.nix
@@ -60,6 +60,8 @@ in with lib; {
       # Polkit
       libsForQt5.polkit-kde-agent
       polkit_gnome
+      # Auto workspace renaming
+      inputs.self.packages.${pkgs.system}.hyprland-autoname-workspaces
     ];
     #########################
     ##  Hyprland
diff --git a/packages/workspace-renamer/default.nix b/packages/workspace-renamer/default.nix
new file mode 100644
index 0000000..adf3af5
--- /dev/null
+++ b/packages/workspace-renamer/default.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, fetchFromGitHub, rustPlatform, ... }:
+let
+  vals = builtins.fromJSON (builtins.readFile ../../sources/autoname.json);
+  version = "1.0.0";
+  rev = vals.rev;
+  hash = vals.hash;
+  src = fetchFromGitHub {
+    owner = "hyprland-community";
+    repo = "hyprland-autoname-workspaces";
+    inherit rev hash;
+  };
+in rustPlatform.buildRustPackage {
+  pname = "hyprland-autoname-workspaces";
+  inherit version;
+  inherit src;
+  cargoLock = {
+    lockFile = "${src}/Cargo.lock";
+    outputHashes = {
+      "hyprland-0.3.3" = "sha256-3RhuaVLCjEwvIBQyot2sma5kFLSGVndJ58UUef0bES4=";
+    };
+  };
+}
diff --git a/sources/autoname.json b/sources/autoname.json
new file mode 100644
index 0000000..daa067d
--- /dev/null
+++ b/sources/autoname.json
@@ -0,0 +1,4 @@
+{
+  "rev": "4cbebec3f29c59846c9e2a53bddb1ba6f84ae605",
+  "hash": "sha256-g+in35ucDRghRiowboQugwkVMfmCDxMXDJXT8oNQxek="
+}
diff --git a/sources/update-sources.sh b/sources/update-sources.sh
index 0fd0aaf..500604a 100755
--- a/sources/update-sources.sh
+++ b/sources/update-sources.sh
@@ -16,6 +16,18 @@ jq --null-input \
     > $DIRECTORY/swayimg.json
 echo "swayimg now at $SWAYIMG_VERSION"
 
+# Update autoname
+# AUTONAME_BRANCH=$(curl https://api.github.com/repos/hyprland-community/hyprland-autoname-workspaces| jq -r '.default_branch')
+# AUTONAME_REV=$(curl https://api.github.com/repos/hyprland-community/hyprland-autoname-workspaces/git/refs/heads/$AUTONAME_BRANCH | \
+#                 jq -r '.object.sha')
+# AUTONAME_HASH=$(nix-prefetch fetchFromGitHub --owner hyprland-community --repo hyprland-autoname-workspaces --rev $AUTONAME_REV)
+# jq --null-input \
+#     --arg rev "$AUTONAME_REV" \
+#     --arg hash "$AUTONAME_HASH" \
+#     '{"rev": $rev, "hash": $hash}' \
+#     > $DIRECTORY/autoname.json
+# echo "autoname now at $AUTONAME_REV"
+
 # Update gamescope
 GAMESCOPE_BRANCH=$(curl https://api.github.com/repos/ValveSoftware/gamescope | jq -r '.default_branch')
 GAMESCOPE_REV=$(curl https://api.github.com/repos/ValveSoftware/gamescope/git/refs/heads/$GAMESCOPE_BRANCH | \
@@ -27,3 +39,4 @@ jq --null-input \
     '{"rev": $rev, "hash": $hash}' \
     > $DIRECTORY/gamescope.json
 echo "gamescope now at $GAMESCOPE_REV"
+