Finally? got the right syntax

This commit is contained in:
RealStickman 2023-04-17 21:02:17 +02:00
parent 5ea52c158b
commit 23e3e2ef38

View File

@ -7,10 +7,12 @@ in
{ {
imports = [ imports = [
<home-manager/nixos> <home-manager/nixos>
<home-manager/modules/programs/fish.nix>
]; ];
# keep everything using home manager within this block
home-manager.users.${user} = { pkgs, ... }: { home-manager.users.${user} = { pkgs, ... }: {
home.username = "${user}";
home.homeDirectory = "/home/${user}";
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.packages = [ home.packages = [
pkgs.firefox # browser pkgs.firefox # browser
@ -28,43 +30,43 @@ in
pkgs.fwupd-efi # firmware updates additional EFI stuff pkgs.fwupd-efi # firmware updates additional EFI stuff
pkgs.fish # fish shell pkgs.fish # fish shell
]; ];
};
programs = { programs = {
fish = { fish = {
enable = true; enable = true;
shellAliases = { shellAliases = {
wget = "wget -c"; wget = "wget -c";
}; };
functions = { functions = {
fish_prompt = fish_prompt =
'' ''
# Defined in /home/marc/.config/fish/functions/fish_prompt.fish @ line 2 # Defined in /home/marc/.config/fish/functions/fish_prompt.fish @ line 2
# slightly modified from defaults # slightly modified from defaults
set -l last_pipestatus $pipestatus set -l last_pipestatus $pipestatus
set -lx __fish_last_status $status # Export for __fish_print_pipestatus. set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
set -l normal (set_color normal) set -l normal (set_color normal)
# Color the prompt differently when we're root # Color the prompt differently when we're root
set -l color_cwd $fish_color_cwd set -l color_cwd $fish_color_cwd
set -l suffix '>' set -l suffix '>'
# If we're running via SSH, change the host color. # If we're running via SSH, change the host color.
set -l color_host $fish_color_host set -l color_host $fish_color_host
# Write pipestatus # Write pipestatus
# If the status was carried over (e.g. after `set`), don't bold it. # If the status was carried over (e.g. after `set`), don't bold it.
set -l bold_flag --bold set -l bold_flag --bold
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
if test $__fish_prompt_status_generation = $status_generation if test $__fish_prompt_status_generation = $status_generation
set bold_flag set bold_flag
end end
set __fish_prompt_status_generation $status_generation set __fish_prompt_status_generation $status_generation
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" (set_color $fish_color_status) (set_color $bold_flag $fish_color_status) $last_pipestatus) set -l prompt_status (__fish_print_pipestatus "[" "]" "|" (set_color $fish_color_status) (set_color $bold_flag $fish_color_status) $last_pipestatus)
echo -n -s (set_color $fish_color_user) "$USER" $normal (set_color $fish_color_separator) @ $normal (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " " echo -n -s (set_color $fish_color_user) "$USER" $normal (set_color $fish_color_separator) @ $normal (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " "
end end
''; '';
};
}; };
}; };
}; };