diff --git a/.zshrc b/.zshrc index 60d305ba53d..33e3fed145a 100644 --- a/.zshrc +++ b/.zshrc @@ -13,8 +13,8 @@ source ~/dotfiles/aliases/ls.sh source ~/dotfiles/aliases/maintenance.sh source ~/dotfiles/aliases/meta.sh source ~/dotfiles/aliases/network.sh -source ~/dotfiles/aliases/servers.sh source ~/dotfiles/aliases/scripts.sh +source ~/dotfiles/aliases/servers.sh source ~/dotfiles/aliases/shortcuts.sh # Utilities diff --git a/aliases/cli.sh b/aliases/cli.sh index 613beeed355..7542427a5e2 100644 --- a/aliases/cli.sh +++ b/aliases/cli.sh @@ -3,7 +3,7 @@ alias ..="cd .." alias ...="cd ../.." alias ....="cd ../../.." alias .....="cd ../../../.." -alias dev='cd ~/dev' +alias dev="cd ~/dev " # Enable aliases to be sudo’ed alias sudo='sudo ' diff --git a/aliases/git.sh b/aliases/git.sh index 9997a971021..d8edd3d5842 100644 --- a/aliases/git.sh +++ b/aliases/git.sh @@ -15,5 +15,8 @@ alias gwr="git worktree remove" alias gwl="git worktree list" alias gup="git fetch origin && git merge origin/main" + + + git config --global user.name "Bruno Bergher" git config --global user.email me@brunobergher.com \ No newline at end of file diff --git a/bootstrap.sh b/bootstrap.sh index 5894c6c22f2..c71bd0d9915 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,27 +1,13 @@ #!/usr/bin/env bash +echo "Bootstrapping dotfiles…"; cd "$(dirname "${BASH_SOURCE}")"; - -git pull origin main; - -function doIt() { - rsync --exclude ".git/" \ - --exclude ".DS_Store" \ - --exclude ".osx" \ - --exclude "bootstrap.sh" \ - --exclude "README.md" \ - --exclude "LICENSE-MIT.txt" \ - -avh --no-perms . ~; - source ~/.bash_profile; -} - -if [ "$1" == "--force" -o "$1" == "-f" ]; then - doIt; -else - read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1; - echo ""; - if [[ $REPLY =~ ^[Yy]$ ]]; then - doIt; - fi; -fi; -unset doIt; +rsync --exclude ".git/" \ + --exclude ".DS_Store" \ + --exclude ".osx" \ + --exclude "bootstrap.sh" \ + --exclude "README.md" \ + --exclude "LICENSE-MIT.txt" \ + -avh --no-perms . ~ > /dev/null; +source ~/.zshrc; +echo "Done. Start a new terminal session to see the changes."; \ No newline at end of file