mirror of
https://git.decapod.one/brethil/dotfiles
synced 2024-11-22 03:21:30 +01:00
Version bump
This commit is contained in:
parent
faf112d855
commit
b4d5787480
|
@ -34,7 +34,7 @@ fi
|
||||||
#### Audible bell
|
#### Audible bell
|
||||||
alias bell='echo -en "\007"'
|
alias bell='echo -en "\007"'
|
||||||
|
|
||||||
alias grep="grep --color=auto"
|
alias grep="grep --colour=yes"
|
||||||
|
|
||||||
##############
|
##############
|
||||||
## ls aliases
|
## ls aliases
|
||||||
|
@ -90,6 +90,7 @@ if [[ "$TERM" != dumb ]] && [[ -f $(which grc) ]] ; then
|
||||||
gcc \
|
gcc \
|
||||||
gmake \
|
gmake \
|
||||||
ifconfig \
|
ifconfig \
|
||||||
|
iptables \
|
||||||
last \
|
last \
|
||||||
ldap \
|
ldap \
|
||||||
make \
|
make \
|
||||||
|
@ -99,6 +100,7 @@ if [[ "$TERM" != dumb ]] && [[ -f $(which grc) ]] ; then
|
||||||
ping \
|
ping \
|
||||||
ping6 \
|
ping6 \
|
||||||
ps \
|
ps \
|
||||||
|
ss \
|
||||||
traceroute \
|
traceroute \
|
||||||
traceroute6 \
|
traceroute6 \
|
||||||
wdiff \
|
wdiff \
|
||||||
|
@ -107,7 +109,7 @@ if [[ "$TERM" != dumb ]] && [[ -f $(which grc) ]] ; then
|
||||||
# Set alias for available commands.
|
# Set alias for available commands.
|
||||||
for cmd in $cmds ; do
|
for cmd in $cmds ; do
|
||||||
if [[ -f $(which $cmd) ]] ; then
|
if [[ -f $(which $cmd) ]] ; then
|
||||||
alias $cmd="grc --colour=auto $cmd"
|
alias $cmd="grc --colour=on $cmd"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT DOTFILES=$DOTFILES zsh -f $DOTFILES/check_for_update.sh
|
env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT DOTFILES=$DOTFILES zsh -f $DOTFILES/check_for_update.sh
|
||||||
|
|
||||||
# oh-my-zsh plugins (some of these have to be installed by running install.sh or install_zsh_plugins, found in install.sh)
|
# oh-my-zsh plugins (some of these have to be installed by running install.sh or install_zsh_plugins, found in install.sh)
|
||||||
shared_plugins=(git alias-tips sudo common-aliases fast-syntax-highlighting zsh-autosuggestions colored-man-pages zsh-navigation-tools zsh_reload )
|
shared_plugins=(git alias-tips sudo common-aliases fast-syntax-highlighting zsh-autosuggestions colored-man-pages zsh-navigation-tools zsh_reload themes )
|
||||||
|
|
||||||
uname=$(uname -a)
|
uname=$(uname -a)
|
||||||
if [[ $uname == *"Darwin"* ]]; then
|
if [[ $uname == *"Darwin"* ]]; then
|
||||||
|
|
18
functions.sh
18
functions.sh
|
@ -21,7 +21,12 @@ function dotfiles_selfupdate
|
||||||
## get cheat sheets for commands from cheat.sh. Usage: cheat commandname
|
## get cheat sheets for commands from cheat.sh. Usage: cheat commandname
|
||||||
function cheat
|
function cheat
|
||||||
{
|
{
|
||||||
curl cheat.sh/$1
|
curl "cheat.sh/$1"
|
||||||
|
}
|
||||||
|
# get cheat sheets for commands matching $1
|
||||||
|
function cheatall
|
||||||
|
{
|
||||||
|
curl "cheat.sh/~$1"
|
||||||
}
|
}
|
||||||
## Simple calculator. Usage: calc 1+1, calc 5/7, calc "sqrt(2)"
|
## Simple calculator. Usage: calc 1+1, calc 5/7, calc "sqrt(2)"
|
||||||
function calc
|
function calc
|
||||||
|
@ -216,6 +221,17 @@ function nman
|
||||||
}
|
}
|
||||||
fi # end of mac-specific functions
|
fi # end of mac-specific functions
|
||||||
|
|
||||||
|
# Force update git repo from origin/master# Force update git repo from origin/master# Force update git repo from origin/master
|
||||||
|
function gitupdate(){
|
||||||
|
git fetch --all
|
||||||
|
git reset --hard origin/master
|
||||||
|
}
|
||||||
|
|
||||||
|
function pipupdate(){
|
||||||
|
for pip in pip2 pip2; do
|
||||||
|
$pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 $pip install -U
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
if [[ -f ~/.dotfiles_functions ]]; then
|
if [[ -f ~/.dotfiles_functions ]]; then
|
||||||
source ~/.dotfiles_functions
|
source ~/.dotfiles_functions
|
||||||
|
|
|
@ -34,9 +34,11 @@ function install_vimrc {
|
||||||
git clone https://github.com/amix/vimrc.git $HOME/.vim_runtime && sh $HOME/.vim_runtime/install_awesome_vimrc.sh || return -1
|
git clone https://github.com/amix/vimrc.git $HOME/.vim_runtime && sh $HOME/.vim_runtime/install_awesome_vimrc.sh || return -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function install_zsh_plugins {
|
function install_zsh_plugins {
|
||||||
# Install fast-syntax-highlighting (git: zdharma), zsh-autosuggestions (git:zsh-users)
|
# Install fast-syntax-highlighting (git: zdharma), zsh-autosuggestions (git:zsh-users)
|
||||||
ZSH_PLUGINS="$HOME/.oh-my-zsh/custom/plugins"
|
ZSH_PLUGINS="$HOME/.oh-my-zsh/custom/plugins"
|
||||||
|
mkdir -p $ZSH_PLUGINS
|
||||||
git clone https://github.com/zdharma/fast-syntax-highlighting.git ${ZSH_PLUGINS}/fast-syntax-highlighting || error=true
|
git clone https://github.com/zdharma/fast-syntax-highlighting.git ${ZSH_PLUGINS}/fast-syntax-highlighting || error=true
|
||||||
git clone git://github.com/zsh-users/zsh-autosuggestions ${ZSH_PLUGINS}/zsh-autosuggestions || error=true
|
git clone git://github.com/zsh-users/zsh-autosuggestions ${ZSH_PLUGINS}/zsh-autosuggestions || error=true
|
||||||
if [[ $error ]]; then
|
if [[ $error ]]; then
|
||||||
|
@ -205,9 +207,9 @@ function brethil_dotfiles_setup {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Symlink brethil.zsh-theme
|
# Symlink brethil.zsh-theme
|
||||||
ln -s $DOTFILES/brethil.zsh-theme $HOME/.oh-my-zsh/themes/
|
ln -s $DOTFILES/brethil.zsh-theme $HOME/.oh-my-zsh/custom/
|
||||||
# Symlink brethil-minimal.zsh-theme
|
# Symlink brethil-minimal.zsh-theme
|
||||||
ln -s $DOTFILES/brethil-minimal.zsh-theme $HOME/.oh-my-zsh/themes/
|
ln -s $DOTFILES/brethil-minimal.zsh-theme $HOME/.oh-my-zsh/custom/
|
||||||
|
|
||||||
# Set brethil theme
|
# Set brethil theme
|
||||||
if [[ $(uname) == "Darwin" ]]; then # MacOS has a different syntax for sed
|
if [[ $(uname) == "Darwin" ]]; then # MacOS has a different syntax for sed
|
||||||
|
|
Loading…
Reference in New Issue
Block a user