Compare commits

...

4 Commits

5 changed files with 764 additions and 681 deletions

View File

@@ -34,5 +34,8 @@ x-have rbenv && {
eval "$(rbenv init - bash)" eval "$(rbenv init - bash)"
} }
eval "$(starship init bash)" # eval "$(starship init bash)"
x-have oh-my-posh && {
eval "$(oh-my-posh init bash --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
}
source "$DOTFILES/config/alias" source "$DOTFILES/config/alias"

View File

@@ -100,5 +100,7 @@ x-have rbenv && {
} }
# eval "$(starship init zsh)" # eval "$(starship init zsh)"
eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)" x-have oh-my-posh && {
eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
}
source "$DOTFILES/config/alias" source "$DOTFILES/config/alias"

View File

@@ -34,7 +34,7 @@
"type": "git", "type": "git",
"style": "plain", "style": "plain",
"foreground": "lightGreen", "foreground": "lightGreen",
"template": "{{ .UpstreamIcon }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }})", "template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}",
"properties": { "properties": {
"fetch_status": true, "fetch_status": true,
"fetch_upstream_icon": true, "fetch_upstream_icon": true,

View File

@@ -105,7 +105,7 @@ set-option -g window-status-format ' #I:#W '
set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7' set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7'
set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } ' set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
set-option -g status-left "#{?#{pane_ssh_connected},#{hostname_short}/,}#S" set-option -g status-left "#{hostname_short}/#S"
set-option -g status-right "%H:%M #{tmux_mode_indicator}" set-option -g status-right "%H:%M #{tmux_mode_indicator}"
# ╭──────────────────────────────────────────────────────────╮ # ╭──────────────────────────────────────────────────────────╮
@@ -120,12 +120,12 @@ set -g @suspend_key 'F12'
## A plugin to name your tmux windows smartly. ## A plugin to name your tmux windows smartly.
## https://github.com/ofirgall/tmux-window-name ## https://github.com/ofirgall/tmux-window-name
### Maximum name length of a window ### Maximum name length of a window
set -g @tmux_window_name_max_name_len "30" set -g @tmux_window_name_max_name_len "20"
### Replace $HOME with ~ in window names ### Replace $HOME with ~ in window names
set -g @tmux_window_name_use_tilde "True" set -g @tmux_window_name_use_tilde "True"
set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']" set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']" set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
set -g @tmux_window_name_ignored_programs "['sqlite3']" # Default is [] set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases']" # Default is []
## https://github.com/tmux-plugins/tmux-continuum ## https://github.com/tmux-plugins/tmux-continuum
set -g @continuum-restore 'on' set -g @continuum-restore 'on'

1428
yarn.lock

File diff suppressed because it is too large Load Diff