diff --git a/modules/programs/cli/fish.nix b/modules/programs/cli/fish.nix index 7472053..cb1f042 100644 --- a/modules/programs/cli/fish.nix +++ b/modules/programs/cli/fish.nix @@ -20,6 +20,7 @@ in { config = mkIf cfg.enable { programs.fish.enable = true; + # homix.".config/fish/config.fish".source = fishinit; # users.users.${username}.shell = pkgs.fish; environment = { diff --git a/modules/shell/module2.nix b/modules/shell/module2.nix index ee7f2ad..844f2d7 100644 --- a/modules/shell/module2.nix +++ b/modules/shell/module2.nix @@ -9,10 +9,10 @@ aliasesStr = pkgs.lib.concatStringsSep "\n" (pkgs.lib.mapAttrsToList (k: v: "alias ${k}=\"${v}\"") aliases); - + packages = import ./packages.nix pkgs; in (pkgs.symlinkJoin { name = "fish-wrapped"; - paths = [pkgs.fish pkgs.starship pkgs.fzf]; + paths = [pkgs.fish] ++ packages; buildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ diff --git a/modules/shell/packages.nix b/modules/shell/packages.nix index c148f0f..81e3879 100644 --- a/modules/shell/packages.nix +++ b/modules/shell/packages.nix @@ -1,4 +1,4 @@ -{pkgs}: (with pkgs; [ +pkgs: (with pkgs; [ # better cd zoxide #better ls