diff options
| author | Alan Pearce | 2016-11-04 19:18:24 +0100 |
|---|---|---|
| committer | Alan Pearce | 2016-11-04 19:18:24 +0100 |
| commit | c96e914059715e05d6bcef50f53ee048f088bd92 (patch) | |
| tree | c624f743c96ca50a66224a7b9180b1bc66ab31ed /hooks | |
| parent | c9a5e8b8a412daa6160e0d6d64c40bd978a7259b (diff) | |
| parent | d18942af3be0ee634695630e2e0b17a3f12fd815 (diff) | |
| download | nixfiles-c96e914059715e05d6bcef50f53ee048f088bd92.tar.lz nixfiles-c96e914059715e05d6bcef50f53ee048f088bd92.tar.zst nixfiles-c96e914059715e05d6bcef50f53ee048f088bd92.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'hooks')
| -rwxr-xr-x | hooks/post-up/emacs | 6 | ||||
| -rwxr-xr-x | hooks/post-up/zsh | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/hooks/post-up/emacs b/hooks/post-up/emacs index aad74be7..cb9c0916 100755 --- a/hooks/post-up/emacs +++ b/hooks/post-up/emacs @@ -2,8 +2,8 @@ if [[ -s $commands[emacs] ]] then - pushd ~/.emacs.d - emacs --batch --eval "(progn + pushd ~/.emacs.d + emacs --batch --eval "(progn (setq vc-follow-symlinks nil) (find-file \"init.org\") (require 'ob-tangle) @@ -11,5 +11,5 @@ then (byte-compile-file \"init.el\") (load-file \"init.el\") )" - popd + popd fi diff --git a/hooks/post-up/zsh b/hooks/post-up/zsh index b7a7d4a2..3eef6e51 100755 --- a/hooks/post-up/zsh +++ b/hooks/post-up/zsh @@ -4,26 +4,26 @@ ZDOTDIR="${XDG_CONFIG_HOME:=~/.config}/zsh" pushd $ZDOTDIR for f in z*(-.) do - if [[ -e .$f ]] - then - if [[ ! -h .$f ]] - then - echo ".$f already exists as a regular file, ignoring" - fi - else - ln -s $f .$f - fi + if [[ -e .$f ]] + then + if [[ ! -h .$f ]] + then + echo ".$f already exists as a regular file, ignoring" + fi + else + ln -s $f .$f + fi done popd if [[ ! -d ~/.cache/zsh ]] then - mkdir -p ~/.cache/zsh + mkdir -p ~/.cache/zsh fi if [[ -z $commands[zplug] && ! -d ~/projects/zplug/ ]] then - git clone git://github.com/zplug/zplug ~/projects/zplug/ + git clone git://github.com/zplug/zplug ~/projects/zplug/ fi zsh -ic "zplug install" |