diff --git a/fake_home/.zshrc b/fake_home/.zshrc index 6d0e376..194ff2c 100644 --- a/fake_home/.zshrc +++ b/fake_home/.zshrc @@ -192,15 +192,15 @@ function sync-dconf { rm $HOME/.tmp/dconf-dump &> /dev/null scp -P 11275 'sage@sagev.space:~/dconf-dump' $HOME/.tmp/dconf-dump dconf-dump > $HOME/.tmp/current-dconf-dump - if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then - echo - echo "Incoming conf changes:" - echo - git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump - echo - bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1 - echo "Applying changes..." - fi + # if ! git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump &> /dev/null; then + # echo + # echo "Incoming conf changes:" + # echo + # git --no-pager diff --no-index $HOME/.tmp/current-dconf-dump $HOME/.tmp/dconf-dump + # echo + # bash -c 'read -p "Press enter to continue, or Ctrl-C to cancel."' || return 1 + # echo "Applying changes..." + # fi dconf load / < $HOME/.tmp/dconf-dump || return 1 push-dconf }