From 7f0a433bf4728e4cfbfa94f56b0c313b9b8e6da8 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Sat, 27 Jan 2024 23:43:00 +0800 Subject: [PATCH] fix: link --- Rime/default.custom.yaml | 8 ++- Rime/squirrel.custom.yaml | 65 ++++++++++++++++++++- Zsh/.zshrc | 120 +++++++++++++++++++++++++++++++++++++- 3 files changed, 190 insertions(+), 3 deletions(-) mode change 120000 => 100644 Rime/default.custom.yaml mode change 120000 => 100644 Rime/squirrel.custom.yaml mode change 120000 => 100644 Zsh/.zshrc diff --git a/Rime/default.custom.yaml b/Rime/default.custom.yaml deleted file mode 120000 index 18dbb75..0000000 --- a/Rime/default.custom.yaml +++ /dev/null @@ -1 +0,0 @@ -/Users/diygod/Library/Rime/default.custom.yaml \ No newline at end of file diff --git a/Rime/default.custom.yaml b/Rime/default.custom.yaml new file mode 100644 index 0000000..56dafb8 --- /dev/null +++ b/Rime/default.custom.yaml @@ -0,0 +1,7 @@ +patch: + menu: + page_size: 7 + + switcher: + hotkeys: + - F4 \ No newline at end of file diff --git a/Rime/squirrel.custom.yaml b/Rime/squirrel.custom.yaml deleted file mode 120000 index ccac5f9..0000000 --- a/Rime/squirrel.custom.yaml +++ /dev/null @@ -1 +0,0 @@ -/Users/diygod/Library/Rime/squirrel.custom.yaml \ No newline at end of file diff --git a/Rime/squirrel.custom.yaml b/Rime/squirrel.custom.yaml new file mode 100644 index 0000000..aa94804 --- /dev/null +++ b/Rime/squirrel.custom.yaml @@ -0,0 +1,64 @@ +patch: + style/color_scheme: macos_light # 将皮肤名称输入在此处 + style/color_scheme_dark: macos_dark + + app_options: + com.microsoft.VSCode: + ascii_mode: true + dev.warp.Warp-Stable: + ascii_mode: true + + preset_color_schemes: + macos_light: + name: Mac仿原生亮色/macos_light + author: 一方 + back_color: 0xFFFFFF # 候选条背景色，24位色值，16进制，BGR顺序 + border_color: 0xFFFFFF # 边框色 + text_color: 0x424242 # 拼音行文字颜色 + hilited_back_color: 0xD75A00 # 第一候选项背景背景色 + hilited_candidate_text_color: 0xFFFFFF # 第一候选项文字颜色 + hilited_candidate_label_color: 0xFFFFFF # 第一候选项编号颜色 + hilited_comment_text_color: 0x999999 # 注解文字高亮 + hilited_text_color: 0x999999 # 高亮拼音 (需要开启内嵌编码) + candidate_text_color: 0x3c3c3c # 预选项文字颜色 + comment_text_color: 0x999999 # 拼音等提示文字颜色 + horizontal: true # 水平排列 + inline_preedit: true # 单行显示，false双行显示 + label_color: 0x999999 # 预选栏编号颜色 + candidate_format: "%c\u2005%@" # 用 1/6 em 空格 U+2005 来控制编号 %c 和候选词 %@ 前后的空间。 + font_face: "PingFangSC" # 候选词编号字体 + font_point: 17 # 候选文字大小 + label_font_point: 13 # 候选编号大小 + corner_radius: 5 # 候选条圆角 + hilited_corner_radius: 5 # 高亮圆角 + border_height: 4 # 窗口上下高度 + border_width: 4 # 窗口左右宽度 + border_color_width: 0 #输入条边框宽度 + #label_font_face: "SFCompactText-Regular" # 候选词编号字体 + + macos_dark: + name: Mac仿原生暗色/macos_dark + author: 一方 + back_color: 0x252a2e # 候选条背景色，24位色值，16进制，BGR顺序 + border_color: 0x050505 # 边框色 + text_color: 0x424242 # 拼音行文字颜色 + hilited_back_color: 0xD75A00 # 第一候选项背景背景色 + hilited_candidate_text_color: 0xFFFFFF # 第一候选项文字颜色 + hilited_candidate_label_color: 0xFFFFFF # 第一候选项编号颜色 + hilited_comment_text_color: 0x999999 # 注解文字高亮 + hilited_text_color: 0x999999 # 高亮拼音 (需要开启内嵌编码) + candidate_text_color: 0xe9e9ea # 预选项文字颜色 + comment_text_color: 0x999999 # 拼音等提示文字颜色 + horizontal: true # 水平排列 + inline_preedit: true # 单行显示，false双行显示 + label_color: 0x999999 # 预选栏编号颜色 + candidate_format: "%c\u2005%@" # 用 1/6 em 空格 U+2005 来控制编号 %c 和候选词 %@ 前后的空间。 + font_face: "PingFangSC" # 候选词编号字体 + font_point: 17 # 候选文字大小 + label_font_point: 13 # 候选编号大小 + corner_radius: 5 # 候选条圆角 + hilited_corner_radius: 5 # 高亮圆角 + border_height: 4 # 窗口上下高度 + border_width: 4 # 窗口左右宽度 + border_color_width: 0 #输入条边框宽度 + #label_font_face: "SFCompactText-Regular" # 候选词编号字体 diff --git a/Zsh/.zshrc b/Zsh/.zshrc deleted file mode 120000 index f43b234..0000000 --- a/Zsh/.zshrc +++ /dev/null @@ -1 +0,0 @@ -/Users/diygod/.zshrc \ No newline at end of file diff --git a/Zsh/.zshrc b/Zsh/.zshrc new file mode 100644 index 0000000..c1a2554 --- /dev/null +++ b/Zsh/.zshrc @@ -0,0 +1,119 @@ +# Path to your oh-my-zsh installation. +export ZSH=/Users/DIYgod/.oh-my-zsh + +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ +# Optionally, if you set this to "random", it'll load a random theme each +# time that oh-my-zsh is loaded. +ZSH_THEME="robbyrussell" + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +# DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# 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. +# 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. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# 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? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=( + git + zsh-autosuggestions + zsh-syntax-highlighting + autojump + git-prompt +) + +# User configuration + +export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" +# export MANPATH="/usr/local/man:$MANPATH" + +source $ZSH/oh-my-zsh.sh + +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[blue]%})%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg[red]%}" +ZSH_THEME_GIT_PROMPT_BEHIND=" %{↓%G%}" +ZSH_THEME_GIT_PROMPT_AHEAD=" %{↑%G%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}" +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}✗%{$reset_color%} " + +PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )" +PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_super_status)' +RPROMPT= + +# 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" + +# ssh +# export SSH_KEY_PATH="~/.ssh/dsa_id" + +# 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`. +alias ll='ls -alFh' +alias la='ls -A' +alias l='ls -CF' +alias gs="git status" +alias ga="git add -A" +alias gc="git commit -m" +alias gp="git push origin HEAD" +alias yarnup="yarn upgrade-interactive" +alias pup="pnpm up --interactive --latest" +alias up="brew update && brew upgrade && brew cu -a -y && brew cleanup && ~/plum/rime-install iDvel/rime-ice:others/recipes/full" + +export PATH="/usr/local/sbin:$PATH" + +# export https_proxy=http://127.0.0.1:8888 +# export http_proxy=http://127.0.0.1:8888 +# export all_proxy=socks5://127.0.0.1:8889 + +export GPG_TTY=$(tty) + +eval "$(/opt/homebrew/bin/brew shellenv)" +eval "$(starship init zsh)" + +# pnpm +export PNPM_HOME="/Users/diygod/Library/pnpm" +export PATH="$PNPM_HOME:$PATH" +# pnpm end