Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c00da7acd | |||
| e4728537e7 | |||
| 91d5589093 | |||
| a5756a528e | |||
| 2b2390d703 | |||
| 5c0d0b03e8 | |||
| 3e127fe60d | |||
| 080843310c | |||
| f638d8c652 |
132
.zshrc
Normal file
132
.zshrc
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
# 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.
|
||||||
|
ZSH=/usr/share/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"
|
||||||
|
# ZSH_THEME="smt"
|
||||||
|
# ZSH_THEME="dogenpunk"
|
||||||
|
# ZSH_THEME="avit"
|
||||||
|
ZSH_THEME="smd"
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
HIST_STAMPS="yyyy-mm-dd"
|
||||||
|
|
||||||
|
# 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)
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
|
||||||
|
ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
|
||||||
|
if [[ ! -d $ZSH_CACHE_DIR ]]; then
|
||||||
|
mkdir $ZSH_CACHE_DIR
|
||||||
|
fi
|
||||||
|
|
||||||
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
|
### restricting hist_verify in zsh like !!
|
||||||
|
accept-line() {
|
||||||
|
if [[ ${BUFFER//![\$!]} = *!* ]]
|
||||||
|
then
|
||||||
|
set -o histverify
|
||||||
|
else
|
||||||
|
set +o histverify
|
||||||
|
fi
|
||||||
|
zle .$WIDGET
|
||||||
|
}
|
||||||
|
zle -N accept-line
|
||||||
|
|
||||||
|
## autostart with neofetch
|
||||||
|
if [ -x "$(command -v neofetch)" ]
|
||||||
|
then
|
||||||
|
neofetch
|
||||||
|
fi
|
||||||
73
README.md
Normal file
73
README.md
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
# Installation of zsh (z-shell) with oh-my-zsh in Arch Linux
|
||||||
|
|
||||||
|
## Preparation
|
||||||
|
|
||||||
|
You would like to install the package manager `yay` instead of `pacman` first:
|
||||||
|
|
||||||
|
### Yay installation
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo pacman -S --needed git base-devel
|
||||||
|
git clone https://aur.archlinux.org/yay.git
|
||||||
|
cd yay
|
||||||
|
makepkg -si
|
||||||
|
```
|
||||||
|
You can find support at https://github.com/Jguer/yay
|
||||||
|
|
||||||
|
### Installation
|
||||||
|
|
||||||
|
```
|
||||||
|
yay oh-my-zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
You can either copy the theme from this repository or even more flexible
|
||||||
|
when you first clone this repository and then make a link from the `themes` folder to this repository.
|
||||||
|
|
||||||
|
### Just copy the file
|
||||||
|
|
||||||
|
Copy the file `smd.zsh-theme` of this repository to the `themes` directory, like
|
||||||
|
```
|
||||||
|
sudo wget -P /usr/share/oh-my-zsh/themes https://git.kuschel.at/public/smd.zsh-theme/raw/branch/master/smd.zsh-theme
|
||||||
|
```
|
||||||
|
Then copy the zsh template `zshrc` to your home directory
|
||||||
|
```
|
||||||
|
cp /usr/share/oh-my-zsh/zshrc ~/.zshrc
|
||||||
|
```
|
||||||
|
|
||||||
|
### Make a link from a cloned folder (the more experienced one)
|
||||||
|
|
||||||
|
Goto a new user folder e.g. `mkdir -p ~/gitea` and `cd ~/gitea`
|
||||||
|
|
||||||
|
Make a clone:
|
||||||
|
```
|
||||||
|
git clone https:\\https://git.kuschel.at/public/smd.zsh-theme.git
|
||||||
|
```
|
||||||
|
```
|
||||||
|
cd /usr/share/oh-my-zsh/themes
|
||||||
|
sudo ln -s $HOME/gitea/smd.zsh-theme/smd.zsh-theme
|
||||||
|
```
|
||||||
|
|
||||||
|
### Further steps:
|
||||||
|
|
||||||
|
Now you have to edit this file with e.g. `nano -cl ~/.zshrc`
|
||||||
|
and replace the line with ZSH_THEME to:
|
||||||
|
```
|
||||||
|
ZSH_THEME="smd"
|
||||||
|
```
|
||||||
|
In addition, I like to replace the HIST_STAMPS to:
|
||||||
|
```
|
||||||
|
HIST_STAMPS="yyyy-mm-dd"
|
||||||
|
```
|
||||||
|
|
||||||
|
Last step change the shell and try to reload omz with:
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo chsh
|
||||||
|
```
|
||||||
|
Now you have to enter the new shell `/bin/zsh`
|
||||||
|
|
||||||
|
I would recommand to log out and log back into the system to see the zsh, as this is now your default shell for the future.
|
||||||
|
|
||||||
|
-- eof --
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# smd.zsh-theme by Thomas Kuschel, based on smt.zsh-theme, based on dogenpunk by Matthew Nelson.
|
# smd.zsh-theme, based on smt.zsh-theme, based on dogenpunk by Matthew Nelson.
|
||||||
|
REPORTTIME=3
|
||||||
MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
|
MODE_INDICATOR="%{$fg_bold[red]%}❮%{$reset_color%}%{$fg[red]%}❮❮%{$reset_color%}"
|
||||||
local return_status="%{$fg[red]%}%(?..%?⏎)%{$reset_color%} "
|
local return_status="%{$fg[red]%}%(?..%?⏎)%{$reset_color%} "
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ ZSH_THEME_GIT_PROMPT_SHA_BEFORE="➤ %{$fg_bold[yellow]%}"
|
|||||||
ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
|
ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$reset_color%}"
|
||||||
|
|
||||||
function prompt_char() {
|
function prompt_char() {
|
||||||
command git branch &>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" || echo "%{$fg[cyan]%}◯%{$reset_color%}"
|
command git branch &>/dev/null && echo "%{$fg[green]%}±%{$reset_color%}" || echo "%{$fg[cyan]%}◯%{$reset_color%}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Colors vary depending on time lapsed.
|
# Colors vary depending on time lapsed.
|
||||||
@@ -33,48 +33,47 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
|
|||||||
# Determine the time since last commit. If branch is clean,
|
# Determine the time since last commit. If branch is clean,
|
||||||
# use a neutral color, otherwise colors will vary according to time.
|
# use a neutral color, otherwise colors will vary according to time.
|
||||||
function git_time_since_commit() {
|
function git_time_since_commit() {
|
||||||
local COLOR MINUTES HOURS DAYS SUB_HOURS SUB_MINUTES
|
local COLOR MINUTES HOURS DAYS SUB_HOURS SUB_MINUTES
|
||||||
local last_commit now seconds_since_last_commit
|
local last_commit seconds_since_last_commit
|
||||||
|
|
||||||
# Only proceed if there is actually a commit
|
# Only proceed if there is actually a commit
|
||||||
if ! last_commit=$(command git -c log.showSignature=false log --pretty=format:'%at' -1 2>/dev/null); then
|
if ! last_commit=$(command git -c log.showSignature=false log --pretty=format:'%at' -1 2>/dev/null); then
|
||||||
echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
|
echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Totals
|
# Totals
|
||||||
now=$(date +%s)
|
seconds_since_last_commit=$(( $(date +%s) - last_commit ))
|
||||||
seconds_since_last_commit=$(( now - last_commit ))
|
MINUTES=$(( seconds_since_last_commit / 60 ))
|
||||||
MINUTES=$(( seconds_since_last_commit / 60 ))
|
HOURS=$(( MINUTES / 60 ))
|
||||||
HOURS=$(( MINUTES / 60 ))
|
|
||||||
|
|
||||||
# Sub-hours and sub-minutes
|
# Sub-hours and sub-minutes
|
||||||
DAYS=$(( HOURS / 24 ))
|
DAYS=$(( HOURS / 24 ))
|
||||||
SUB_HOURS=$(( HOURS % 24 ))
|
SUB_HOURS=$(( HOURS % 24 ))
|
||||||
SUB_MINUTES=$(( MINUTES % 60 ))
|
SUB_MINUTES=$(( MINUTES % 60 ))
|
||||||
|
|
||||||
if [[ -z "$(command git status -s 2>/dev/null)" ]]; then
|
if [[ -z "$(command git status -s 2>/dev/null)" ]]; then
|
||||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL"
|
||||||
else
|
else
|
||||||
if [[ "$MINUTES" -gt 30 ]]; then
|
if [[ "$MINUTES" -gt 30 ]]; then
|
||||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
|
||||||
elif [[ "$MINUTES" -gt 10 ]]; then
|
elif [[ "$MINUTES" -gt 10 ]]; then
|
||||||
COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
|
COLOR="$ZSH_THEME_GIT_TIME_SHORT_COMMIT_MEDIUM"
|
||||||
else
|
else
|
||||||
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
|
COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$HOURS" -gt 24 ]]; then
|
if [[ "$HOURS" -gt 24 ]]; then
|
||||||
echo "[${COLOR}${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
|
echo "[${COLOR}${DAYS}d${SUB_HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
|
||||||
elif [[ "$MINUTES" -gt 60 ]]; then
|
elif [[ "$MINUTES" -gt 60 ]]; then
|
||||||
echo "[${COLOR}${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
|
echo "[${COLOR}${HOURS}h${SUB_MINUTES}m%{$reset_color%}]"
|
||||||
else
|
else
|
||||||
echo "[${COLOR}${MINUTES}m%{$reset_color%}]"
|
echo "[${COLOR}${MINUTES}m%{$reset_color%}]"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
PROMPT='
|
PROMPT='
|
||||||
%{$fg[cyan]%}%m%{$reset_color%} 福 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info)
|
%(#.$fg[red].$fg[cyan])%(#.√@.)%m%{$reset_color%} 福 %{$fg[cyan]%}%~ %{$reset_color%}$(git_prompt_short_sha)$(git_prompt_info)
|
||||||
%{$fg[red]%}%!%{$reset_color%} $(prompt_char) ❯ '
|
%{$fg[red]%}%!%{$reset_color%} $(prompt_char) ⫸ '
|
||||||
RPROMPT='${return_status}$(git_time_since_commit)$(git_prompt_status)%{$reset_color%}'
|
RPROMPT='${return_status}$(git_time_since_commit)$(git_prompt_status)%{$reset_color%}'
|
||||||
|
|||||||
Reference in New Issue
Block a user