From 5649eeb2b3be13f648343e91c94da76c5cde06b2 Mon Sep 17 00:00:00 2001
From: Eyre_S <sukazyo@outlook.com>
Date: Sat, 6 Apr 2024 19:30:22 +0800
Subject: [PATCH] add hash check for sync, add termux zshrc

---
 sync.py              |   4 +-
 zsh/termux.zshrc.zsh | 152 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 zsh/termux.zshrc.zsh

diff --git a/sync.py b/sync.py
index 4b229dc..be6d68a 100644
--- a/sync.py
+++ b/sync.py
@@ -147,9 +147,9 @@ def compare_file (rootBackItem: BackupItem, relative_file_path: str|None) -> Cal
                 return NewerStatus.ALL_MISSING
             return NewerStatus.RIGHT_MISSING
         if left.edited_time > right.edited_time:
-            return NewerStatus.LEFT_OLDER
+            return check_hash_same_or(NewerStatus.LEFT_OLDER)
         elif left.edited_time < right.edited_time:
-            return NewerStatus.RIGHT_OLDER
+            return check_hash_same_or(NewerStatus.RIGHT_OLDER)
         if left.size != right.size:
             return NewerStatus.DIFFERENT
         return NewerStatus.SAME
diff --git a/zsh/termux.zshrc.zsh b/zsh/termux.zshrc.zsh
new file mode 100644
index 0000000..4ecd0c2
--- /dev/null
+++ b/zsh/termux.zshrc.zsh
@@ -0,0 +1,152 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(
+	git
+    ssh-agent
+	zsh-autosuggestions
+    zsh-shift-select
+	zsh-syntax-highlighting
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+#-- global useful vars --#
+source "$HOME/.envrc"
+export profile="$HOME/.zshrc"
+export config="$HOME/.config"
+export ws="$HOME/documents/workspaces"
+edit_profile () {
+    emacs $profile
+    source $profile
+}
+
+#-- termux-only: enhanced shell editor --#
+alias vim='nvim'
+export PATH="$HOME/.config/emacs/bin:$PATH"
+alias code='emacs'
+
+#-- batcat --#
+alias cat='bat'
+
+#-- lsd (colorls before) --#
+alias cols='lsd'
+alias crls='cols'
+alias ccls='crls -g'
+alias cl='ccls -lA'
+alias cll='ccls -l'
+alias cla='ccls -la'
+alias lc='ccls'
+alias ls='lc'
+alias l='cl'
+alias ll='cll'
+alias la='cla'
+alias lgg='ccls --tree'
+
+# Created by `pipx` on 2024-04-06 11:25:10
+export PATH="$PATH:/data/data/com.termux/files/home/.local/bin"