Add ff only

[dotfiles.git] / setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 10bb145b7e46dd1b1a9f5570dcae93c5e5fcfdcc..547cb90d23d3cf63dee5e428684d38759151f783 100755 (executable)
--- 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,11 +19,12 @@ 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