changed around some paths
This commit is contained in:
parent
95fdff6021
commit
de8bacbf15
5 changed files with 23 additions and 35 deletions
|
@ -98,4 +98,4 @@
|
||||||
detachedHead = false
|
detachedHead = false
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
excludesfile = ~/.gitignore_global
|
excludesfile = ~/dotfiles/git/gitignore_global
|
||||||
|
|
|
@ -1,18 +1,13 @@
|
||||||
- clean: ['~', '~/.config']
|
- clean: ['~']
|
||||||
|
|
||||||
- link:
|
- link:
|
||||||
~/.dotfiles: ''
|
|
||||||
~/bin: bin
|
~/bin: bin
|
||||||
~/utils: sysadmin-util
|
~/utils: sysadmin-util
|
||||||
~/.fzf: lib/fzf
|
~/.fzf: lib/fzf
|
||||||
~/.nano: lib/nano/syntax
|
~/.nano: lib/nano/syntax
|
||||||
~/.nanorc: lib/nano/syntax/nanorc
|
~/.nanorc: lib/nano/syntax/nanorc
|
||||||
~/.dircolors: zsh/dircolors
|
|
||||||
~/.gitconfig: git/gitconfig
|
~/.gitconfig: git/gitconfig
|
||||||
~/.gitignore_global: git/gitignore_global
|
|
||||||
~/.zsh: zsh
|
|
||||||
~/.zshrc: zsh/zshrc
|
~/.zshrc: zsh/zshrc
|
||||||
~/.inputrc: zsh/inputrc
|
|
||||||
|
|
||||||
- shell:
|
- shell:
|
||||||
- git update-submodules # after linking ~/.gitconfig
|
- git update-submodules # after linking ~/.gitconfig
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
# Listing
|
# Listing
|
||||||
source ~/.zsh/aliases.d/list.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/list.zsh
|
||||||
|
|
||||||
# Grep
|
# Grep
|
||||||
source ~/.zsh/aliases.d/grep.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/grep.zsh
|
||||||
|
|
||||||
# Tail
|
# Tail
|
||||||
source ~/.zsh/aliases.d/tail.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/tail.zsh
|
||||||
|
|
||||||
# CD
|
# CD
|
||||||
source ~/.zsh/aliases.d/cd.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/cd.zsh
|
||||||
|
|
||||||
# Du/Find
|
# Du/Find
|
||||||
source ~/.zsh/aliases.d/find.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/find.zsh
|
||||||
|
|
||||||
# Stuff
|
# Stuff
|
||||||
source ~/.zsh/aliases.d/stuff.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/stuff.zsh
|
||||||
|
|
||||||
# Interactive
|
# Interactive
|
||||||
source ~/.zsh/aliases.d/interactive.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/interactive.zsh
|
||||||
|
|
||||||
# Own
|
# Own
|
||||||
source ~/.zsh/aliases.d/own.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/own.zsh
|
||||||
|
|
||||||
# Transfer
|
# Transfer
|
||||||
source ~/.zsh/aliases.d/transfer.zsh
|
source ${HOME}/dotfiles/zsh/aliases.d/transfer.zsh
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
"\e[1~": beginning-of-line
|
|
||||||
"\e[4~": end-of-line
|
|
29
zsh/zshrc
29
zsh/zshrc
|
@ -1,5 +1,5 @@
|
||||||
# Oh My ZSH Path
|
# Oh My ZSH Path
|
||||||
export ZSH=${HOME}/.dotfiles/lib/ohmyzsh
|
export ZSH=${HOME}/dotfiles/lib/ohmyzsh
|
||||||
|
|
||||||
# Oh My ZSH Theme
|
# Oh My ZSH Theme
|
||||||
ZSH_THEME="pygmalion"
|
ZSH_THEME="pygmalion"
|
||||||
|
@ -25,32 +25,27 @@ export EDITOR='nano'
|
||||||
# Load Oh My ZSH
|
# Load Oh My ZSH
|
||||||
source ${ZSH}/oh-my-zsh.sh
|
source ${ZSH}/oh-my-zsh.sh
|
||||||
|
|
||||||
|
# Fix home/end key
|
||||||
|
bindkey "^[[1~" beginning-of-line
|
||||||
|
bindkey "^[[4~" end-of-line
|
||||||
|
|
||||||
# Source k.sh
|
# Source k.sh
|
||||||
source ${HOME}/.dotfiles/lib/k/k.sh
|
source ${HOME}/dotfiles/lib/k/k.sh
|
||||||
|
|
||||||
# Shell Syntax Highlighter
|
# Shell Syntax Highlighter
|
||||||
source ${HOME}/.dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
|
source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
|
||||||
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
|
||||||
|
|
||||||
# CD without typing cd
|
|
||||||
setopt autocd
|
|
||||||
|
|
||||||
# History
|
|
||||||
setopt histsavenodups
|
|
||||||
setopt histverify
|
|
||||||
setopt histignorealldups
|
|
||||||
setopt extendedhistory
|
|
||||||
setopt histreduceblanks
|
|
||||||
export HISTSIZE=1000000 SAVEHIST=1000000 HISTFILE=${HOME}/.zhistory
|
|
||||||
|
|
||||||
# Dircolors
|
# Dircolors
|
||||||
eval `dircolors ${HOME}/.dircolors`
|
eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
|
||||||
|
|
||||||
# Source Aliases
|
# Source Aliases
|
||||||
source ${HOME}/.zsh/alias.zsh
|
source ${HOME}/dotfiles/zsh/alias.zsh
|
||||||
|
|
||||||
# Source FZF
|
# Source FZF
|
||||||
[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
|
[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
|
||||||
|
|
||||||
# Completions Path
|
# Completions Path
|
||||||
fpath=(${HOME}/.dotfiles/lib/completions/src $fpath)
|
fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
|
||||||
|
|
||||||
|
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||||
|
|
Loading…
Add table
Reference in a new issue