diff --git a/users/leah/programs/default.nix b/users/leah/programs/default.nix index 330bf7f..2b0381d 100644 --- a/users/leah/programs/default.nix +++ b/users/leah/programs/default.nix @@ -51,12 +51,11 @@ ]; rum.programs = { - direnv = { + direnv.enable = true; + starship = { enable = true; - integrations = { - fish.enable = true; - nix-direnv.enable = true; - }; + settings = builtins.fromTOML ./starship.toml; + transcience.enable = true; }; obs-studio.enable = true; }; diff --git a/users/leah/programs/fish.nix b/users/leah/programs/fish.nix index af374a4..e818903 100644 --- a/users/leah/programs/fish.nix +++ b/users/leah/programs/fish.nix @@ -9,6 +9,11 @@ programs.fish.enable = true; users.users.leah.shell = config.programs.fish.package; + hjem.users.leah.rum.programs = { + direnv.integrations.fish.enable = true; + starship.integrations.fish.enable = true; + }; + hjem.users.leah.rum.programs.fish = { enable = true; inherit (config.programs.fish) package; @@ -21,16 +26,10 @@ lla = "eza -la"; }; - earlyConfigFiles.starship = '' - ${lib.getExe pkgs.starship} init fish | source - ''; - config = '' function eza --wraps eza command eza --git --icons=auto $argv end ''; }; - - hjem.users.leah.xdg.config.files."starship.toml".source = ./starship.toml; }