diff --git a/.config/fish/conf.d/fish_frozen_theme.fish b/.config/fish/conf.d/fish_frozen_theme.fish deleted file mode 100644 index 6132304..0000000 --- a/.config/fish/conf.d/fish_frozen_theme.fish +++ /dev/null @@ -1,33 +0,0 @@ -# Don't edit this file, as it will be written by the web-config tool (`fish_config`). -# To customize your theme, delete this file and see -# help interactive#syntax-highlighting -# or -# man fish-interactive | less +/^SYNTAX.HIGHLIGHTING -# for appropriate commands to add to ~/.config/fish/config.fish instead. - -set --global fish_color_autosuggestion 949494 -set --global fish_color_cancel --reverse -set --global fish_color_command normal -set --global fish_color_comment red -set --global fish_color_cwd green -set --global fish_color_cwd_root red -set --global fish_color_end green -set --global fish_color_error brred -set --global fish_color_escape brcyan -set --global fish_color_history_current --bold -set --global fish_color_host normal -set --global fish_color_host_remote yellow -set --global fish_color_normal normal -set --global fish_color_operator brcyan -set --global fish_color_param cyan -set --global fish_color_quote yellow -set --global fish_color_redirection cyan --bold -set --global fish_color_search_match white --bold --background=brblack -set --global fish_color_selection white --bold --background=brblack -set --global fish_color_status red -set --global fish_color_user brgreen -set --global fish_color_valid_path --underline=single -set --global fish_pager_color_description yellow --italics -set --global fish_pager_color_prefix normal --bold --underline=single -set --global fish_pager_color_progress brwhite --bold --background=cyan -set --global fish_pager_color_selected_background --reverse diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 23c39d1..f95fee0 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,15 +1,5 @@ -function fish_greeting - oh-my-posh init fish --config ~/agnosterplus.omp.json | source - fastfetch - echo -e "\e[34m \e[39m""$(hyprctl splash)" -end -# -# -# -# -# if status is-interactive + fastfetch alias ls lsd alias vim nvim - alias hibernate 'systemctl hibernate' end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index f68bd3c..ad10b9b 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,5 +1,3 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:4300 -SETUVAR __fish_webconfig_theme_notification:set\x2dtheme\x2dv1\x2d\x2310 -SETUVAR fish_greeting:\x1d diff --git a/.config/fish/functions/fish_prompt.1771447769.copy b/.config/fish/functions/fish_prompt.1771447769.copy deleted file mode 100644 index 4400d95..0000000 --- a/.config/fish/functions/fish_prompt.1771447769.copy +++ /dev/null @@ -1,136 +0,0 @@ -function fish_prompt - # This prompt shows: - # - green lines if the last return command is OK, red otherwise - # - your user name, in red if root or yellow otherwise - # - your hostname, in cyan if ssh or blue otherwise - # - the current path (with prompt_pwd) - # - date +%X - # - the current virtual environment, if any - # - the current git status, if any, with fish_git_prompt - # - the current battery state, if any, and if your power cable is unplugged, and if you have "acpi" - # - current background jobs, if any - - # It goes from: - # ┬─[nim@Hattori:~]─[11:39:00] - # ╰─>$ echo here - - # To: - # ┬─[nim@Hattori:~/w/dashboard]─[11:37:14]─[V:django20]─[G:master↑1|●1✚1…1]─[B:85%, 05:41:42 remaining] - # │ 2 15054 0% arrêtée sleep 100000 - # │ 1 15048 0% arrêtée sleep 100000 - # ╰─>$ echo there - - set -l retc red - test $status = 0; and set retc green - - set -q __fish_git_prompt_showupstream - or set -g __fish_git_prompt_showupstream auto - - function _nim_prompt_wrapper - set retc $argv[1] - set -l field_name $argv[2] - set -l field_value $argv[3] - - set_color normal - set_color $retc - echo -n '─' - set_color -o green - echo -n '[' - set_color normal - test -n $field_name - and echo -n $field_name: - set_color $retc - echo -n $field_value - set_color -o green - echo -n ']' - end - - set_color $retc - echo -n '┬─' - set_color -o green - echo -n [ - - if functions -q fish_is_root_user; and fish_is_root_user - set_color -o red - else - set_color -o yellow - end - - echo -n $USER - set_color -o white - echo -n @ - - if test -z "$SSH_CLIENT" - set_color -o blue - else - set_color -o cyan - end - - echo -n (prompt_hostname) - set_color -o white - echo -n :(prompt_pwd) - set_color -o green - echo -n ']' - - # Date - _nim_prompt_wrapper $retc '' (date +%X) - - # Vi-mode - - if test "$fish_key_bindings" = fish_vi_key_bindings - or test "$fish_key_bindings" = fish_hybrid_key_bindings - set -l mode - switch $fish_bind_mode - case default - set mode (set_color --bold red)N - case operator - set mode (set_color --bold cyan)N - case insert - set mode (set_color --bold green)I - case replace_one - set mode (set_color --bold green)R - case replace - set mode (set_color --bold cyan)R - case visual - set mode (set_color --bold magenta)V - end - set mode $mode(set_color normal) - _nim_prompt_wrapper $retc '' $mode - end - - # Virtual Environment - set -q VIRTUAL_ENV_DISABLE_PROMPT - or set -g VIRTUAL_ENV_DISABLE_PROMPT true - set -q VIRTUAL_ENV - and _nim_prompt_wrapper $retc V (path basename "$VIRTUAL_ENV") - - # git - set -l prompt_git (fish_git_prompt '%s') - test -n "$prompt_git" - and _nim_prompt_wrapper $retc G $prompt_git - - # Battery status - type -q acpi - and acpi -a 2>/dev/null | string match -rq off - and _nim_prompt_wrapper $retc B (acpi -b | cut -d' ' -f 4-) - - # New line - echo - - # Background jobs - set_color normal - - for job in (jobs) - set_color $retc - echo -n '│ ' - set_color brown - echo $job - end - - set_color normal - set_color $retc - echo -n '╰─>' - set_color -o red - echo -n '$ ' - set_color normal -end diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish deleted file mode 100644 index 96e8497..0000000 --- a/.config/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,29 +0,0 @@ -function fish_prompt --description 'Write out the prompt' - set -l last_pipestatus $pipestatus - set -lx __fish_last_status $status # Export for __fish_print_pipestatus. - set -l normal (set_color normal) - - # 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 (fish_vcs_prompt) $normal " "$prompt_status $suffix " " -end