diff --git a/.config/nvim/ftdetect/extensions.vim b/.config/nvim/ftdetect/extensions.vim index 7bd294e1..dd101f0e 100644 --- a/.config/nvim/ftdetect/extensions.vim +++ b/.config/nvim/ftdetect/extensions.vim @@ -1,2 +1,3 @@ au BufRead,BufNewFile *.arb set filetype=json +au BufRead,BufNewFile Brewfile set filetype=ruby diff --git a/README.md b/README.md index 0e00490a..b057bbe2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## How to install -1. Install [Oh-My-Zsh](https://github.com/ohmyzsh/ohmyzsh) +1. Install zsh 2. Clone this repository into `~/.dotfiles`: ```bash @@ -19,12 +19,5 @@ ```bash home install - home reload + home reload-terminal ``` - -## TO DO - -- [x] Make next template incremental (`yarn create next-app` + copy rest of tpl) -- [x] Make CRA template (same) -- [ ] Improve generic user store/api login flow in template -- [ ] Nvim Tree - use Ctrl-E to run `:NvimTreeFindFile` only in appropriate panes diff --git a/scripts/home/home.sh b/scripts/home/home.sh index 0b9bb7ac..59c13e2a 100644 --- a/scripts/home/home.sh +++ b/scripts/home/home.sh @@ -36,7 +36,7 @@ home() { reload-zsh fi ;; - reload-term | rt) + reload-term(inal)? | rt) reload-zsh return 0 ;; @@ -47,35 +47,35 @@ home() { install | i) source $DOTFILES/install.sh ;; - # dropzone | dz) - # shift - # dz_lib="$HOME/Library/Application Support/Dropzone" - # dz_bak="$DOTFILES/synced/Dropzone" - # sub="$1" + dropzone | dz) + shift + dz_lib="$HOME/Library/Application Support/Dropzone" + dz_bak="$DOTFILES/synced/Dropzone" + sub="$1" - # case $sub in - # r | restore) - # echo_cyan "Restoring Dropzone backup..." - # src="$dz_bak" - # target="$dz" - # mkdir -p $target - # cp -r $src/* $target - # ;; - # d | dump) - # echo_cyan "Creating Dropzone backup..." - # target="$dz_bak" - # src="$dz" - # rm -rf $target - # mkdir -p $target - # cp -r $src/* $target - # ;; - # *) # unknown option - # echo_red "No command or invalid command supplied." - # __home_print_help 0 - # return 1 - # ;; - # esac - # ;; + case $sub in + r | restore) + echo_cyan "Restoring Dropzone backup..." + src="$dz_bak" + target="$dz" + mkdir -p $target + rsync -tvr --exclude ".git" --exclude "node_modules" --no-links $src/* $target + ;; + d | dump) + echo_cyan "Creating Dropzone backup..." + target="$dz_bak" + src="$dz" + rm -rf $target + mkdir -p $target + rsync -tvr --exclude ".git" --exclude "node_modules" --no-links $src/* $target + ;; + *) # unknown option + echo_red "No command or invalid command supplied." + __home_print_help 0 + return 1 + ;; + esac + ;; workflows | w) shift __home_prepare_dir @@ -107,43 +107,6 @@ home() { ;; esac ;; - motd | m) - shift - sub="$1" - case $sub in - edit | e) - if [[ "$2" == "head" ]]; then - vim $DOTFILES/synced/motd/motd.head && home motd restore - return 0 - else - vim $DOTFILES/synced/motd/motd && home motd restore - fi - ;; - dump | d) - echo_cyan "Creating motd backup..." - cat /etc/motd.head >$DOTFILES/synced/motd/motd.head - cat /etc/motd >$DOTFILES/synced/motd/motd - ;; - restore | r) - echo_cyan "Restoring motd backup..." - cat $DOTFILES/synced/motd/motd >/etc/motd - cat $DOTFILES/synced/motd/motd.head >/etc/motd.head - if [[ "$?" -ne 0 ]]; then - echo_red "Failed to restore motd. Trying to fix permissions... needs root access" - sudo chmod 0766 /etc/motd - sudo chmod 0766 /etc/motd.head - fi - scp $DOTFILES/synced/motd/09-head root@spider.casraf.dev:/etc/update-motd.d/09-head - ssh root@spider.casraf.dev "chmod 0755 /etc/update-motd.d/09-head" - scp /etc/motd.head root@spider.casraf.dev:/etc/motd.head - scp /etc/motd root@spider.casraf.dev:/etc/motd - ;; - *) - lolcat /etc/motd.head - cat /etc/motd - ;; - esac - ;; help | -h | h) shift __home_print_help $@ diff --git a/zsh_init.sh b/zsh_init.sh index bb16dca3..077e68ee 100755 --- a/zsh_init.sh +++ b/zsh_init.sh @@ -14,8 +14,8 @@ source ~/.zplug/init.zsh zplug "$DOTFILES/plugins", from:local zplug "mfaerevaag/wd", as:command, use:"wd.sh", hook-load:"wd() { . $ZPLUG_REPOS/mfaerevaag/wd/wd.sh }" -zplug romkatv/powerlevel10k, as:theme, depth:1 -zplug zsh-users/zsh-autosuggestions +zplug "romkatv/powerlevel10k", as:theme, depth:1 +zplug "zsh-users/zsh-autosuggestions" zplug load