Lots of zsh changes
This commit is contained in:
Jonathan Hodgson
parent
cd61fb7ff4
commit
4893824aff
15 changed files with 817 additions and 158 deletions
|
|
@ -1,2 +1,2 @@
|
|||
source ~/.dotfiles/shells/shared/profile
|
||||
source ~/.dotfiles/shells/shared/environmentVariables
|
||||
|
||||
|
|
|
|||
|
|
@ -1,97 +1,52 @@
|
|||
# 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/.dotfiles/shells/zsh/oh-my-zsh-core
|
||||
|
||||
|
||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
||||
# it'll load a random theme each time that oh-my-zsh is loaded.
|
||||
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
|
||||
ZSH_THEME="powerlevel9k/powerlevel9k"
|
||||
|
||||
# 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 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="dd.mm.yyyy"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
ZSH_CUSTOM=$HOME/.dotfiles/shells/zsh/oh-my-zsh-custom
|
||||
|
||||
|
||||
# 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-better-npm-completion zsh-autosuggestions)
|
||||
|
||||
|
||||
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"
|
||||
|
||||
# ssh
|
||||
# export SSH_KEY_PATH="~/.ssh/rsa_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`.
|
||||
# Make colours work
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
autoload -U colors && colors
|
||||
|
||||
# Make sure we are using vi mode
|
||||
bindkey -v
|
||||
|
||||
# History in cache directory:
|
||||
setopt INC_APPEND_HISTORY # Write to the history file immediately, not when the shell exits.
|
||||
setopt SHARE_HISTORY # Share history between all sessions.
|
||||
setopt HIST_IGNORE_SPACE
|
||||
HISTSIZE=10000
|
||||
SAVEHIST=10000
|
||||
HISTFILE=~/.cache/zsh/history
|
||||
|
||||
export KEYTIMEOUT=25
|
||||
|
||||
# Change cursor shape for different vi modes. (thanks Luke Smith: https://github.com/LukeSmithxyz/voidrice/)
|
||||
function zle-keymap-select {
|
||||
if [[ ${KEYMAP} == vicmd ]] ||
|
||||
[[ $1 = 'block' ]]; then
|
||||
echo -ne '\e[1 q'
|
||||
|
||||
elif [[ ${KEYMAP} == main ]] ||
|
||||
[[ ${KEYMAP} == viins ]] ||
|
||||
[[ ${KEYMAP} = '' ]] ||
|
||||
[[ $1 = 'beam' ]]; then
|
||||
echo -ne '\e[5 q'
|
||||
fi
|
||||
}
|
||||
zle -N zle-keymap-select
|
||||
#
|
||||
zle-line-init() {
|
||||
zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere)
|
||||
echo -ne '\e[5 q'
|
||||
}
|
||||
zle -N zle-line-init
|
||||
|
||||
# Use beam shape cursor on startup.
|
||||
echo -ne '\e[5 q'
|
||||
# Use beam shape cursor for each new prompt.
|
||||
preexec() { echo -ne '\e[5 q' ;}
|
||||
|
||||
bindkey -v '^?' backward-delete-char
|
||||
|
||||
source ~/.dotfiles/shells/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
|
||||
if [ ! -n "$SSH_CLIENT" ] && [ ! -n "$SSH_TTY" ]; then
|
||||
if [ -L $HOME/.dotfiles/shells/zsh/current-color-scheme ]; then
|
||||
source $HOME/.dotfiles/shells/zsh/current-color-scheme
|
||||
if [ -L $DOTFILES/shells/zsh/current-color-scheme ]; then
|
||||
source $DOTFILES/shells/zsh/current-color-scheme
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -99,24 +54,30 @@ TRAPWINCH(){
|
|||
zle && {zle reset-prompt; zle -R}
|
||||
}
|
||||
|
||||
#if [ -f ~/.current-folder ] && [ ! $TMUX ]; then
|
||||
# \cd "$(cat ~/.current-folder)"
|
||||
#fi
|
||||
setopt autocd
|
||||
|
||||
#[ -z "$TMUX" ] && { exec tmux new-session && exit;}
|
||||
#if [[ ! $TERM =~ screen ]]; then
|
||||
# exec tmux
|
||||
#fi
|
||||
#
|
||||
|
||||
local current="$(project current --path)"
|
||||
if [ -n "$current" ]; then
|
||||
local script="/usr/bin/script"
|
||||
if [[ ! "$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1 )" == "$script" ]]; then
|
||||
mkdir "$current/shell-logs"
|
||||
/usr/bin/script -f "$current/shell-logs/$(date +"%d-%b-%y_%H-%M-%S")_shell.log"
|
||||
# I use initial command in my folder-shell script
|
||||
# This is normally empty, but might be lf or ranger if I want to open it
|
||||
# THis is almost always a curses app so I don't want to try and record the terminal
|
||||
if [ -n "$initialCommand" ]; then
|
||||
echo "Running $initialCommand"
|
||||
$initialCommand && exit
|
||||
else
|
||||
local current="$(project current --path)"
|
||||
if [ -n "$current" ]; then
|
||||
local script="/usr/bin/script"
|
||||
if [[ ! "$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1 )" == "$script" ]]; then
|
||||
mkdir "$current/shell-logs" 2> /dev/null
|
||||
/usr/bin/script -f "$current/shell-logs/$(date +"%d-%b-%y_%H-%M-%S")_shell.log"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
#clear
|
||||
#tldr --linux -r
|
||||
export ZSH_FOLDER="$DOTFILES/shells/zsh/"
|
||||
# Include my config files
|
||||
for file in "$ZSH_FOLDER/includes/"*".zsh"; do
|
||||
source "$file"
|
||||
done
|
||||
|
||||
# Load zsh-syntax-highlighting; should be last.
|
||||
source $HOME/.dotfiles/shells/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2> /dev/null
|
||||
|
|
|
|||
131
shells/zsh/STOW/.zshrc.old
Normal file
131
shells/zsh/STOW/.zshrc.old
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
# 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/.dotfiles/shells/zsh/oh-my-zsh-core
|
||||
|
||||
|
||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
||||
# it'll load a random theme each time that oh-my-zsh is loaded.
|
||||
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
|
||||
#ZSH_THEME="powerlevel9k/powerlevel9k"
|
||||
|
||||
# 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 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="dd.mm.yyyy"
|
||||
|
||||
# Would you like to use another custom folder than $ZSH/custom?
|
||||
#ZSH_CUSTOM=$HOME/.dotfiles/shells/zsh/oh-my-zsh-custom
|
||||
|
||||
|
||||
# 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-better-npm-completion zsh-autosuggestions)
|
||||
|
||||
|
||||
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"
|
||||
|
||||
# ssh
|
||||
# export SSH_KEY_PATH="~/.ssh/rsa_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`.
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
|
||||
source ~/.dotfiles/shells/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
|
||||
if [ ! -n "$SSH_CLIENT" ] && [ ! -n "$SSH_TTY" ]; then
|
||||
if [ -L $HOME/.dotfiles/shells/zsh/current-color-scheme ]; then
|
||||
source $HOME/.dotfiles/shells/zsh/current-color-scheme
|
||||
fi
|
||||
fi
|
||||
|
||||
TRAPWINCH(){
|
||||
zle && {zle reset-prompt; zle -R}
|
||||
}
|
||||
|
||||
#if [ -f ~/.current-folder ] && [ ! $TMUX ]; then
|
||||
# \cd "$(cat ~/.current-folder)"
|
||||
#fi
|
||||
|
||||
#[ -z "$TMUX" ] && { exec tmux new-session && exit;}
|
||||
#if [[ ! $TERM =~ screen ]]; then
|
||||
# exec tmux
|
||||
#fi
|
||||
#
|
||||
|
||||
# I use initial command in my folder-shell script
|
||||
# This is normally empty, but might be lf or ranger if I want to open it
|
||||
# THis is almost always a curses app so I don't want to try and record the terminal
|
||||
if [ -n "$initialCommand" ]; then
|
||||
echo "Running $initialCommand"
|
||||
$initialCommand && exit
|
||||
else
|
||||
local current="$(project current --path)"
|
||||
if [ -n "$current" ]; then
|
||||
local script="/usr/bin/script"
|
||||
if [[ ! "$(ps -ocommand -p $PPID | grep -v 'COMMAND' | cut -d' ' -f1 )" == "$script" ]]; then
|
||||
mkdir "$current/shell-logs"
|
||||
/usr/bin/script -f "$current/shell-logs/$(date +"%d-%b-%y_%H-%M-%S")_shell.log"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#clear
|
||||
#tldr --linux -r
|
||||
Loading…
Add table
Add a link
Reference in a new issue