psi-jack/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Synchronized updates 2018-08-06

Browse source
This commit is contained in:
Eric Renfro 2018-08-06 22:24:44 -04:00
parent 26dfcc57c0
commit 07806f098e
5 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -13,7 +13,7 @@
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[commit] [commit]
gpgsign = true gpgsign = false
[alias] [alias]
up = !git pull --prune $@ && git submodule update --init --recursive up = !git pull --prune $@ && git submodule update --init --recursive
[credential] [credential]

2
tmux

@ -1 +1 @@
Subproject commit 8481ec351bda767ded5453471313f35024da33f7 Subproject commit 08334a6451e3678f92679c91c39d69c97d713126

11
tmux.conf.local
View file

@ -152,6 +152,7 @@ tmux_conf_theme_right_separator_sub='' # PowerlineSymbols.otf font
# - #{pairing} # - #{pairing}
# - #{prefix} # - #{prefix}
# - #{root} # - #{root}
# - #{synchronized}
# - #{uptime_d} # - #{uptime_d}
# - #{uptime_h} # - #{uptime_h}
# - #{uptime_m} # - #{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 | ↑#{?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_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} #{?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 # status left style
tmux_conf_theme_status_left_fg='#000000,#e4e4e4,#e4e4e4' # black, white , white 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' tmux_conf_theme_pairing_attr='none'
# prefix indicator # prefix indicator
tmux_conf_theme_prefix='⌨ ' # U+2328 tmux_conf_theme_prefix='⌨️ ' # U+2328
tmux_conf_theme_prefix_fg='none' tmux_conf_theme_prefix_fg='none'
tmux_conf_theme_prefix_bg='none' tmux_conf_theme_prefix_bg='none'
tmux_conf_theme_prefix_attr='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_bg='none'
tmux_conf_theme_root_attr='bold,blink' 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 # battery bar symbols
tmux_conf_battery_bar_symbol_full='◼' tmux_conf_battery_bar_symbol_full='◼'
tmux_conf_battery_bar_symbol_empty='◻' tmux_conf_battery_bar_symbol_empty='◻'

12
update
View file

@ -5,6 +5,12 @@ set -e
BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd "${BASEDIR}" 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 update --recursive --remote
#git submodule foreach git fetch && git submodule foreach git reset --hard origin/master #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 --recursive --remote
#git submodule update --init --recursive #git submodule update --init --recursive
git submodule update --init --recursive --remote #git submodule update --init --recursive --remote
git pull --recurse-submodules #git pull --recurse-submodules
git submodule foreach git pull origin master --recurse-submodules #git submodule foreach git pull origin master --recurse-submodules

2
vim_runtime

@ -1 +1 @@
Subproject commit 993ed5530408f0d737ee37b152c0e6c0cd1211ef Subproject commit 587a185a98a3b7449da8bd8ff194fbc6c0199242