diff --git a/configs/client.nix b/configs/client.nix
index 05ae690..a1ccde0 100644
--- a/configs/client.nix
+++ b/configs/client.nix
@@ -29,6 +29,4 @@
   };
 
   programs.nix-ld.enable = true;
-
-  virtualisation.docker.enable = true;
 }
diff --git a/configs/common.nix b/configs/common.nix
index f016928..aaa836e 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -8,7 +8,6 @@
   agenix,
   home-manager,
   vencord,
-  hydro,
   ...
 }: let
   username = "leo";
@@ -30,7 +29,7 @@ in {
 
     ../programs/fish.nix
     ../programs/git.nix
-    # ../programs/starship
+    ../programs/starship
   ];
 
   age = {
@@ -136,7 +135,7 @@ in {
   nixpkgs = {
     config.allowUnfree = true;
     flake.setNixPath = false;
-    overlays = [(import ../exprs/overlay.nix {inherit vencord hydro;})];
+    overlays = [(import ../exprs/overlay.nix vencord)];
   };
 
   programs = {
diff --git a/exprs/overlay.nix b/exprs/overlay.nix
index aeec8e3..69324e6 100644
--- a/exprs/overlay.nix
+++ b/exprs/overlay.nix
@@ -1,4 +1,4 @@
-inputs: final: prev: {
+vencord-input: final: prev: {
   svn2git = prev.svn2git.overrideAttrs (_: rec {
     version = "2.4.2";
 
@@ -13,8 +13,7 @@ inputs: final: prev: {
   idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix {};
 
   vencord = prev.vencord.overrideAttrs (old: rec {
-    version = "${old.version}+git.${inputs.vencord.shortRev}";
-    src = inputs.vencord;
+    src = vencord-input;
 
     env =
       old.env
@@ -39,11 +38,4 @@ inputs: final: prev: {
       cp -r ${ventex} src/plugins/ventex
     '';
   });
-
-  fishPlugins = prev.fishPlugins.overrideScope (sfinal: sprev: {
-    hydro = sprev.hydro.overrideAttrs (old: {
-      version = "0-unstable-${inputs.hydro.lastModifiedDate}";
-      src = inputs.hydro;
-    });
-  });
 }
diff --git a/flake.lock b/flake.lock
index c024b5c..4358cf5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -202,22 +202,6 @@
         "type": "github"
       }
     },
-    "hydro": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730549115,
-        "narHash": "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=",
-        "owner": "jorgebucaran",
-        "repo": "hydro",
-        "rev": "9c93b89573bd722f766f2190a862ae55e728f6ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jorgebucaran",
-        "repo": "hydro",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": [
@@ -339,7 +323,6 @@
         "flake-utils": "flake-utils",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
-        "hydro": "hydro",
         "lanzaboote": "lanzaboote",
         "mystia": "mystia",
         "nixinate": "nixinate",
diff --git a/flake.nix b/flake.nix
index 8bdd202..e926fa1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,15 +127,10 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
-    # ==== non-nix inputs ====
+    # ==== vencord ====
     vencord = {
       url = "github:Vendicated/Vencord";
       flake = false;
     };
-
-    hydro = {
-      url = "github:jorgebucaran/hydro";
-      flake = false;
-    };
   };
 }
diff --git a/programs/fish.nix b/programs/fish.nix
index ae70371..b4bec2e 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -1,19 +1,18 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.fish.enable = true;
 
-  environment.systemPackages = with pkgs; [
-    fishPlugins.hydro
-  ];
+  environment.systemPackages = with pkgs; [nix-your-shell];
 
   hm.programs.fish = {
     enable = true;
 
     interactiveShellInit = ''
-      set --global hydro_symbol_git_dirty "*"
-      set --global hydro_color_pwd blue
-      set --global hydro_color_git magenta
-      set --global hydro_color_prompt green
-      set --global hydro_color_duration yellow
+      ${lib.getExe pkgs.starship} init fish | source
+      ${lib.getExe pkgs.nix-your-shell} fish | source
     '';
 
     functions.fish_greeting = "";
diff --git a/systems/mottarone/default.nix b/systems/mottarone/default.nix
index 1643b5e..13ccec6 100644
--- a/systems/mottarone/default.nix
+++ b/systems/mottarone/default.nix
@@ -27,4 +27,6 @@ in {
     dnssec = lib.mkForce "allow-downgrade";
     dnsovertls = lib.mkForce "false";
   };
+
+  virtualisation.docker.enable = true;
 }