X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/689ef0c28b29c7a16ad7e2f32591d429e777280c..39dc9bbd81403df600f79ba66d50fcf254ba9355:/setup_cli_basics.sh?ds=inline

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 10bb145..01f1330 100755
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -5,15 +5,12 @@ 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
@@ -22,14 +19,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_rsa ]; then
+if [ ! -f ~/.ssh/id_ed25519 ]; then
 	echo "************** Generate an SSH key"
-	ssh-keygen
+	ssh-keygen -t ed25519
 
 	echo "************** Reminder to setup GitHub key"
-	cat GitHubKey.md
+	cat ~/dotfiles/doc/GitHubKey.md
 	cat ~/.ssh/id_rsa.pub
 fi