mirror of
https://github.com/jbowdre/dotfiles.git
synced 2024-12-18 10:52:18 +00:00
fish: split into multiple files
This commit is contained in:
parent
3984715c78
commit
a35ddc1378
SSH key fingerprint:
SHA256:cZYnOxaLdo+MhBNMX38ihO/p2Kek6fBykSFoJwHBhUo
7 changed files with 192 additions and 182 deletions
|
|
@ -4,7 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
./eza.nix
|
./eza.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./fish.nix
|
./fish
|
||||||
./nix-index.nix
|
./nix-index.nix
|
||||||
./neovim
|
./neovim
|
||||||
./tmux.nix
|
./tmux.nix
|
||||||
|
|
|
||||||
|
|
@ -1,181 +0,0 @@
|
||||||
{ pkgs, lib, config, ... }:
|
|
||||||
{
|
|
||||||
programs.fish = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
shellAbbrs = rec {
|
|
||||||
ccat = "egrep -v '^\s*(#|\\$)'";
|
|
||||||
dnsplan = "dnscontrol preview";
|
|
||||||
dnspush = "dnscontrol push";
|
|
||||||
g = "git";
|
|
||||||
ga = "git add";
|
|
||||||
gc = "git commit -S"; # interactive commit
|
|
||||||
gcm = "git commit -S -m"; # quick commit
|
|
||||||
gg = "git graph";
|
|
||||||
gs = "git status";
|
|
||||||
jqless = "jq -C | less -r";
|
|
||||||
n = "nix";
|
|
||||||
sshpass = "ssh -o PubkeyAuthentication=no";
|
|
||||||
tf = "terraform";
|
|
||||||
tfyolo = "terraform apply -auto-approve";
|
|
||||||
v = "vim";
|
|
||||||
vi = "vim";
|
|
||||||
};
|
|
||||||
|
|
||||||
shellAliases = {
|
|
||||||
cat = "bat";
|
|
||||||
top = "btop";
|
|
||||||
};
|
|
||||||
|
|
||||||
functions = {
|
|
||||||
# cht.sh integration
|
|
||||||
cht = "curl cheat.sh/$argv";
|
|
||||||
# Disable greeting
|
|
||||||
fish_greeting = "";
|
|
||||||
fish_prompt = ''
|
|
||||||
set -l last_pipestatus $pipestatus
|
|
||||||
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
|
|
||||||
set -l normal (set_color normal)
|
|
||||||
set -q fish_color_status
|
|
||||||
or set -g fish_color_status red
|
|
||||||
|
|
||||||
# Color the prompt differently when we're root
|
|
||||||
set -l color_cwd $fish_color_cwd
|
|
||||||
set -l suffix '>'
|
|
||||||
if functions -q fish_is_root_user; and fish_is_root_user
|
|
||||||
if set -q fish_color_cwd_root
|
|
||||||
set color_cwd $fish_color_cwd_root
|
|
||||||
end
|
|
||||||
set suffix '#'
|
|
||||||
end
|
|
||||||
|
|
||||||
# Write pipestatus
|
|
||||||
# If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
|
|
||||||
set -l bold_flag --bold
|
|
||||||
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
|
|
||||||
if test $__fish_prompt_status_generation = $status_generation
|
|
||||||
set bold_flag
|
|
||||||
end
|
|
||||||
set __fish_prompt_status_generation $status_generation
|
|
||||||
set -l status_color (set_color $fish_color_status)
|
|
||||||
set -l statusb_color (set_color $bold_flag $fish_color_status)
|
|
||||||
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
|
|
||||||
|
|
||||||
echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal " "$nix_shell_info $prompt_status $suffix " "
|
|
||||||
'';
|
|
||||||
fish_right_prompt = ''
|
|
||||||
set -l normal (set_color normal)
|
|
||||||
# vcs
|
|
||||||
set -g __fish_git_prompt_showdirtystate 1
|
|
||||||
set -g __fish_git_prompt_showuntrackedfiles 1
|
|
||||||
set -g __fish_git_prompt_showstashstate 1
|
|
||||||
set -g __fish_git_prompt_showupstream informative
|
|
||||||
set -g __fish_git_prompt_showcolorhints 1
|
|
||||||
set -g __fish_git_prompt_use_informative_chars 1
|
|
||||||
string match -qi "*.utf-8" -- $LANG $LC_CTYPE $LC_ALL
|
|
||||||
and set -g __fish_git_prompt_char_dirtystate \U1F4a9
|
|
||||||
set -g __fish_git_prompt_char_untrackedfiles "?"
|
|
||||||
set -l vcs (fish_vcs_prompt '(%s)' 2>/dev/null)
|
|
||||||
|
|
||||||
# timestamp
|
|
||||||
set -l d (set_color brgrey)(date "+%R")$normal
|
|
||||||
|
|
||||||
# execution duration
|
|
||||||
set -l duration "$cmd_duration$CMD_DURATION"
|
|
||||||
if test $duration -gt 100
|
|
||||||
set duration (math $duration / 1000)s
|
|
||||||
else
|
|
||||||
set duration
|
|
||||||
end
|
|
||||||
|
|
||||||
# virtual env
|
|
||||||
set -q VIRTUAL_ENV_DISABLE_PROMPT
|
|
||||||
or set -g VIRTUAL_ENV_DISABLE_PROMPT true
|
|
||||||
set -q VIRTUAL_ENV
|
|
||||||
and set -l venv (string replace -r '.*/' "" -- "$VIRTUAL_ENV")
|
|
||||||
|
|
||||||
# nix-shell
|
|
||||||
set -l nix (
|
|
||||||
if test -n "$IN_NIX_SHELL"
|
|
||||||
echo -n "[nix]"
|
|
||||||
end
|
|
||||||
)
|
|
||||||
|
|
||||||
string join " " -- $duration $venv $nix $vcs $d
|
|
||||||
'';
|
|
||||||
get-local-ip = "ip addr show $(ip route | grep default | awk '{print $5}') | grep 'inet ' | awk '{print $2}' | cut -d/ -f1";
|
|
||||||
|
|
||||||
ssh = "TERM=xterm command ssh $argv";
|
|
||||||
# Rebuild home-manager
|
|
||||||
switch-home = "home-manager switch -b backup --flake ${config.home.homeDirectory}/.dotfiles#$USER@$(hostname -s)";
|
|
||||||
switch-nix = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.dotfiles";
|
|
||||||
upgrade-nix = "nix-channel --update; nix-env --install --attr nixpkgs.nix nixpkgs.cacert";
|
|
||||||
|
|
||||||
# Trees
|
|
||||||
tt = "cbonsai -S -t 0.25 -c \"&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮\"";
|
|
||||||
};
|
|
||||||
|
|
||||||
interactiveShellInit =
|
|
||||||
# Launch tmux
|
|
||||||
''
|
|
||||||
if not set -q TMUX
|
|
||||||
tmux attach-session -t $(hostname -s) || tmux new-session -s $(hostname -s) -c $HOME
|
|
||||||
end
|
|
||||||
'' +
|
|
||||||
# Open command buffer in vim when alt+e is pressed
|
|
||||||
''
|
|
||||||
bind \ee edit_command_buffer
|
|
||||||
'' +
|
|
||||||
# Use vim bindings and cursors
|
|
||||||
''
|
|
||||||
fish_vi_key_bindings
|
|
||||||
set fish_cursor_default block
|
|
||||||
set fish_cursor_insert block blink
|
|
||||||
set fish_cursor_replace_one underscore blink
|
|
||||||
set fish_cursor_visual block
|
|
||||||
'' +
|
|
||||||
# Restore ctrl+f to accept suggestions
|
|
||||||
''
|
|
||||||
bind -M insert \cf forward-char
|
|
||||||
bind -M default \cf forward-char
|
|
||||||
bind -M visual \cf forward-char
|
|
||||||
'' +
|
|
||||||
# Use terminal colors
|
|
||||||
''
|
|
||||||
set -U fish_color_autosuggestion brblack
|
|
||||||
set -U fish_color_cancel -r
|
|
||||||
set -U fish_color_command brgreen
|
|
||||||
set -U fish_color_comment brmagenta
|
|
||||||
set -U fish_color_cwd green
|
|
||||||
set -U fish_color_cwd_root red
|
|
||||||
set -U fish_color_end brmagenta
|
|
||||||
set -U fish_color_error brred
|
|
||||||
set -U fish_color_escape brcyan
|
|
||||||
set -U fish_color_history_current --bold
|
|
||||||
set -U fish_color_host normal
|
|
||||||
set -U fish_color_match --background=brblue
|
|
||||||
set -U fish_color_normal normal
|
|
||||||
set -U fish_color_operator cyan
|
|
||||||
set -U fish_color_param brblue
|
|
||||||
set -U fish_color_quote yellow
|
|
||||||
set -U fish_color_redirection bryellow
|
|
||||||
set -U fish_color_search_match 'bryellow' '--background=brblack'
|
|
||||||
set -U fish_color_selection 'white' '--bold' '--background=brblack'
|
|
||||||
set -U fish_color_status red
|
|
||||||
set -U fish_color_user brgreen
|
|
||||||
set -U fish_color_valid_path --underline
|
|
||||||
set -U fish_pager_color_completion normal
|
|
||||||
set -U fish_pager_color_description yellow
|
|
||||||
set -U fish_pager_color_prefix 'white' '--bold' '--underline'
|
|
||||||
set -U fish_pager_color_progress 'brwhite' '--background=cyan'
|
|
||||||
'' +
|
|
||||||
# load cht.sh completions
|
|
||||||
''
|
|
||||||
complete -c cht -xa '(curl -s cheat.sh/:list)'
|
|
||||||
'' +
|
|
||||||
# print a happy tree
|
|
||||||
''
|
|
||||||
cbonsai -p -m "$(fortune -s -n 300)" -c "&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
20
home/modules/tui/fish/abbrs.nix
Normal file
20
home/modules/tui/fish/abbrs.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
programs.fish.shellAbbrs = rec {
|
||||||
|
ccat = "egrep -v '^\s*(#|\\$)'";
|
||||||
|
dnsplan = "dnscontrol preview";
|
||||||
|
dnspush = "dnscontrol push";
|
||||||
|
g = "git";
|
||||||
|
ga = "git add";
|
||||||
|
gc = "git commit -S"; # interactive commit
|
||||||
|
gcm = "git commit -S -m"; # quick commit
|
||||||
|
gg = "git graph";
|
||||||
|
gs = "git status";
|
||||||
|
jqless = "jq -C | less -r";
|
||||||
|
n = "nix";
|
||||||
|
sshpass = "ssh -o PubkeyAuthentication=no";
|
||||||
|
tf = "terraform";
|
||||||
|
tfyolo = "terraform apply -auto-approve";
|
||||||
|
v = "vim";
|
||||||
|
vi = "vim";
|
||||||
|
};
|
||||||
|
}
|
||||||
6
home/modules/tui/fish/aliases.nix
Normal file
6
home/modules/tui/fish/aliases.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
programs.fish.shellAliases = {
|
||||||
|
cat = "bat";
|
||||||
|
top = "btop";
|
||||||
|
};
|
||||||
|
}
|
||||||
12
home/modules/tui/fish/default.nix
Normal file
12
home/modules/tui/fish/default.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./abbrs.nix
|
||||||
|
./aliases.nix
|
||||||
|
./functions.nix
|
||||||
|
./shell-init.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.fish = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
89
home/modules/tui/fish/functions.nix
Normal file
89
home/modules/tui/fish/functions.nix
Normal file
|
|
@ -0,0 +1,89 @@
|
||||||
|
{ config, ... }: {
|
||||||
|
programs.fish.functions = {
|
||||||
|
# cht.sh integration
|
||||||
|
cht = "curl cheat.sh/$argv";
|
||||||
|
# Disable greeting
|
||||||
|
fish_greeting = "";
|
||||||
|
fish_prompt = ''
|
||||||
|
set -l last_pipestatus $pipestatus
|
||||||
|
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
|
||||||
|
set -l normal (set_color normal)
|
||||||
|
set -q fish_color_status
|
||||||
|
or set -g fish_color_status red
|
||||||
|
|
||||||
|
# Color the prompt differently when we're root
|
||||||
|
set -l color_cwd $fish_color_cwd
|
||||||
|
set -l suffix '>'
|
||||||
|
if functions -q fish_is_root_user; and fish_is_root_user
|
||||||
|
if set -q fish_color_cwd_root
|
||||||
|
set color_cwd $fish_color_cwd_root
|
||||||
|
end
|
||||||
|
set suffix '#'
|
||||||
|
end
|
||||||
|
|
||||||
|
# Write pipestatus
|
||||||
|
# If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
|
||||||
|
set -l bold_flag --bold
|
||||||
|
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
|
||||||
|
if test $__fish_prompt_status_generation = $status_generation
|
||||||
|
set bold_flag
|
||||||
|
end
|
||||||
|
set __fish_prompt_status_generation $status_generation
|
||||||
|
set -l status_color (set_color $fish_color_status)
|
||||||
|
set -l statusb_color (set_color $bold_flag $fish_color_status)
|
||||||
|
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
|
||||||
|
|
||||||
|
echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal " "$nix_shell_info $prompt_status $suffix " "
|
||||||
|
'';
|
||||||
|
fish_right_prompt = ''
|
||||||
|
set -l normal (set_color normal)
|
||||||
|
# vcs
|
||||||
|
set -g __fish_git_prompt_showdirtystate 1
|
||||||
|
set -g __fish_git_prompt_showuntrackedfiles 1
|
||||||
|
set -g __fish_git_prompt_showstashstate 1
|
||||||
|
set -g __fish_git_prompt_showupstream informative
|
||||||
|
set -g __fish_git_prompt_showcolorhints 1
|
||||||
|
set -g __fish_git_prompt_use_informative_chars 1
|
||||||
|
string match -qi "*.utf-8" -- $LANG $LC_CTYPE $LC_ALL
|
||||||
|
and set -g __fish_git_prompt_char_dirtystate \U1F4a9
|
||||||
|
set -g __fish_git_prompt_char_untrackedfiles "?"
|
||||||
|
set -l vcs (fish_vcs_prompt '(%s)' 2>/dev/null)
|
||||||
|
|
||||||
|
# timestamp
|
||||||
|
set -l d (set_color brgrey)(date "+%R")$normal
|
||||||
|
|
||||||
|
# execution duration
|
||||||
|
set -l duration "$cmd_duration$CMD_DURATION"
|
||||||
|
if test $duration -gt 100
|
||||||
|
set duration (math $duration / 1000)s
|
||||||
|
else
|
||||||
|
set duration
|
||||||
|
end
|
||||||
|
|
||||||
|
# virtual env
|
||||||
|
set -q VIRTUAL_ENV_DISABLE_PROMPT
|
||||||
|
or set -g VIRTUAL_ENV_DISABLE_PROMPT true
|
||||||
|
set -q VIRTUAL_ENV
|
||||||
|
and set -l venv (string replace -r '.*/' "" -- "$VIRTUAL_ENV")
|
||||||
|
|
||||||
|
# nix-shell
|
||||||
|
set -l nix (
|
||||||
|
if test -n "$IN_NIX_SHELL"
|
||||||
|
echo -n "[nix]"
|
||||||
|
end
|
||||||
|
)
|
||||||
|
|
||||||
|
string join " " -- $duration $venv $nix $vcs $d
|
||||||
|
'';
|
||||||
|
get-local-ip = "ip addr show $(ip route | grep default | awk '{print $5}') | grep 'inet ' | awk '{print $2}' | cut -d/ -f1";
|
||||||
|
|
||||||
|
ssh = "TERM=xterm command ssh $argv";
|
||||||
|
# Rebuild home-manager
|
||||||
|
switch-home = "home-manager switch -b backup --flake ${config.home.homeDirectory}/.dotfiles#$USER@$(hostname -s)";
|
||||||
|
switch-nix = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.dotfiles";
|
||||||
|
upgrade-nix = "nix-channel --update; nix-env --install --attr nixpkgs.nix nixpkgs.cacert";
|
||||||
|
|
||||||
|
# Trees
|
||||||
|
tt = "cbonsai -S -t 0.25 -c \"&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮\"";
|
||||||
|
};
|
||||||
|
}
|
||||||
64
home/modules/tui/fish/shell-init.nix
Normal file
64
home/modules/tui/fish/shell-init.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
programs.fish.interactiveShellInit =
|
||||||
|
# Launch tmux
|
||||||
|
''
|
||||||
|
if not set -q TMUX
|
||||||
|
tmux attach-session -t $(hostname -s) || tmux new-session -s $(hostname -s) -c $HOME
|
||||||
|
end
|
||||||
|
'' +
|
||||||
|
# Open command buffer in vim when alt+e is pressed
|
||||||
|
''
|
||||||
|
bind \ee edit_command_buffer
|
||||||
|
'' +
|
||||||
|
# Use vim bindings and cursors
|
||||||
|
''
|
||||||
|
fish_vi_key_bindings
|
||||||
|
set fish_cursor_default block
|
||||||
|
set fish_cursor_insert block blink
|
||||||
|
set fish_cursor_replace_one underscore blink
|
||||||
|
set fish_cursor_visual block
|
||||||
|
'' +
|
||||||
|
# Restore ctrl+f to accept suggestions
|
||||||
|
''
|
||||||
|
bind -M insert \cf forward-char
|
||||||
|
bind -M default \cf forward-char
|
||||||
|
bind -M visual \cf forward-char
|
||||||
|
'' +
|
||||||
|
# Use terminal colors
|
||||||
|
''
|
||||||
|
set -U fish_color_autosuggestion brblack
|
||||||
|
set -U fish_color_cancel -r
|
||||||
|
set -U fish_color_command brgreen
|
||||||
|
set -U fish_color_comment brmagenta
|
||||||
|
set -U fish_color_cwd green
|
||||||
|
set -U fish_color_cwd_root red
|
||||||
|
set -U fish_color_end brmagenta
|
||||||
|
set -U fish_color_error brred
|
||||||
|
set -U fish_color_escape brcyan
|
||||||
|
set -U fish_color_history_current --bold
|
||||||
|
set -U fish_color_host normal
|
||||||
|
set -U fish_color_match --background=brblue
|
||||||
|
set -U fish_color_normal normal
|
||||||
|
set -U fish_color_operator cyan
|
||||||
|
set -U fish_color_param brblue
|
||||||
|
set -U fish_color_quote yellow
|
||||||
|
set -U fish_color_redirection bryellow
|
||||||
|
set -U fish_color_search_match 'bryellow' '--background=brblack'
|
||||||
|
set -U fish_color_selection 'white' '--bold' '--background=brblack'
|
||||||
|
set -U fish_color_status red
|
||||||
|
set -U fish_color_user brgreen
|
||||||
|
set -U fish_color_valid_path --underline
|
||||||
|
set -U fish_pager_color_completion normal
|
||||||
|
set -U fish_pager_color_description yellow
|
||||||
|
set -U fish_pager_color_prefix 'white' '--bold' '--underline'
|
||||||
|
set -U fish_pager_color_progress 'brwhite' '--background=cyan'
|
||||||
|
'' +
|
||||||
|
# load cht.sh completions
|
||||||
|
''
|
||||||
|
complete -c cht -xa '(curl -s cheat.sh/:list)'
|
||||||
|
'' +
|
||||||
|
# print a happy tree
|
||||||
|
''
|
||||||
|
cbonsai -p -m "$(fortune -s -n 300)" -c "&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,&,🌸,🌺,💮"
|
||||||
|
'';
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue