diff --git a/git/.config/git/config b/git/git/config similarity index 100% rename from git/.config/git/config rename to git/git/config diff --git a/git/.config/git/gitignore b/git/git/gitignore similarity index 100% rename from git/.config/git/gitignore rename to git/git/gitignore diff --git a/git/setup b/git/setup new file mode 100755 index 0000000..9eea7c3 --- /dev/null +++ b/git/setup @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +mkdir "${HOME}/.config" >/dev/null 2>&1 +ln -sfv "${PWD}/git" "${HOME}/.config" diff --git a/install b/install new file mode 100755 index 0000000..09b7534 --- /dev/null +++ b/install @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +dir="${PWD}" + +cd "${dir}/zsh" && ./setup +cd "${dir}/scripts" && ./setup +cd "${dir}/vim" && ./setup +cd "${dir}/git" && ./setup diff --git a/scripts/.local/scripts/allfigl b/scripts/scripts/allfigl similarity index 100% rename from scripts/.local/scripts/allfigl rename to scripts/scripts/allfigl diff --git a/scripts/.local/scripts/banner b/scripts/scripts/banner similarity index 100% rename from scripts/.local/scripts/banner rename to scripts/scripts/banner diff --git a/scripts/.local/scripts/chmox b/scripts/scripts/chmox similarity index 100% rename from scripts/.local/scripts/chmox rename to scripts/scripts/chmox diff --git a/scripts/.local/scripts/clean_screenshots b/scripts/scripts/clean_screenshots similarity index 100% rename from scripts/.local/scripts/clean_screenshots rename to scripts/scripts/clean_screenshots diff --git a/scripts/.local/scripts/cmt b/scripts/scripts/cmt similarity index 100% rename from scripts/.local/scripts/cmt rename to scripts/scripts/cmt diff --git a/scripts/.local/scripts/dmg b/scripts/scripts/dmg similarity index 100% rename from scripts/.local/scripts/dmg rename to scripts/scripts/dmg diff --git a/scripts/.local/scripts/dots b/scripts/scripts/dots similarity index 100% rename from scripts/.local/scripts/dots rename to scripts/scripts/dots diff --git a/scripts/.local/scripts/duck b/scripts/scripts/duck similarity index 100% rename from scripts/.local/scripts/duck rename to scripts/scripts/duck diff --git a/scripts/.local/scripts/figl b/scripts/scripts/figl similarity index 100% rename from scripts/.local/scripts/figl rename to scripts/scripts/figl diff --git a/scripts/.local/scripts/isosec b/scripts/scripts/isosec similarity index 100% rename from scripts/.local/scripts/isosec rename to scripts/scripts/isosec diff --git a/scripts/.local/scripts/l b/scripts/scripts/l similarity index 100% rename from scripts/.local/scripts/l rename to scripts/scripts/l diff --git a/scripts/.local/scripts/link_apps b/scripts/scripts/link_apps similarity index 100% rename from scripts/.local/scripts/link_apps rename to scripts/scripts/link_apps diff --git a/scripts/.local/scripts/mkcd b/scripts/scripts/mkcd similarity index 100% rename from scripts/.local/scripts/mkcd rename to scripts/scripts/mkcd diff --git a/scripts/.local/scripts/newx b/scripts/scripts/newx similarity index 100% rename from scripts/.local/scripts/newx rename to scripts/scripts/newx diff --git a/scripts/.local/scripts/path b/scripts/scripts/path similarity index 100% rename from scripts/.local/scripts/path rename to scripts/scripts/path diff --git a/scripts/.local/scripts/uncmt b/scripts/scripts/uncmt similarity index 100% rename from scripts/.local/scripts/uncmt rename to scripts/scripts/uncmt diff --git a/scripts/.local/scripts/urlencode b/scripts/scripts/urlencode similarity index 100% rename from scripts/.local/scripts/urlencode rename to scripts/scripts/urlencode diff --git a/scripts/.local/scripts/vic b/scripts/scripts/vic similarity index 100% rename from scripts/.local/scripts/vic rename to scripts/scripts/vic diff --git a/scripts/setup b/scripts/setup new file mode 100755 index 0000000..f1ac203 --- /dev/null +++ b/scripts/setup @@ -0,0 +1,7 @@ +#!/bin/sh + +mkdir "${HOME}/.local" >/dev/null 2>&1 +mkdir "${HOME}/.local/bin" >/dev/null 2>&1 + +ln -sfv "${PWD}/scripts" "${HOME}/.local" + diff --git a/vim/setup b/vim/setup index f57d101..d4b54b5 100755 --- a/vim/setup +++ b/vim/setup @@ -7,7 +7,7 @@ if test -z "$(type vim)"; then exit 1 fi -mkdir "${HOME}/.vim" |true +mkdir "${HOME}/.vim" >/dev/null 2>&1 ln -sfv "${PWD}/.vim/vimrc" "${HOME}/.vim/vimrc" diff --git a/zsh/setup b/zsh/setup index 0eed454..f2c62f4 100755 --- a/zsh/setup +++ b/zsh/setup @@ -1,6 +1,6 @@ #!/bin/sh -mkdir "${HOME}/.config" | true +mkdir "${HOME}/.config" >/dev/null 2>&1 ln -sfv "${PWD}/.zshenv" "${HOME}" ln -sfv "${PWD}/zsh" "${HOME}/.config/zsh" diff --git a/zsh/zsh/history b/zsh/zsh/history index 503b69d..cfcb9ea 100644 --- a/zsh/zsh/history +++ b/zsh/zsh/history @@ -1065,3 +1065,59 @@ exit : 1640985077:0;cd .. : 1640985078:0;gs : 1640985081:0;ga . +: 1640985093:0;gma "Making install scripts instead of stow" +: 1640985111:0;gcm "Making install scripts instead of stow" +: 1640985117:0;gp +: 1640985121:0;g push +: 1640985158:0;dots +: 1640985373:0;shellcheck zsh/setup +: 1640985396:0;dots +: 1640985429:0;shellcheck zsh/setup +: 1640985442:0;cd zsh && ./setup +: 1640985562:0;dots +: 1640985594:0;man mkdir +: 1640985639:0;mkdir zsh >/dev/null +: 1640985707:0;mkdir zsh 2>&1 +: 1640985754:0;mkdir zsh >/dev/null 2>&1 +: 1640985771:0;dots +: 1640985789:0;shellcheck zsh/setup +: 1640985855:0;l +: 1640985894:0;l macOS +: 1640986090:0;l scripts +: 1640986124:0;touch scripts/setup +: 1640986132:0;chmox scripts/setup +: 1640986162:0;echo "# > scripts/setup +: 1640986182:0;echo '#!/bin/sh' > scripts/setup +: 1640986188:0;vim scripts/setup +: 1640986307:0;mv scripts/.local/scripts scripts/ +: 1640986317:0;rm -r scripts/.local +: 1640986322:0;cd scripts +: 1640986327:0;./setup +: 1640986339:0;vim . +: 1640986375:0;shellcheck ./setup +: 1640986378:0;./setup +: 1640986388:0;vim . +: 1640986411:0;./setup +: 1640986442:0;cd $SCRIPTS +: 1640986446:0;cd ../../ +: 1640986455:0;dots +: 1640986548:0;touch install +: 1640986554:0;chmox install +: 1640986561:0;vim . +: 1640986568:0;cd ../ +: 1640986573:0;mv scripts/install . +: 1640986575:0;vim . +: 1640986807:0;mv git/.config/git git/ +: 1640986814:0;rm -r git/.config +: 1640986820:0;chmox git/setup +: 1640986822:0;vim install +: 1640986841:0;install +: 1640986846:0;./install +: 1640986876:0;vim install +: 1640986915:0;./install +: 1640986922:0;vim . +: 1640986954:0;shellcheck vim/setup +: 1640986960:0;shellcheck git/setup +: 1640986970:0;./install +: 1640986984:0;gs +: 1640986996:0;ga . diff --git a/zsh/zsh/zsh b/zsh/zsh/zsh new file mode 120000 index 0000000..dc1a025 --- /dev/null +++ b/zsh/zsh/zsh @@ -0,0 +1 @@ +/Users/michael/.dotfiles/zsh/zsh \ No newline at end of file