fixed zulu
This commit is contained in:
parent
015a530da2
commit
800878e0bc
11 changed files with 8 additions and 86 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -4,9 +4,6 @@
|
||||||
[submodule "lib/nano/syntax"]
|
[submodule "lib/nano/syntax"]
|
||||||
path = lib/nano/syntax
|
path = lib/nano/syntax
|
||||||
url = https://github.com/scopatz/nanorc
|
url = https://github.com/scopatz/nanorc
|
||||||
[submodule "lib/ohmyzsh"]
|
|
||||||
path = lib/ohmyzsh
|
|
||||||
url = https://github.com/robbyrussell/oh-my-zsh
|
|
||||||
[submodule "lib/zulu/core"]
|
[submodule "lib/zulu/core"]
|
||||||
path = lib/zulu/core
|
path = lib/zulu/core
|
||||||
url = https://github.com/zulu-zsh/zulu
|
url = https://github.com/zulu-zsh/zulu
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit d848c94804918138375041a9f800f401bec12068
|
|
|
@ -1,5 +0,0 @@
|
||||||
# CD
|
|
||||||
alias ..='cd ../'
|
|
||||||
alias ...='cd ../../'
|
|
||||||
alias ....='cd ../../../'
|
|
||||||
alias .....='cd ../../../../'
|
|
|
@ -1,5 +0,0 @@
|
||||||
# Du/Find
|
|
||||||
alias dud='du -d 1 -h'
|
|
||||||
alias duf='du -sh *'
|
|
||||||
alias fd='find . -type d -name'
|
|
||||||
alias ff='find . -type f -name'
|
|
|
@ -1,4 +0,0 @@
|
||||||
# Grep
|
|
||||||
alias grep='grep --color'
|
|
||||||
alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}'
|
|
||||||
alias psg='ps aux | grep -v grep | grep'
|
|
|
@ -1,5 +0,0 @@
|
||||||
# Interactive
|
|
||||||
alias rm='rm -i'
|
|
||||||
alias cp='cp -i'
|
|
||||||
alias mv='mv -i'
|
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
# Listing
|
|
||||||
alias l='ls -lFh' #size,show type,human readable
|
|
||||||
alias la='ls -lAFh' #long list,show almost all,show type,human readable
|
|
||||||
alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable
|
|
||||||
alias lt='ls -ltFh' #long list,sorted by date,show type,human readable
|
|
||||||
alias ll='ls -l' #long list
|
|
||||||
alias ldot='ls -ld .*'
|
|
||||||
alias lS='ls -1FSsh'
|
|
||||||
alias lart='ls -1Fcart'
|
|
||||||
alias lrt='ls -1Fcrt'
|
|
|
@ -1,20 +0,0 @@
|
||||||
# Command Line Foo
|
|
||||||
alias clf='clf --color'
|
|
||||||
|
|
||||||
# The Fuck
|
|
||||||
TF_ALIAS=fuck alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
|
|
||||||
|
|
||||||
# PClear
|
|
||||||
pclear () {
|
|
||||||
clear
|
|
||||||
printf '\033[3J'
|
|
||||||
}
|
|
||||||
|
|
||||||
# Termbin
|
|
||||||
alias tb='nc termbin.com 9999'
|
|
||||||
|
|
||||||
# Make Dir and enter it
|
|
||||||
mkcd() {
|
|
||||||
mkdir $1 >/dev/null 2>&1
|
|
||||||
[ -e $1 ] && cd $1
|
|
||||||
}
|
|
|
@ -1,7 +0,0 @@
|
||||||
# Stuff
|
|
||||||
alias h='history'
|
|
||||||
alias hgrep="fc -El 0 | grep"
|
|
||||||
alias j='jobs'
|
|
||||||
alias p='ps -f'
|
|
||||||
alias sortnr='sort -n -r'
|
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Tail
|
|
||||||
alias t='tail -f'
|
|
32
zsh/zshrc
32
zsh/zshrc
|
@ -2,50 +2,34 @@
|
||||||
export DOT=${HOME}/dotfiles
|
export DOT=${HOME}/dotfiles
|
||||||
export OWN=${DOT}/zsh
|
export OWN=${DOT}/zsh
|
||||||
export LIB=${DOT}/lib
|
export LIB=${DOT}/lib
|
||||||
export OMZ=${LIB}/ohmyzsh
|
|
||||||
export ZSH=${OMZ}
|
|
||||||
export ZUL=${LIB}/zulu
|
export ZUL=${LIB}/zulu
|
||||||
export ZULU_DIR=${ZUL}
|
export ZULU_DIR=${ZUL}
|
||||||
export ZUC=${ZUL}/config
|
export ZUC=${ZUL}/config
|
||||||
export ZULU_CONFIG_DIR=${ZUC}
|
export ZULU_CONFIG_DIR=${ZUC}
|
||||||
export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
|
export PATH="${HOME}/dotfiles/bin:/opt/android-sdk/build-tools/26.0.0/:${PATH}"
|
||||||
export EDITOR='nano'
|
export EDITOR='nano'
|
||||||
export TERM=linux
|
export TERM=xterm-256color
|
||||||
|
|
||||||
# Fix MobaXterm Home/End key with ZSH
|
# Fix MobaXterm Home/End key with ZSH
|
||||||
#bindkey '^[[H' beginning-of-line
|
bindkey '^[[H' beginning-of-line
|
||||||
#bindkey '^[[F' end-of-line
|
bindkey '^[[F' end-of-line
|
||||||
|
|
||||||
# Settings & Dircolors
|
# Settings & Dircolors
|
||||||
ZSH_THEME="mortalscumbag"
|
|
||||||
DISABLE_AUTO_UPDATE="true"
|
|
||||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
||||||
eval `dircolors ${OWN}/dircolors`
|
eval `dircolors ${OWN}/dircolors`
|
||||||
|
|
||||||
# Plugins
|
|
||||||
plugins=(git vagrant docker python ansible systemd systemadmin tmux)
|
|
||||||
case $(uname -n) in
|
|
||||||
"megumi")
|
|
||||||
plugins+=(archlinux)
|
|
||||||
;;
|
|
||||||
"sayaka")
|
|
||||||
plugins+=(archlinux)
|
|
||||||
;;
|
|
||||||
"git")
|
|
||||||
plugins+=(debian)
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Install Zulu if needed
|
# Install Zulu if needed
|
||||||
if [[ ! -e ${ZUC}/ZULU_INSTALLED ]]; then
|
if [[ ! -e ${ZUC}/ZULU_INSTALLED ]]; then
|
||||||
source ${DOT}/install_zulu.zsh
|
source ${DOT}/install_zulu.zsh
|
||||||
touch ${ZUC}/ZULU_INSTALLED
|
touch ${ZUC}/ZULU_INSTALLED
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Source the needed Parts
|
|
||||||
|
for file in ${OWN}/files.d/*.zsh; do source $file; done # Aliases
|
||||||
source ${ZUL}/core/zulu # Zulu
|
source ${ZUL}/core/zulu # Zulu
|
||||||
source ${OMZ}/oh-my-zsh.sh # Oh My ZSH
|
|
||||||
for file in ${OWN}/aliases.d/*.zsh; do source $file; done # Aliases
|
|
||||||
|
|
||||||
# Init Zulu
|
# Init Zulu
|
||||||
zulu init
|
zulu init
|
||||||
|
|
||||||
|
source "/usr/share/fzf/completion.zsh"
|
||||||
|
source "/usr/share/fzf/key-bindings.zsh"
|
||||||
|
|
Loading…
Add table
Reference in a new issue