diff --git a/config/alacritty/alacritty.yml b/config/alacritty/alacritty.yml index f0423d4..4fb5d11 100644 --- a/config/alacritty/alacritty.yml +++ b/config/alacritty/alacritty.yml @@ -12,7 +12,7 @@ # - /path/to/alacritty.yml shell: - program: /bin/fish + program: /usr/bin/fish env: TERM: xterm-256color diff --git a/config/fish/config.fish b/config/fish/config.fish index 07ad222..2cfad03 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -1,35 +1,15 @@ # fish config -set -x -U GOPATH $HOME/.go -set PATH $PATH $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin -## Variables -set DOTFILES $HOME/.dotfiles -set NOTES $HOME/Documents/Sync/Notes/MyVault -set TERMINAL 'alacritty' -set TERM 'xterm' -set -gx EDITOR 'nano' - -alias r='source ~/.config/fish/config.fish && echo "Fish config reloaded."' +## Paths +set -xU GOPATH $HOME/.go +set -xU PATH $PATH $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin +set -xU DOTFILES $HOME/.dotfiles +set -xU TERMINAL 'alacritty' +set -xU TERM 'xterm' +set -xU EDITOR 'hx' ## Environment setup -# Apply .profile: use this to put fish compatible .profile stuff in -if test -f ~/.fish_profile - source ~/.fish_profile -end - -if test -d $HOME/.asdf - source ~/.asdf/asdf.fish -end - -alias up="sudo apt update && sudo apt list --upgradable" -alias ug="sudo apt upgrade" - -# Hide welcome message -set fish_greeting -set VIRTUAL_ENV_DISABLE_PROMPT "1" -set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" - ## Functions function backup --argument filename @@ -38,30 +18,22 @@ end ## Useful aliases -# Reload fish config -alias r='clear && source ~/.config/fish/config.fish' - -# Nicer ls if nothing els is available -alias ls="ls" -alias ll="ls -lh" -alias la="ls -A" -alias lt="ls -ald .*" - -# Replace ls with exa -if test -e /usr/bin/exa - alias ls='exa -al --color=always --group-directories-first --icons' # preferred listing - alias la='exa -a --color=always --group-directories-first --icons' # all files and dirs - alias ll='exa -l --color=always --group-directories-first --icons' # long format - alias lt='exa -aT --color=always --group-directories-first --icons' # tree listing - alias l.='exa -ald --color=always --group-directories-first --icons .*' # show only dotfiles -end +alias r='source ~/.config/fish/config.fish && echo "Fish config reloaded."' +alias dot="$EDITOR $DOTFILES" # Add apt aliases for updating / upgrading if available -if test -e (whereis apt) +if test -e (which apt) alias up="sudo apt update && sudo apt list --upgradable" alias ug="sudo apt upgrade" end +# Replace ls with lsd if available +if test -e (which lsd) + alias ls="lsd" + alias la="lsd -a" + alias ll="lsd -l" +end + # Elixir / phoenix aliases alias phx="iex -S mix phx.server" @@ -80,12 +52,7 @@ alias sshkey='ssh-keygen -t ed25519 -f $HOME/.ssh/id_ed25519 -C "(whoami)@(hostn # Get the error messages from journalctl alias jctl="journalctl -p 3 -xb" -# Recent installed packages -alias rip="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -200 | nl" - -# Cleanup orphaned packages -alias cleanup='sudo pacman -Rns (pacman -Qtdq)' - +# Display a calender alias cal="ncal -3Mb" if status is-interactive @@ -96,8 +63,3 @@ end if test -e ~/.asdf/asdf.fish source ~/.asdf/asdf.fish end - -## Run fastfetch if session is interactive -if status --is-interactive && type -q fastfetch - fastfetch --load-config neofetch -end \ No newline at end of file diff --git a/config/fish/fish_plugins b/config/fish/fish_plugins index e8e7c17..1c951e0 100644 --- a/config/fish/fish_plugins +++ b/config/fish/fish_plugins @@ -1,5 +1,4 @@ jorgebucaran/fisher jethrokuan/z -franciscolourenco/done -jorgebucaran/hydro danhper/fish-ssh-agent +pure-fish/pure diff --git a/config/fish/fish_variables b/config/fish/fish_variables index f2ea8ed..d2f508b 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -1,5 +1,12 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR --export DOTFILES:/home/inhji/\x2edotfiles +SETUVAR --export EDITOR:hx +SETUVAR --export --path GOPATH:/home/inhji/\x2ego +SETUVAR --export --path PATH:/home/inhji/\x2ecargo/bin\x1e/home/inhji/\x2elocal/bin\x1e/usr/local/bin\x1e/usr/bin\x1e/bin\x1e/usr/local/games\x1e/usr/games\x1e/home/inhji/\x2elocal/bin\x1e/home/inhji/\x2emix\x1e/home/inhji/\x2emix/escripts\x1e/home/inhji/\x2ecargo/bin\x1e/home/inhji/\x2ego/bin\x1e/home/inhji/\x2elocal/bin\x1e/home/inhji/\x2emix\x1e/home/inhji/\x2emix/escripts\x1e/home/inhji/\x2ecargo/bin\x1e/home/inhji/\x2ego/bin +SETUVAR --export TERM:xterm +SETUVAR --export TERMINAL:alacritty +SETUVAR VIRTUAL_ENV_DISABLE_PROMPT:1 SETUVAR ZO_CMD:zo SETUVAR Z_CMD:z SETUVAR Z_DATA:/home/inhji/\x2elocal/share/z/data @@ -7,13 +14,12 @@ SETUVAR Z_DATA_DIR:/home/inhji/\x2elocal/share/z SETUVAR Z_EXCLUDE:\x5e/home/inhji\x24 SETUVAR __fish_initialized:3400 SETUVAR _fisher_danhper_2F_fish_2D_ssh_2D_agent_files:\x7e/\x2econfig/fish/functions/__ssh_agent_is_started\x2efish\x1e\x7e/\x2econfig/fish/functions/__ssh_agent_start\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2dssh\x2dagent\x2efish -SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish SETUVAR _fisher_jethrokuan_2F_z_files:\x7e/\x2econfig/fish/functions/__z\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_add\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_complete\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/z\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_jorgebucaran_2F_hydro_files:\x7e/\x2econfig/fish/functions/fish_mode_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_prompt\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/hydro\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1efranciscolourenco/done\x1ejorgebucaran/hydro\x1edanhper/fish\x2dssh\x2dagent +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1edanhper/fish\x2dssh\x2dagent\x1epure\x2dfish/pure +SETUVAR _fisher_pure_2D_fish_2F_pure_files:\x7e/\x2econfig/fish/functions/_pure_check_availability\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_check_for_new_release\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_detect_container_by_cgroup_method\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_detect_container_by_pid_method\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_format_time\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_get_prompt_symbol\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_is_inside_container\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_is_single_line_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_k8s_context\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_k8s_namespace\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_parse_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_parse_git_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_place_iterm2_prompt_mark\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prefix_root_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_print_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_print_prompt_rows\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_beginning\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_command_duration\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_container\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_current_folder\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_ending\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_first_line\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_git\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_git_branch\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_git_dirty\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_git_pending_commits\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_git_stash\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_jobs\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_k8s\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_new_line\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_ssh\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_symbol\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_system_time\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_vimode\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_prompt_virtualenv\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_set_color\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_set_default\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_string_width\x2efish\x1e\x7e/\x2econfig/fish/functions/_pure_user_at_host\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_greeting\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_mode_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_title\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/_pure_init\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/pure\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR _hydro_git_58137:main\u2022\x20 +SETUVAR _hydro_git_23288:main\u2022\x20 SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:blue @@ -31,7 +37,7 @@ SETUVAR fish_color_operator:brcyan SETUVAR fish_color_param:cyan SETUVAR fish_color_quote:yellow SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d111 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen @@ -39,6 +45,62 @@ SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_completion:normal SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr +SETUVAR pure_begin_prompt_with_current_directory:true +SETUVAR pure_check_for_new_release:false +SETUVAR pure_color_at_sign:pure_color_mute +SETUVAR pure_color_command_duration:pure_color_warning +SETUVAR pure_color_current_directory:pure_color_primary +SETUVAR pure_color_danger:red +SETUVAR pure_color_dark:black +SETUVAR pure_color_git_branch:pure_color_mute +SETUVAR pure_color_git_dirty:pure_color_mute +SETUVAR pure_color_git_stash:pure_color_info +SETUVAR pure_color_git_unpulled_commits:pure_color_info +SETUVAR pure_color_git_unpushed_commits:pure_color_info +SETUVAR pure_color_hostname:pure_color_mute +SETUVAR pure_color_info:cyan +SETUVAR pure_color_jobs:pure_color_normal +SETUVAR pure_color_k8s_context:pure_color_success +SETUVAR pure_color_k8s_namespace:pure_color_primary +SETUVAR pure_color_light:white +SETUVAR pure_color_mute:brblack +SETUVAR pure_color_normal:normal +SETUVAR pure_color_prefix_root_prompt:pure_color_danger +SETUVAR pure_color_primary:blue +SETUVAR pure_color_prompt_on_error:pure_color_danger +SETUVAR pure_color_prompt_on_success:pure_color_success +SETUVAR pure_color_success:magenta +SETUVAR pure_color_system_time:pure_color_mute +SETUVAR pure_color_username_normal:pure_color_mute +SETUVAR pure_color_username_root:pure_color_light +SETUVAR pure_color_virtualenv:pure_color_mute +SETUVAR pure_color_warning:yellow +SETUVAR pure_enable_container_detection:true +SETUVAR pure_enable_git:true +SETUVAR pure_enable_k8s:false +SETUVAR pure_enable_single_line_prompt:false +SETUVAR pure_enable_virtualenv:true +SETUVAR pure_reverse_prompt_symbol_in_vimode:true +SETUVAR pure_separate_prompt_on_error:false +SETUVAR pure_shorten_prompt_current_directory_length:0 +SETUVAR pure_shorten_window_title_current_directory_length:0 +SETUVAR pure_show_jobs:false +SETUVAR pure_show_prefix_root_prompt:false +SETUVAR pure_show_subsecond_command_duration:false +SETUVAR pure_show_system_time:false +SETUVAR pure_symbol_container_prefix: +SETUVAR pure_symbol_git_dirty:\x2a +SETUVAR pure_symbol_git_stash:\u2261 +SETUVAR pure_symbol_git_unpulled_commits:\u21e3 +SETUVAR pure_symbol_git_unpushed_commits:\u21e1 +SETUVAR pure_symbol_k8s_prefix:\u2638 +SETUVAR pure_symbol_prefix_root_prompt:\x23 +SETUVAR pure_symbol_prompt:\u276f +SETUVAR pure_symbol_reverse_prompt:\u276e +SETUVAR pure_symbol_ssh_prefix: +SETUVAR pure_symbol_title_bar_separator:\x2d +SETUVAR pure_symbol_virtualenv_prefix: +SETUVAR pure_threshold_command_duration:5