matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vdesktop/master'

Browse Source
This commit is contained in:
David Tomaschik
2018-01-27 10:31:51 -08:00
parent d9ae2ca974 db007ad604
commit 0431c83423
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dotfiles/aliases
View File

@@ -8,10 +8,13 @@ alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo
alias luksFormat='cryptsetup luksFormat -s 512 -c aes-xts-plain64 -h sha256 -i 15000' alias luksFormat='cryptsetup luksFormat -s 512 -c aes-xts-plain64 -h sha256 -i 15000'
# Colors # Colors
alias ls='ls --color=auto' if [ `uname` != 'Darwin' ] ; then
alias grep='grep --color=auto' # Should have a better way to check for GNU versions
alias egrep='egrep --color=auto' alias ls='ls --color=auto'
alias fgrep='fgrep --color=auto' alias grep='grep --color=auto'
alias egrep='egrep --color=auto'
alias fgrep='fgrep --color=auto'
fi
# Easy upgrade # Easy upgrade
alias dist-upgrade="sudo sh -c 'apt-get update && apt-get -y dist-upgrade'" alias dist-upgrade="sudo sh -c 'apt-get update && apt-get -y dist-upgrade'"

10
dotfiles/zshrc
View File

@@ -20,9 +20,13 @@ esac
autoload -U colors && colors autoload -U colors && colors
PS1="%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[white]%}%#%{$reset_color%} " PS1="%{$fg[black]%}[%{$fg[yellow]%}%h%{$fg[black]%}] %{%(!.$fg[red].$fg[green])%}%8>..>%n%>>%{$fg[white]%}@%{$fg[blue]%}%12>..>%m%>>%{$fg[white]%}:%{$fg[green]%}%32<...<%~%<<%{$fg[white]%}%#%{$reset_color%} "
# LS Colors if [ `uname` != 'Darwin' ] ; then
alias ls='ls --color' # ls Colors
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} alias ls='ls --color'
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
else
alias ls='ls -G'
fi
# Load oh-my-zsh # Load oh-my-zsh
if [ -d $HOME/.oh-my-zsh ] ; then if [ -d $HOME/.oh-my-zsh ] ; then

11
install.sh
View File

@@ -3,6 +3,13 @@
set -o nounset set -o nounset
set -o errexit set -o errexit
FINDTYPE="-xtype"
if [ `uname` == 'Darwin' ] ; then
# MacOS specifics
FINDTYPE="-type"
fi
function prerequisites { function prerequisites {
if which zsh > /dev/null 2>&1 ; then if which zsh > /dev/null 2>&1 ; then
if [[ $- == *i* ]] ; then if [[ $- == *i* ]] ; then
@@ -30,7 +37,7 @@ function install_dotfile_dir {
-name install.sh -o \ -name install.sh -o \
-name README.md -o \ -name README.md -o \
-name .gitignore \) \ -name .gitignore \) \
-prune -o -xtype f -print | \ -prune -o ${FINDTYPE} f -print | \
while read dotfile ; do while read dotfile ; do
local TARGET="${HOME}/.${dotfile#${SRCDIR}/}" local TARGET="${HOME}/.${dotfile#${SRCDIR}/}"
mkdir -p `dirname "${TARGET}"` mkdir -p `dirname "${TARGET}"`
@@ -42,7 +49,7 @@ function install_basic_dir {
local SRCDIR="${1}" local SRCDIR="${1}"
local DESTDIR="${2}" local DESTDIR="${2}"
local file local file
find "${SRCDIR}" -xtype f -print | \ find "${SRCDIR}" ${FINDTYPE} f -print | \
while read file ; do while read file ; do
local TARGET="${2}/${file#${SRCDIR}/}" local TARGET="${2}/${file#${SRCDIR}/}"
mkdir -p `dirname "${TARGET}"` mkdir -p `dirname "${TARGET}"`