diff --git a/README.md b/README.md index b5c877e..816fd3c 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,21 @@ # dotfiles, plus scripts for box setup -### prereqs, linux distros -- zsh is installed (scripts are written for zsh) +### prereqs +- zsh and git installed +- git clone this repo + +#### specific prereqs, linux distros - sudo access is configured for current user -### prereqs, macos -- zsh is installed (scripts are written for zsh) +#### specific prereqs, macos - install the package manager, [homebrew](https://brew.sh/) - for aerospace window manager, have only 1 workspace/desktop - manual settings, refer to [macos-system-settings](ref/macos-system-settings.txt) -### script run -- if repo present on system, run from the repo's root: - - ``` - ./box_setup.sh - ``` -- if repo not present, run: - - ``` - curl -LO https://git.drinkingtea.net/david/box-setup/raw/branch/master/box_setup.sh - sh box_setup.sh - ``` - - then delete the script file afterwards (repo should have been copied to dev dir) +### script run (from repo's root dir) +- to do the full setup, run: `./box_setup.sh ` +- to copy dotfiles only, run: `./copy_dotfiles.sh` + - NOTE: the `copy_dotfiles.sh` script may not work if ENV vars are not set as expected ### todo items - choose window manager for linux, then configure diff --git a/box_setup.sh b/box_setup.sh index 5d19a11..b6c41a9 100755 --- a/box_setup.sh +++ b/box_setup.sh @@ -13,18 +13,6 @@ exit 0 } - -# TODO: test this git stuff, see if it works -temp_placement_git_dir="no" -[[ ! -d ".git" && "$(basename $(pwd))" != "box-setup" ]] && { - temp_placement_git_dir="yes" - git clone "https://git.drinkingtea.net/david/box-setup.git" || { - echo "failed to clone box-setup git repo" - exit 1 - } - pushd box-setup > /dev/null -} - # set env vars for installs install_cmd='' update_pkg_manager_and_defs_cmd='' @@ -61,7 +49,3 @@ source $ZDOTDIR/.zshenv source $ZDOTDIR/.zshrc ./install_programs.sh $2 -[[ $temp_placement_git_dir == "yes" ]] && { - popd > /dev/null - mv "box-setup" "$DIR_GIT_PROJECTS/me/" -} diff --git a/copy_dotfiles.sh b/copy_dotfiles.sh index f4b0a27..15fb5ba 100755 --- a/copy_dotfiles.sh +++ b/copy_dotfiles.sh @@ -48,7 +48,8 @@ copy_dir src_files/.local/scripts $DIR_SCRIPTS link_dir "$XDG_CONFIG_HOME/GIMP" "$HOME/Library/Application Support/GIMP" } -# [[ $1 = "studio-music" ]] && +# [[ $1 = "studio-music" ]] { # [[ "$BOX_SETUP_OS" = "macos" ]] && -# link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" && # TODO: get reaper config set up +# link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" # TODO: get reaper config set up +# }