diff --git a/configs/common.nix b/configs/common.nix index aaa836e..f016928 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -8,6 +8,7 @@ agenix, home-manager, vencord, + hydro, ... }: let username = "leo"; @@ -29,7 +30,7 @@ in { ../programs/fish.nix ../programs/git.nix - ../programs/starship + # ../programs/starship ]; age = { @@ -135,7 +136,7 @@ in { nixpkgs = { config.allowUnfree = true; flake.setNixPath = false; - overlays = [(import ../exprs/overlay.nix vencord)]; + overlays = [(import ../exprs/overlay.nix {inherit vencord hydro;})]; }; programs = { diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 69324e6..aeec8e3 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -1,4 +1,4 @@ -vencord-input: final: prev: { +inputs: final: prev: { svn2git = prev.svn2git.overrideAttrs (_: rec { version = "2.4.2"; @@ -13,7 +13,8 @@ vencord-input: final: prev: { idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix {}; vencord = prev.vencord.overrideAttrs (old: rec { - src = vencord-input; + version = "${old.version}+git.${inputs.vencord.shortRev}"; + src = inputs.vencord; env = old.env @@ -38,4 +39,11 @@ vencord-input: 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 4358cf5..c024b5c 100644 --- a/flake.lock +++ b/flake.lock @@ -202,6 +202,22 @@ "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": [ @@ -323,6 +339,7 @@ "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 e926fa1..8bdd202 100644 --- a/flake.nix +++ b/flake.nix @@ -127,10 +127,15 @@ inputs.flake-parts.follows = "flake-parts"; }; - # ==== vencord ==== + # ==== non-nix inputs ==== 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 b4bec2e..ae70371 100644 --- a/programs/fish.nix +++ b/programs/fish.nix @@ -1,18 +1,19 @@ -{ - pkgs, - lib, - ... -}: { +{pkgs, ...}: { programs.fish.enable = true; - environment.systemPackages = with pkgs; [nix-your-shell]; + environment.systemPackages = with pkgs; [ + fishPlugins.hydro + ]; hm.programs.fish = { enable = true; interactiveShellInit = '' - ${lib.getExe pkgs.starship} init fish | source - ${lib.getExe pkgs.nix-your-shell} fish | source + 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 ''; functions.fish_greeting = "";