Remove ohmyzsh
This commit is contained in:
Rob Watson
parent
20b0cd45aa
commit
23cc4cae45
|
|
@ -135,7 +135,7 @@ font:
|
||||||
#style: Bold Italic
|
#style: Bold Italic
|
||||||
|
|
||||||
# Point size
|
# Point size
|
||||||
#size: 11.0
|
size: 10.5
|
||||||
|
|
||||||
# Offset is the extra space around each character. `offset.y` can be thought of
|
# Offset is the extra space around each character. `offset.y` can be thought of
|
||||||
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
|
# as modifying the line spacing, and `offset.x` as modifying the letter spacing.
|
||||||
|
|
|
||||||
215
zshrc
215
zshrc
|
|
@ -1,161 +1,88 @@
|
||||||
# If you come from bash you might have to change your $PATH.
|
# $HOME/.config/zsh/.zshrc
|
||||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
# Note: Install zsh-completions package
|
||||||
|
|
||||||
# Path to your oh-my-zsh installation.
|
setopt hist_find_no_dups
|
||||||
export ZSH="/home/rob/.oh-my-zsh"
|
setopt extended_history
|
||||||
|
setopt inc_append_history
|
||||||
|
setopt auto_pushd
|
||||||
|
setopt pushd_ignore_dups
|
||||||
|
setopt pushd_silent
|
||||||
|
setopt pushd_minus
|
||||||
|
setopt pushd_to_home
|
||||||
|
setopt prompt_subst
|
||||||
|
|
||||||
# Set name of the theme to load --- if set to "random", it will
|
# Prompt
|
||||||
# load a random theme each time oh-my-zsh is loaded, in which case,
|
prompt_git_info () {
|
||||||
# to know which specific one was loaded, run: echo $RANDOM_THEME
|
bn=$(git bn 2>/dev/null)
|
||||||
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
|
if [[ $? -eq 0 ]]; then
|
||||||
ZSH_THEME="gianu"
|
echo " %F{#aaaaaa}(%F{green}$bn%F{#aaaaaa})"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
PROMPT='%F{#666666}[%F{#AAAAAA}%n%F{#aaaaaa}@%F{red}%m %F{blue}%1~$(prompt_git_info)%F{white}%F{#666666}]%F{white}%# %f'
|
||||||
|
RPROMPT='%(?.%F{green}√%f.%F{red}%?%f) %F{#666666}%*%f'
|
||||||
|
|
||||||
# Set list of themes to pick from when loading at random
|
# Completion
|
||||||
# Setting this variable when ZSH_THEME=random will cause zsh to load
|
# The following lines were added by compinstall
|
||||||
# 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.
|
zstyle ':completion:*' completer _expand _complete _ignored _approximate
|
||||||
# CASE_SENSITIVE="true"
|
zstyle ':completion:*' expand prefix suffix
|
||||||
|
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
|
||||||
|
zstyle ':completion:*' menu select=1
|
||||||
|
zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
|
||||||
|
zstyle :compinstall filename '/home/rob/.config/zsh/.zshrc'
|
||||||
|
|
||||||
# Uncomment the following line to use hyphen-insensitive completion.
|
autoload -Uz compinit
|
||||||
# Case-sensitive completion must be off. _ and - will be interchangeable.
|
compinit
|
||||||
# HYPHEN_INSENSITIVE="true"
|
# End of lines added by compinstall
|
||||||
|
|
||||||
# Uncomment the following line to disable bi-weekly auto-update checks.
|
# Search using up/down cursors
|
||||||
# DISABLE_AUTO_UPDATE="true"
|
# https://unix.stackexchange.com/a/285151/185944
|
||||||
|
# Note that the Up and Down shortcuts appear to work in Ubuntu, not in Arch:
|
||||||
|
autoload -U up-line-or-beginning-search
|
||||||
|
autoload -U down-line-or-beginning-search
|
||||||
|
zle -N up-line-or-beginning-search
|
||||||
|
zle -N down-line-or-beginning-search
|
||||||
|
bindkey "^[[A" up-line-or-beginning-search # up
|
||||||
|
bindkey "^[[B" down-line-or-beginning-search # down
|
||||||
|
|
||||||
# Uncomment the following line to automatically update without prompting.
|
# Vim keymap
|
||||||
# DISABLE_UPDATE_PROMPT="true"
|
bindkey -v
|
||||||
|
bindkey '^P' up-history
|
||||||
# Uncomment the following line to change how often to auto-update (in days).
|
bindkey '^N' down-history
|
||||||
# export UPDATE_ZSH_DAYS=13
|
bindkey '^w' backward-kill-word
|
||||||
|
|
||||||
# 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.
|
|
||||||
# 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 history-substring-search docker docker-compose golang)
|
|
||||||
|
|
||||||
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"
|
|
||||||
|
|
||||||
# Start of custom ZSH configuration
|
|
||||||
export HISTFILE=~/.zsh-history
|
|
||||||
export HISTSIZE=100000
|
|
||||||
export SAVEHIST=100000
|
|
||||||
export HISTTIMEFORMAT="[%F %T] "
|
|
||||||
setopt HIST_FIND_NO_DUPS
|
|
||||||
setopt EXTENDED_HISTORY
|
|
||||||
setopt INC_APPEND_HISTORY
|
|
||||||
|
|
||||||
# Go configuration (is this still needed with go mod?)
|
|
||||||
export GOPATH=$HOME/go
|
|
||||||
|
|
||||||
# set PATHs (highest priority last)
|
|
||||||
export PATH=$HOME/go/bin:$PATH
|
|
||||||
export PATH=$HOME/local/sbin:$PATH
|
|
||||||
export PATH=$HOME/local/bin:$PATH
|
|
||||||
export PATH=$HOME/bin:$PATH
|
|
||||||
export PATH=$HOME/.local/bin:$PATH
|
|
||||||
|
|
||||||
# set up asdf (must be after paths)
|
|
||||||
. $HOME/.asdf/asdf.sh
|
|
||||||
|
|
||||||
# Git aliases
|
|
||||||
git config --global alias.co checkout
|
|
||||||
git config --global alias.ci commit
|
|
||||||
git config --global alias.st status
|
|
||||||
git config --global alias.br branch
|
|
||||||
|
|
||||||
# Other aliases
|
# Other aliases
|
||||||
alias c.="cd .."
|
|
||||||
alias c-="cd -"
|
alias c-="cd -"
|
||||||
alias cdgit='cd $(git rev-parse --show-toplevel)'
|
alias c.="cd .."
|
||||||
alias cdg=cdgit
|
alias cdg=cdgit
|
||||||
alias gg="go get"
|
alias cdgit='cd $(git rev-parse --show-toplevel)'
|
||||||
alias gt="go test"
|
|
||||||
alias gb="go build"
|
|
||||||
alias ll="exa -l --group-directories-first --git"
|
|
||||||
alias sysc="systemctl"
|
|
||||||
alias zzz="sudo systemctl hibernate"
|
|
||||||
alias dc="docker-compose -f docker-compose.yml"
|
|
||||||
alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml"
|
|
||||||
alias clp="tmux kill-pane"
|
alias clp="tmux kill-pane"
|
||||||
alias clw="tmux kill-window"
|
alias clw="tmux kill-window"
|
||||||
alias pk="pkill -fc"
|
alias d="dirs -v"
|
||||||
|
alias dc="docker-compose -f docker-compose.yml"
|
||||||
|
alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml"
|
||||||
|
alias gb="go build"
|
||||||
|
alias gc="git commit"
|
||||||
|
alias gd="git diff"
|
||||||
|
alias gg="go get"
|
||||||
|
alias gp="git push"
|
||||||
|
alias gst="git status"
|
||||||
|
alias gt="go test"
|
||||||
|
alias ll="exa -l --group-directories-first --git"
|
||||||
|
alias ls="exa --color=auto"
|
||||||
alias pg="pgrep -fa"
|
alias pg="pgrep -fa"
|
||||||
|
alias pk="pkill -fc"
|
||||||
|
alias rez="source $ZDOTDIR/.zshrc"
|
||||||
|
alias sc="systemctl"
|
||||||
|
alias sysc="systemctl"
|
||||||
alias updatevimplugins="cd $HOME/.vim/pack/git-plugins && find . -mindepth 2 -maxdepth 2 -type d | xargs -I{} bash -c 'cd {} ; printf \"In {}...\"; git pull --rebase' ; cd -"
|
alias updatevimplugins="cd $HOME/.vim/pack/git-plugins && find . -mindepth 2 -maxdepth 2 -type d | xargs -I{} bash -c 'cd {} ; printf \"In {}...\"; git pull --rebase' ; cd -"
|
||||||
|
alias zzz="sudo systemctl hibernate"
|
||||||
|
|
||||||
# recursive grep with line numbers and colour, ignoring binary files:
|
# recursive grep with line numbers and colour, ignoring binary files:
|
||||||
alias gnr="grep -nR -I --color"
|
alias gnr="grep -nR -I --color"
|
||||||
# same but case-insensitive:
|
# same but case-insensitive:
|
||||||
alias gnri="grep -nRi -I --color"
|
alias gnri="grep -nRi -I --color"
|
||||||
|
|
||||||
# Postgres default user:
|
|
||||||
export PGUSER=postgres
|
|
||||||
|
|
||||||
# Force TERM variable, this avoids issues with TERM=alacritty in SSH sessions:
|
|
||||||
TERM=xterm-256color
|
|
||||||
|
|
||||||
# On boot, power on bluetooth and start xfce
|
# On boot, power on bluetooth and start xfce
|
||||||
if [ $(tty) = "/dev/tty1" ]; then
|
if [ $(tty) = "/dev/tty1" ]; then
|
||||||
bluetoothctl power on
|
bluetoothctl power on
|
||||||
|
|
@ -165,18 +92,12 @@ fi
|
||||||
# For Ubuntu, disable Caps-Lock:
|
# For Ubuntu, disable Caps-Lock:
|
||||||
setxkbmap -option caps:none
|
setxkbmap -option caps:none
|
||||||
|
|
||||||
# Set zshfunctions dir as per https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
|
# Set zshfunctions dir as per https://github.com/alacritty/alacritty/blob/master/INSTALL.md#shell-completions
|
||||||
fpath+=${ZDOTDIR:-~}/.zsh_functions
|
fpath+=${ZDOTDIR:-~}/.zsh_functions
|
||||||
|
|
||||||
export BAT_THEME=Nord
|
|
||||||
|
|
||||||
# Vim keymap
|
|
||||||
bindkey -v
|
|
||||||
bindkey '^P' up-history
|
|
||||||
bindkey '^N' down-history
|
|
||||||
bindkey '^w' backward-kill-word
|
|
||||||
bindkey '^r' history-incremental-search-backward
|
|
||||||
|
|
||||||
# fzf configuration
|
# fzf configuration
|
||||||
export KEYTIMEOUT=2
|
export KEYTIMEOUT=2
|
||||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||||
|
|
||||||
|
# set up asdf
|
||||||
|
. $HOME/.asdf/asdf.sh
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue