diff --git a/gitconfig b/gitconfig index d93168c..7df96e8 100644 --- a/gitconfig +++ b/gitconfig @@ -13,7 +13,7 @@ process = git-lfs filter-process required = true [commit] - gpgsign = true + gpgsign = false [alias] up = !git pull --prune $@ && git submodule update --init --recursive [credential] diff --git a/tmux b/tmux index 8481ec3..08334a6 160000 --- a/tmux +++ b/tmux @@ -1 +1 @@ -Subproject commit 8481ec351bda767ded5453471313f35024da33f7 +Subproject commit 08334a6451e3678f92679c91c39d69c97d713126 diff --git a/tmux.conf.local b/tmux.conf.local index 947bbef..37c27a8 100644 --- a/tmux.conf.local +++ b/tmux.conf.local @@ -152,6 +152,7 @@ tmux_conf_theme_right_separator_sub='' # PowerlineSymbols.otf font # - #{pairing} # - #{prefix} # - #{root} +# - #{synchronized} # - #{uptime_d} # - #{uptime_h} # - #{uptime_m} @@ -161,7 +162,7 @@ tmux_conf_theme_right_separator_sub='' # PowerlineSymbols.otf font #tmux_conf_theme_status_left=' ❐ #S | ↑#{?uptime_d, #{uptime_d}d,}#{?uptime_h, #{uptime_h}h,}#{?uptime_m, #{uptime_m}m,} ' tmux_conf_theme_status_left=' ❐ #S ' #tmux_conf_theme_status_right='#{prefix}#{pairing} #{?battery_status, #{battery_status},}#{?battery_bar, #{battery_bar},}#{?battery_percentage, #{battery_percentage},} , %R , %d %b | #{username}#{root} | #{hostname} ' -tmux_conf_theme_status_right='#{prefix}#{pairing}, %R , %d %b | #{username}#{root} | #{hostname} ' +tmux_conf_theme_status_right='#{prefix}#{pairing}, #{?pane_synchronized,#{synchronized},⤴️ }, %R , %d %b | #{username}#{root} | #{hostname} ' # status left style tmux_conf_theme_status_left_fg='#000000,#e4e4e4,#e4e4e4' # black, white , white @@ -180,7 +181,7 @@ tmux_conf_theme_pairing_bg='none' tmux_conf_theme_pairing_attr='none' # prefix indicator -tmux_conf_theme_prefix='⌨ ' # U+2328 +tmux_conf_theme_prefix='⌨️ ' # U+2328 tmux_conf_theme_prefix_fg='none' tmux_conf_theme_prefix_bg='none' tmux_conf_theme_prefix_attr='none' @@ -191,6 +192,12 @@ tmux_conf_theme_root_fg='none' tmux_conf_theme_root_bg='none' tmux_conf_theme_root_attr='bold,blink' +# synchronized indicator +tmux_conf_theme_synchronized='🔁 ' # U+1F501 +tmux_conf_theme_synchronized_fg='none' +tmux_conf_theme_synchronized_bg='none' +tmux_conf_theme_synchronized_attr='none' + # battery bar symbols tmux_conf_battery_bar_symbol_full='◼' tmux_conf_battery_bar_symbol_empty='◻' diff --git a/update b/update index 895d00d..4fd8526 100755 --- a/update +++ b/update @@ -5,6 +5,12 @@ set -e BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "${BASEDIR}" +git submodule foreach git fetch && git submodule foreach git reset --hard origin/master +rm -f zimfw/modules/prompt/external-themes/lean/*.zwc +rm -f zimfw/modules/prompt/external-themes/pure/*.zwc +git commit -a -m "Synchronized updates $(date +"%Y-%m-%d")" +git push origin + #git submodule update --recursive --remote #git submodule foreach git fetch && git submodule foreach git reset --hard origin/master @@ -12,7 +18,7 @@ cd "${BASEDIR}" #git submodule update --recursive --remote #git submodule update --init --recursive -git submodule update --init --recursive --remote -git pull --recurse-submodules +#git submodule update --init --recursive --remote +#git pull --recurse-submodules -git submodule foreach git pull origin master --recurse-submodules +#git submodule foreach git pull origin master --recurse-submodules diff --git a/vim_runtime b/vim_runtime index 993ed55..587a185 160000 --- a/vim_runtime +++ b/vim_runtime @@ -1 +1 @@ -Subproject commit 993ed5530408f0d737ee37b152c0e6c0cd1211ef +Subproject commit 587a185a98a3b7449da8bd8ff194fbc6c0199242