feat(fish): replace starship with hydro

This commit is contained in:
uku 2024-11-23 11:14:09 +01:00
parent 109785aadd
commit e7fa72e2c5
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
5 changed files with 45 additions and 13 deletions

View file

@ -8,6 +8,7 @@
agenix, agenix,
home-manager, home-manager,
vencord, vencord,
hydro,
... ...
}: let }: let
username = "leo"; username = "leo";
@ -29,7 +30,7 @@ in {
../programs/fish.nix ../programs/fish.nix
../programs/git.nix ../programs/git.nix
../programs/starship # ../programs/starship
]; ];
age = { age = {
@ -135,7 +136,7 @@ in {
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
flake.setNixPath = false; flake.setNixPath = false;
overlays = [(import ../exprs/overlay.nix vencord)]; overlays = [(import ../exprs/overlay.nix {inherit vencord hydro;})];
}; };
programs = { programs = {

View file

@ -1,4 +1,4 @@
vencord-input: final: prev: { inputs: final: prev: {
svn2git = prev.svn2git.overrideAttrs (_: rec { svn2git = prev.svn2git.overrideAttrs (_: rec {
version = "2.4.2"; version = "2.4.2";
@ -13,7 +13,8 @@ vencord-input: final: prev: {
idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix {}; idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix {};
vencord = prev.vencord.overrideAttrs (old: rec { vencord = prev.vencord.overrideAttrs (old: rec {
src = vencord-input; version = "${old.version}+git.${inputs.vencord.shortRev}";
src = inputs.vencord;
env = env =
old.env old.env
@ -38,4 +39,11 @@ vencord-input: final: prev: {
cp -r ${ventex} src/plugins/ventex 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;
});
});
} }

17
flake.lock generated
View file

@ -202,6 +202,22 @@
"type": "github" "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": { "lanzaboote": {
"inputs": { "inputs": {
"crane": [ "crane": [
@ -323,6 +339,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ghostty": "ghostty", "ghostty": "ghostty",
"home-manager": "home-manager", "home-manager": "home-manager",
"hydro": "hydro",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"mystia": "mystia", "mystia": "mystia",
"nixinate": "nixinate", "nixinate": "nixinate",

View file

@ -127,10 +127,15 @@
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
}; };
# ==== vencord ==== # ==== non-nix inputs ====
vencord = { vencord = {
url = "github:Vendicated/Vencord"; url = "github:Vendicated/Vencord";
flake = false; flake = false;
}; };
hydro = {
url = "github:jorgebucaran/hydro";
flake = false;
};
}; };
} }

View file

@ -1,18 +1,19 @@
{ {pkgs, ...}: {
pkgs,
lib,
...
}: {
programs.fish.enable = true; programs.fish.enable = true;
environment.systemPackages = with pkgs; [nix-your-shell]; environment.systemPackages = with pkgs; [
fishPlugins.hydro
];
hm.programs.fish = { hm.programs.fish = {
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
${lib.getExe pkgs.starship} init fish | source set --global hydro_symbol_git_dirty "*"
${lib.getExe pkgs.nix-your-shell} fish | source 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 = ""; functions.fish_greeting = "";