From 8c05655324144bfc108abdd18e3a6c8af11ff32f Mon Sep 17 00:00:00 2001 From: newbieQQ Date: Fri, 1 May 2026 18:36:21 +0800 Subject: [PATCH] update --- config/My.zsh | 125 +++++++++++++++++++++++++++++++++++++++++++++++ config/conda.zsh | 17 +++++++ config/git.zsh | 2 +- config/omz.zsh | 2 + omz.zsh | 4 ++ 5 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 config/My.zsh create mode 100644 config/conda.zsh diff --git a/config/My.zsh b/config/My.zsh new file mode 100644 index 0000000..3c4b7f1 --- /dev/null +++ b/config/My.zsh @@ -0,0 +1,125 @@ +# >>> conda initialize >>> +alias vim='nvim' +alias vi='nvim' + + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + +if [[ "$TERM" == "xterm-kitty" ]]; then + alias ssh="kitten ssh" +fi + +fastfetch + + + + +# ====================== +# explanation +# ====================== + +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:$HOME/.local/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="robbyrussell" + +# 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. + +# 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='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch $(uname -m)" + +# 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 a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + + diff --git a/config/conda.zsh b/config/conda.zsh new file mode 100644 index 0000000..07c73f7 --- /dev/null +++ b/config/conda.zsh @@ -0,0 +1,17 @@ +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/home/newbie/.local/share/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/home/newbie/.local/share/miniconda3/etc/profile.d/conda.sh" ]; then + . "/home/newbie/.local/share/miniconda3/etc/profile.d/conda.sh" + else + export PATH="/home/newbie/.local/share/miniconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + +alias ca="conda activate" + diff --git a/config/git.zsh b/config/git.zsh index d305e37..c259980 100644 --- a/config/git.zsh +++ b/config/git.zsh @@ -16,7 +16,7 @@ alias gsh='git --no-pager show' alias gpt='git push origin --tags' alias glt='git tag -n --sort=taggerdate | tail -n ${1-10}' gat() { git tag -a $1 -m "$2" } -gam() { git add --all && git commit -m "$*" } +# gam() { git add --all && git commit -m "$*" } gitlog() { git --no-pager log --date=format:'%Y-%m-%d %H:%M' --pretty=tformat:$1 --graph -n ${2-10} \ } diff --git a/config/omz.zsh b/config/omz.zsh index 48df593..5ac6ddb 100644 --- a/config/omz.zsh +++ b/config/omz.zsh @@ -4,3 +4,5 @@ source $OMZ/plugins/extract/extract.plugin.zsh source $OMZ/plugins/fzf-tab/fzf-tab.zsh source $OMZ/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh source $OMZ/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + + diff --git a/omz.zsh b/omz.zsh index c001cde..26feb81 100644 --- a/omz.zsh +++ b/omz.zsh @@ -4,9 +4,13 @@ source $OMZ/config/omz.zsh source $OMZ/config/git.zsh source $OMZ/config/fzf.zsh source $OMZ/config/hook.zsh +source $OMZ/config/My.zsh +source $OMZ/config/conda.zsh source $OMZ/themes/simple.zsh-theme # configuration [ "$_OMZ_APPLY_PREEXEC_HOOK" = "true" ] && _apply_preexec_hook # file: $OMZ/config/hook.zsh [ "$_OMZ_APPLY_CHPWD_HOOK" = "true" ] && _apply_chpwd_hook # file: $OMZ/config/hook.zsh [ "$_OMZ_APPLY_HISTORYBYFZF" = "false" ] || _apply_historybyfzf # file: $OMZ/config/fzf.zsh + +