X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/9fd6e9735985c9c4576b610d4c1c3bf5f814d387..580696958d8e495562caff49efb702d5d3ec1787:/setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index b137b47..46da273 100755
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -3,22 +3,19 @@ if [ ! -d ~/dotfiles ]; then
 	cd ~; git clone git@github.com:edthedev/dotfiles.git
 fi
 
-if [ ! -f ~/.ssh/id_rsa ]; then
-	echo "************** Generate an SSH key"
-	ssh-keygen
+if [ ! -f ~/.bashrc ]; then
+	echo "************** Setup Bash"
+	~/dotfiles/setup/bash.sh
 fi
 
 if [ ! -f ~/.screenrc ]; then
 	echo "************** Setup Screen"
-	ln -s ~/dotfiles/screenrc ~/.screenrc
-fi
-
-if [ ! -f ~/.vimrc ]; then
-	echo "************** Link Vimrc"
-	ln -s ~/dotfiles/vimrc ~/.vimrc
+	ln -s ~/dotfiles/files/screenrc ~/.screenrc
 fi
 
 if [ -f ~/.vimrc ]; then
+	echo "************** Link Vimrc"
+	ln -s ~/dotfiles/files/vimrc ~/.vimrc
 	echo "************** Configure Git to use Vim"
 	git config --global core.editor /usr/bin/vim
 fi
@@ -27,8 +24,15 @@ if [ -f ~/.gitconfig ]; then
 	echo "************** Configure Git user"
 	git config --global user.email "edward@delaporte.us"
 	git config --global user.name "Edward Delaporte"
+	git config --global pull.ff only
+fi
+
+if [ ! -f ~/.ssh/id_ed25519 ]; then
+	echo "************** Generate an SSH key"
+	ssh-keygen -t ed25519
+
+	echo "************** Reminder to setup GitHub key"
+	cat ~/dotfiles/doc/GitHubKey.md
+	cat ~/.ssh/id_rsa.pub
 fi
 
-echo "************** Reminder to setup GitHub key"
-cat GitHubKey.md
-cat ~/.ssh/id_rsa.pub