commit 84dcf3b99eb5bed91e50b101bd7012d3d6dded80
parent ad8e116fdb2e964010d9e39ec5dae275e9b0e48a
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Sun, 22 Nov 2015 11:28:28 +0100
Merge branch 'master' of github.com:anders-dc/dotfiles
Diffstat:
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.tmuxinator/cosmo.yml b/.tmuxinator/cosmo.yml
@@ -1,8 +1,8 @@
# ~/.tmuxinator/cosmo.yml
name: cosmo
-#root: ~/src/cosmo/
-root: ~/Sites/cosmo/
+root: ~/src/cosmo/
+#root: ~/Sites/cosmo/
# Optional tmux socket
# socket_name: foo
diff --git a/.zshrc b/.zshrc
@@ -145,7 +145,7 @@ for dir in $pathdirs; do
done
export EDITOR="vim"
-export XDG_CONFIG_HOME="/home/ad/.config"
+#export XDG_CONFIG_HOME="/home/ad/.config"
# Environment variables
export PATH=/usr/local/bin:$PATH
diff --git a/install.sh b/install.sh
@@ -14,6 +14,7 @@ git clone https://github.com/phallus/fonts ~/code/phallus-fonts &&
cd ~/code/phallus-fonts && ./install
mkdir -p ~/.vim/bundle
+mkdir -p ~/.config/nvim/bundle
cd ~/bin && curl -OL https://raw.github.com/richo/battery/master/bin/battery &&\
chmod +x ~/bin/battery
@@ -23,6 +24,7 @@ cd ~/bin && curl -OL https://raw.github.com/richo/battery/master/bin/battery &&\
# Install NeoBundle
git clone https://github.com/Shougo/neobundle.vim ~/.vim/bundle/neobundle.vim
+git clone https://github.com/Shougo/neobundle.vim ~/.config/nvim/bundle/neobundle.vim
# Install Spacemacs
git clone --recursive http://github.com/syl20bnr/spacemacs ~/.emacs.d