Small updates to fish shell.
This commit is contained in:
parent
f798534138
commit
a70a96d153
|
|
@ -188,52 +188,18 @@ function extract
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# ==============================================================================
|
set -l user_color (set_color green)
|
||||||
# PROMPT CONFIGURATION
|
set -l host_color (set_color blue)
|
||||||
# ==============================================================================
|
set -l path_color (set_color cyan)
|
||||||
|
|
||||||
function fish_prompt
|
|
||||||
set -l last_status $status
|
|
||||||
set -l user_color (set_color green)
|
|
||||||
set -l host_color (set_color blue)
|
|
||||||
set -l path_color (set_color cyan)
|
|
||||||
set -l prompt_symbol "❯"
|
|
||||||
|
|
||||||
# Root user adjustments
|
|
||||||
if contains $USER root
|
|
||||||
set user_color (set_color red --bold)
|
|
||||||
set prompt_symbol "#"
|
|
||||||
end
|
|
||||||
|
|
||||||
# SSH adjustments
|
|
||||||
if set -q SSH_CONNECTION
|
|
||||||
set host_color (set_color magenta)
|
|
||||||
end
|
|
||||||
|
|
||||||
set -l real_path (string replace -r "^$HOME" '~' $PWD)
|
|
||||||
|
|
||||||
# Print prompt: User@Host Path
|
|
||||||
printf '%s%s%s@%s%s %s%s%s' \
|
|
||||||
(set_color --bold) $user_color $USER $host_color (prompt_hostname) \
|
|
||||||
$path_color $real_path (set_color normal)
|
|
||||||
|
|
||||||
# Git integration (Fish built-in)
|
|
||||||
printf '%s' (fish_git_prompt)
|
|
||||||
|
|
||||||
# Exit code
|
|
||||||
if test $last_status -ne 0
|
|
||||||
printf ' %s✗%s ' (set_color red) $last_status
|
|
||||||
end
|
|
||||||
|
|
||||||
# New line and symbol
|
|
||||||
echo
|
|
||||||
printf '%s%s%s ' (set_color blue) $prompt_symbol (set_color normal)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Fish's built-in git prompt configuration
|
# Fish's built-in git prompt configuration
|
||||||
|
set -eg ___fish_git_prompt_char_stateseparator
|
||||||
set -g __fish_git_prompt_show_informative_status 1
|
set -g __fish_git_prompt_show_informative_status 1
|
||||||
set -g __fish_git_prompt_color_branch magenta --bold
|
set -g __fish_git_prompt_color_branch magenta --bold
|
||||||
set -g __fish_git_prompt_color_stagedstate yellow
|
set -g __fish_git_prompt_color_stagedstate yellow
|
||||||
set -g __fish_git_prompt_color_invalidstate red
|
set -g __fish_git_prompt_color_invalidstate red
|
||||||
set -g __fish_git_prompt_color_cleanstate green --bold
|
set -g __fish_git_prompt_color_cleanstate green --bold
|
||||||
|
set -g __fish_git_prompt_separator ' '
|
||||||
|
set -g __fish_git_prompt_char_dirtystate '+'
|
||||||
|
set -g __fish_git_prompt_char_stagedstate '●'
|
||||||
|
set -g __fish_git_prompt_char_untrackedfiles ''
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,8 @@ vim.opt.laststatus = 0
|
||||||
-- [[ PLUGINS ]]
|
-- [[ PLUGINS ]]
|
||||||
---------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------
|
||||||
vim.pack.add({
|
vim.pack.add({
|
||||||
|
{ src = "https://github.com/rktjmp/lush.nvim" },
|
||||||
|
{ src = "https://github.com/CosecSecCot/cosec-twilight.nvim" },
|
||||||
{ src = "https://github.com/rebelot/kanagawa.nvim" },
|
{ src = "https://github.com/rebelot/kanagawa.nvim" },
|
||||||
{ src = "https://github.com/neovim/nvim-lspconfig" },
|
{ src = "https://github.com/neovim/nvim-lspconfig" },
|
||||||
{ src = "https://github.com/nvim-mini/mini.nvim" },
|
{ src = "https://github.com/nvim-mini/mini.nvim" },
|
||||||
|
|
@ -51,7 +53,7 @@ require("mini.pick").setup()
|
||||||
require("mini.pairs").setup()
|
require("mini.pairs").setup()
|
||||||
require("mini.surround").setup()
|
require("mini.surround").setup()
|
||||||
require('gdscript-extended-lsp').setup()
|
require('gdscript-extended-lsp').setup()
|
||||||
require('kanagawa').setup({ undercurl = false })
|
require('kanagawa').setup({ undercurl = false, transparent = true })
|
||||||
require("oil").setup({ view_options = { show_hidden = true, } })
|
require("oil").setup({ view_options = { show_hidden = true, } })
|
||||||
require("toggleterm").setup({ open_mapping = [[<c-\>]], direction = "float" })
|
require("toggleterm").setup({ open_mapping = [[<c-\>]], direction = "float" })
|
||||||
require('nvim-treesitter.configs').setup({ highlight = { enable = true, } })
|
require('nvim-treesitter.configs').setup({ highlight = { enable = true, } })
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue