From 7d8493f63daf93beb4c82d0c9602fc21974daca7 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Fri, 1 Nov 2013 07:49:20 +0000 Subject: zsh: rename auxillary files with extension --- install | 8 ++++---- zsh/freebsd.zsh | 8 ++++++++ zsh/gentoo.zsh | 4 ++++ zsh/prefect.zsh | 10 ++++++++++ zsh/server.zsh | 20 ++++++++++++++++++++ zsh/sheldon.zsh | 5 +++++ zsh/st.zsh | 2 ++ zsh/zshrc_freebsd | 8 -------- zsh/zshrc_gentoo | 4 ---- zsh/zshrc_prefect | 10 ---------- zsh/zshrc_server | 20 -------------------- zsh/zshrc_sheldon | 5 ----- zsh/zshrc_st | 2 -- 13 files changed, 53 insertions(+), 53 deletions(-) create mode 100755 zsh/freebsd.zsh create mode 100644 zsh/gentoo.zsh create mode 100644 zsh/prefect.zsh create mode 100644 zsh/server.zsh create mode 100644 zsh/sheldon.zsh create mode 100644 zsh/st.zsh delete mode 100755 zsh/zshrc_freebsd delete mode 100644 zsh/zshrc_gentoo delete mode 100644 zsh/zshrc_prefect delete mode 100644 zsh/zshrc_server delete mode 100644 zsh/zshrc_sheldon delete mode 100644 zsh/zshrc_st diff --git a/install b/install index 13ee6cc..74cf8c4 100755 --- a/install +++ b/install @@ -51,14 +51,14 @@ zfiles=( $fasd_cache $target/zsh/zshrc ) -if [[ -f $target/zsh/zshrc_${HOST%%.*} ]]; then - zfiles+=$target/zsh/zshrc_${HOST%%.*} +if [[ -f $target/zsh/${HOST%%.*}.zsh ]]; then + zfiles+=$target/zsh/${HOST%%.*}.zsh fi if [[ -e /usr/bin/emerge ]]; then - zfiles+=$target/zsh/zshrc_gentoo + zfiles+=$target/zsh/gentoo.zsh fi if [[ $OSTYPE == freebsd* ]]; then - zfiles+=$target/zsh/zshrc_freebsd + zfiles+=$target/zsh/freebsd.zsh fi zrecompile -p -R ~/.zshrc.zwc $zfiles diff --git a/zsh/freebsd.zsh b/zsh/freebsd.zsh new file mode 100755 index 0000000..6261261 --- /dev/null +++ b/zsh/freebsd.zsh @@ -0,0 +1,8 @@ +#!/usr/bin/env zsh +function update-check () { + sudo portsnap update + sudo portmaster -L --index-only | awk '/ [Nn]ew / { print substr($0,9,9999) }' + sudo portaudit -Fa -X 1 + pkg_updating -d $( ls -ltr -D '%Y%m%d' /var/db/pkg | awk 'END{print $6}' ) +} +alias iotop="top -m io -o total" diff --git a/zsh/gentoo.zsh b/zsh/gentoo.zsh new file mode 100644 index 0000000..7af5346 --- /dev/null +++ b/zsh/gentoo.zsh @@ -0,0 +1,4 @@ +#Distributed merge +dmerge () { + MAKEOPTS='-j10' FEATURES='ccache distcc' emerge "$@" +} \ No newline at end of file diff --git a/zsh/prefect.zsh b/zsh/prefect.zsh new file mode 100644 index 0000000..997ba39 --- /dev/null +++ b/zsh/prefect.zsh @@ -0,0 +1,10 @@ +EDITOR="emacs" +VISUAL="emacs" + +if [[ ! -S $SSH_AUTH_SOCK ]] +then + eval `ssh-agent | sed -e '/^echo/d'` + linkAuthSock $SSH_AUTH_SOCK +fi + +export WINEARCH="win32" \ No newline at end of file diff --git a/zsh/server.zsh b/zsh/server.zsh new file mode 100644 index 0000000..d9d7421 --- /dev/null +++ b/zsh/server.zsh @@ -0,0 +1,20 @@ +# -*- shell-script -*- + +export SVDIR=/service +if [[ "$EUID" == "0" ]] || [[ "$USER" == "root" ]] +then + export EDITOR="emacs -nw" +else + export ALTERNATE_EDITOR="emacs" + export EDITOR="emacsclient" +fi + +mailpath= + +# Folder aliases +hash -d music=/tank/media/Music + +zstyle ':completion:*' local server /tank/www/internal '' +zstyle ':completion:*' local external /tank/www/external +zstyle ':completion:*' local alphapulsar.uk.to /tank/www/gaming +zstyle ':completion:*' local home.alanpearce.co.uk /tank/www/external diff --git a/zsh/sheldon.zsh b/zsh/sheldon.zsh new file mode 100644 index 0000000..6168bae --- /dev/null +++ b/zsh/sheldon.zsh @@ -0,0 +1,5 @@ +if [[ ! -S $SSH_AUTH_SOCK ]] +then + eval `ssh-agent | sed -e '/^echo/d'` + linkAuthSock $SSH_AUTH_SOCK +fi diff --git a/zsh/st.zsh b/zsh/st.zsh new file mode 100644 index 0000000..a449ef9 --- /dev/null +++ b/zsh/st.zsh @@ -0,0 +1,2 @@ +hash -d tf=/opt/steam/orangebox/tf +hash -d sv=/etc/sv/tf2 \ No newline at end of file diff --git a/zsh/zshrc_freebsd b/zsh/zshrc_freebsd deleted file mode 100755 index 6261261..0000000 --- a/zsh/zshrc_freebsd +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env zsh -function update-check () { - sudo portsnap update - sudo portmaster -L --index-only | awk '/ [Nn]ew / { print substr($0,9,9999) }' - sudo portaudit -Fa -X 1 - pkg_updating -d $( ls -ltr -D '%Y%m%d' /var/db/pkg | awk 'END{print $6}' ) -} -alias iotop="top -m io -o total" diff --git a/zsh/zshrc_gentoo b/zsh/zshrc_gentoo deleted file mode 100644 index 7af5346..0000000 --- a/zsh/zshrc_gentoo +++ /dev/null @@ -1,4 +0,0 @@ -#Distributed merge -dmerge () { - MAKEOPTS='-j10' FEATURES='ccache distcc' emerge "$@" -} \ No newline at end of file diff --git a/zsh/zshrc_prefect b/zsh/zshrc_prefect deleted file mode 100644 index 997ba39..0000000 --- a/zsh/zshrc_prefect +++ /dev/null @@ -1,10 +0,0 @@ -EDITOR="emacs" -VISUAL="emacs" - -if [[ ! -S $SSH_AUTH_SOCK ]] -then - eval `ssh-agent | sed -e '/^echo/d'` - linkAuthSock $SSH_AUTH_SOCK -fi - -export WINEARCH="win32" \ No newline at end of file diff --git a/zsh/zshrc_server b/zsh/zshrc_server deleted file mode 100644 index d9d7421..0000000 --- a/zsh/zshrc_server +++ /dev/null @@ -1,20 +0,0 @@ -# -*- shell-script -*- - -export SVDIR=/service -if [[ "$EUID" == "0" ]] || [[ "$USER" == "root" ]] -then - export EDITOR="emacs -nw" -else - export ALTERNATE_EDITOR="emacs" - export EDITOR="emacsclient" -fi - -mailpath= - -# Folder aliases -hash -d music=/tank/media/Music - -zstyle ':completion:*' local server /tank/www/internal '' -zstyle ':completion:*' local external /tank/www/external -zstyle ':completion:*' local alphapulsar.uk.to /tank/www/gaming -zstyle ':completion:*' local home.alanpearce.co.uk /tank/www/external diff --git a/zsh/zshrc_sheldon b/zsh/zshrc_sheldon deleted file mode 100644 index 6168bae..0000000 --- a/zsh/zshrc_sheldon +++ /dev/null @@ -1,5 +0,0 @@ -if [[ ! -S $SSH_AUTH_SOCK ]] -then - eval `ssh-agent | sed -e '/^echo/d'` - linkAuthSock $SSH_AUTH_SOCK -fi diff --git a/zsh/zshrc_st b/zsh/zshrc_st deleted file mode 100644 index a449ef9..0000000 --- a/zsh/zshrc_st +++ /dev/null @@ -1,2 +0,0 @@ -hash -d tf=/opt/steam/orangebox/tf -hash -d sv=/etc/sv/tf2 \ No newline at end of file -- cgit 1.4.1