diff --git a/aliases b/.aliases similarity index 99% rename from aliases rename to .aliases index ae10f98..53c6fbc 100644 --- a/aliases +++ b/.aliases @@ -189,7 +189,7 @@ alias ls='ls -F --color' alias l='ls -lh' alias ll='ls -lha' -alias aliases='vim ~/.dotfiles/aliases' +alias aliases='vim ~/.aliases' alias al='aliases' if [[ "${platform,,}" == *'ming'* ]]; then diff --git a/bash/bash_profile b/.bash_profile similarity index 100% rename from bash/bash_profile rename to .bash_profile diff --git a/bash/bashrc b/.bashrc similarity index 100% rename from bash/bashrc rename to .bashrc diff --git a/curlrc b/.curlrc similarity index 100% rename from curlrc rename to .curlrc diff --git a/env.loader b/.env.loader similarity index 100% rename from env.loader rename to .env.loader diff --git a/gitconfig b/.gitconfig similarity index 100% rename from gitconfig rename to .gitconfig diff --git a/.gitignore b/.gitignore index 17260ad..72e8ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -vim/.netrwhist -vim/bundle/* -vim/plugged/* -vim/undo -vim/undo/* -vim/autoload/plug.vim.old -config/openbox/lxde-rc.xml -*.pyc -!bin +* diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d7a8ec7..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vim/bundle/Vundle.vim"] - path = vim/bundle/Vundle.vim - url = https://github.com/VundleVim/Vundle.vim.git diff --git a/bash/inputrc b/.inputrc similarity index 100% rename from bash/inputrc rename to .inputrc diff --git a/vim/after/plugin/abolish.vim b/.vim/after/plugin/abolish.vim similarity index 100% rename from vim/after/plugin/abolish.vim rename to .vim/after/plugin/abolish.vim diff --git a/vim/autoload/plug.vim b/.vim/autoload/plug.vim similarity index 100% rename from vim/autoload/plug.vim rename to .vim/autoload/plug.vim diff --git a/vim/colors/campo-dark-blue.vim b/.vim/colors/campo-dark-blue.vim similarity index 100% rename from vim/colors/campo-dark-blue.vim rename to .vim/colors/campo-dark-blue.vim diff --git a/vim/colors/campo-dark-greenish.vim b/.vim/colors/campo-dark-greenish.vim similarity index 100% rename from vim/colors/campo-dark-greenish.vim rename to .vim/colors/campo-dark-greenish.vim diff --git a/vim/colors/campo-dark-grey-blue.vim b/.vim/colors/campo-dark-grey-blue.vim similarity index 100% rename from vim/colors/campo-dark-grey-blue.vim rename to .vim/colors/campo-dark-grey-blue.vim diff --git a/vim/colors/campo-dark-greyscale.vim b/.vim/colors/campo-dark-greyscale.vim similarity index 100% rename from vim/colors/campo-dark-greyscale.vim rename to .vim/colors/campo-dark-greyscale.vim diff --git a/vim/colors/campo-dark-simple.vim b/.vim/colors/campo-dark-simple.vim similarity index 100% rename from vim/colors/campo-dark-simple.vim rename to .vim/colors/campo-dark-simple.vim diff --git a/vim/colors/campo-light-greyscale.vim b/.vim/colors/campo-light-greyscale.vim similarity index 100% rename from vim/colors/campo-light-greyscale.vim rename to .vim/colors/campo-light-greyscale.vim diff --git a/vim/colors/campo-light-simple.vim b/.vim/colors/campo-light-simple.vim similarity index 100% rename from vim/colors/campo-light-simple.vim rename to .vim/colors/campo-light-simple.vim diff --git a/vim/colors/campo-light.vim b/.vim/colors/campo-light.vim similarity index 100% rename from vim/colors/campo-light.vim rename to .vim/colors/campo-light.vim diff --git a/vim/colors/hemisu.vim b/.vim/colors/hemisu.vim similarity index 100% rename from vim/colors/hemisu.vim rename to .vim/colors/hemisu.vim diff --git a/vim/colors/utils b/.vim/colors/utils similarity index 100% rename from vim/colors/utils rename to .vim/colors/utils diff --git a/vim/ftdetect/markdown.vim b/.vim/ftdetect/markdown.vim similarity index 100% rename from vim/ftdetect/markdown.vim rename to .vim/ftdetect/markdown.vim diff --git a/vim/ftdetect/scala.vim b/.vim/ftdetect/scala.vim similarity index 100% rename from vim/ftdetect/scala.vim rename to .vim/ftdetect/scala.vim diff --git a/vim/ftplugin/crontab.vim b/.vim/ftplugin/crontab.vim similarity index 100% rename from vim/ftplugin/crontab.vim rename to .vim/ftplugin/crontab.vim diff --git a/vim/indent/scala.vim b/.vim/indent/scala.vim similarity index 100% rename from vim/indent/scala.vim rename to .vim/indent/scala.vim diff --git a/vim/scripts/scmindent.rkt b/.vim/scripts/scmindent.rkt old mode 100755 new mode 100644 similarity index 100% rename from vim/scripts/scmindent.rkt rename to .vim/scripts/scmindent.rkt diff --git a/vim/snippets/markdown.snippets b/.vim/snippets/markdown.snippets similarity index 100% rename from vim/snippets/markdown.snippets rename to .vim/snippets/markdown.snippets diff --git a/vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add similarity index 98% rename from vim/spell/en.utf-8.add rename to .vim/spell/en.utf-8.add index 61ae8a8..f16398c 100644 --- a/vim/spell/en.utf-8.add +++ b/.vim/spell/en.utf-8.add @@ -271,3 +271,7 @@ memcpy strlen u8 s64 +Sculpey +grey +googly +favour diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl new file mode 100644 index 0000000..8b3617e Binary files /dev/null and b/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/spell/en.utf-8.spl b/.vim/spell/en.utf-8.spl similarity index 100% rename from vim/spell/en.utf-8.spl rename to .vim/spell/en.utf-8.spl diff --git a/vim/spell/en.utf-8.sug b/.vim/spell/en.utf-8.sug similarity index 100% rename from vim/spell/en.utf-8.sug rename to .vim/spell/en.utf-8.sug diff --git a/vim/syntax/markdown.vim b/.vim/syntax/markdown.vim similarity index 100% rename from vim/syntax/markdown.vim rename to .vim/syntax/markdown.vim diff --git a/vim/syntax/scala.vim b/.vim/syntax/scala.vim similarity index 100% rename from vim/syntax/scala.vim rename to .vim/syntax/scala.vim diff --git a/vimrc b/.vimrc similarity index 99% rename from vimrc rename to .vimrc index cc07727..cf7358c 100644 --- a/vimrc +++ b/.vimrc @@ -374,6 +374,8 @@ set complete-=i " Don't scan all included files since it's rea set termguicolors syntax on " Enable highlighting for syntax +let g:netrw_dirhistmax = 0 " Disable netrw + set wildmenu set wildmode=longest,list,full set wildignore+=*/log/*,*.so,*.swp,*.zip,*/rdoc/* @@ -610,10 +612,6 @@ noremap :cnoremap :cnoremap -" Move a line under the cursor. -noremap :m-2 -noremap :m+ - " Window splitting - couldn't figure out how to remap v & n to " & noremap m :vsplit diff --git a/zsh/zlogin b/.zlogin similarity index 100% rename from zsh/zlogin rename to .zlogin diff --git a/zsh/core/func/prompt_grb_setup b/.zsh/func/prompt_grb_setup similarity index 100% rename from zsh/core/func/prompt_grb_setup rename to .zsh/func/prompt_grb_setup diff --git a/zsh/core/func/prompt_wunjo_setup b/.zsh/func/prompt_wunjo_setup similarity index 100% rename from zsh/core/func/prompt_wunjo_setup rename to .zsh/func/prompt_wunjo_setup diff --git a/zsh/core/func/zgitinit b/.zsh/func/zgitinit similarity index 100% rename from zsh/core/func/zgitinit rename to .zsh/func/zgitinit diff --git a/zsh/core/lib/completion.zsh b/.zsh/lib/completion.zsh similarity index 100% rename from zsh/core/lib/completion.zsh rename to .zsh/lib/completion.zsh diff --git a/zsh/core/lib/history.zsh b/.zsh/lib/history.zsh similarity index 100% rename from zsh/core/lib/history.zsh rename to .zsh/lib/history.zsh diff --git a/zsh/core/plugins/safe-paste/safe-paste.plugin.zsh b/.zsh/plugins/safe-paste/safe-paste.plugin.zsh similarity index 100% rename from zsh/core/plugins/safe-paste/safe-paste.plugin.zsh rename to .zsh/plugins/safe-paste/safe-paste.plugin.zsh diff --git a/zsh/zshrc b/.zshrc similarity index 100% rename from zsh/zshrc rename to .zshrc diff --git a/README.md b/README.md deleted file mode 100644 index 938151c..0000000 --- a/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# dotfiles - -Various dotfiles and misc configs. Some of it is customized around my system setup -(like aliases pointing to paths) but you should be able to easily remove that stuff. - -## Installing - -There is an `install` script that facilitates the setup, however it's been a while since I did a -full system setup and this script may not be fully complete. An alternative method is to manually -symlink files in the root directory. OS specific configs are in their respective folders. - diff --git a/bin/vim-pull b/bin/vim-pull deleted file mode 100644 index 4fc9de9..0000000 --- a/bin/vim-pull +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Copies vim data from the home directory to the dotfiles repo. - -set -e - -src="$HOME/.vim" -dest="$HOME/.dotfiles/vim/" - -if [ -d $src ]; then - [ -d "$src/spell" ] && echo "Syncing user dictionary" && cp -r "$src/spell" $dest - [ -d "$src/colors" ] && echo "Syncing user colors" && cp -r "$src/colors" $dest - [ -d "$src/after" ] && echo "Syncing after directory" && cp -r "$src/after" $dest - [ -d "$src/ftdetect" ] && echo "Syncing ftdetect" && cp -r "$src/ftdetect" $dest - [ -d "$src/autoload" ] && echo "Syncing autoload" && cp -r "$src/autoload" $dest -fi diff --git a/bin/vim-push b/bin/vim-push deleted file mode 100644 index f0061af..0000000 --- a/bin/vim-push +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Copies vim data from the dotfiles repo to the home directory. - -set -e - -src="$HOME/.dotfiles/vim" -dest="$HOME/.vim/" - -if [ -d $src ]; then - [ -d "$src/spell" ] && echo "Syncing user dictionary" && cp -r "$src/spell" $dest - [ -d "$src/colors" ] && echo "Syncing user colors" && cp -r "$src/colors" $dest - [ -d "$src/after" ] && echo "Syncing after directory" && cp -r "$src/after" $dest - [ -d "$src/ftdetect" ] && echo "Syncing ftdetect" && cp -r "$src/ftdetect" $dest - [ -d "$src/autoload" ] && echo "Syncing autoload" && cp -r "$src/autoload" $dest -fi diff --git a/.editorconfig b/dotfiles/.editorconfig similarity index 100% rename from .editorconfig rename to dotfiles/.editorconfig diff --git a/LICENSE b/dotfiles/LICENSE similarity index 100% rename from LICENSE rename to dotfiles/LICENSE diff --git a/dotfiles/README.md b/dotfiles/README.md new file mode 100644 index 0000000..ed586d9 --- /dev/null +++ b/dotfiles/README.md @@ -0,0 +1,32 @@ +# dotfiles + +Various dotfiles and misc configs. Some of it is customized around my system +setup (like aliases pointing to paths) but you should be able to easily remove +that stuff. + +This unpacks files one directory back, which is assumed to be your home +directory. The gitignore ignores all files by default. If you want to add a new +file this you need to add the `-f` flag to the git add command. This setup was +inspired by Gary Bernhardt and https://gist.github.com/meleu/053275b6842646b95491bf1af4a6ca0e + +## Installing + +```bash +# Go to your home directory. +cd ~ + +# Clone the repo with the "--no-checkout" option (so we can checkout the files in our home directory) +git clone --no-checkout /dotfiles.git + +# Go to the created directory and change the worktree to the home direcory. +cd dotfiles +git config core.worktree '../../' + +# Checkout the files. This will overwrite existing dotfiles with the same name. +git reset --hard origin/master +``` + +If you want to install optional OS specific stuff, like various packages, run the `install` script in this folder. + +OS specific configs are in their respective folders. + diff --git a/bin/antimalware-service-disable.bat b/dotfiles/bin/antimalware-service-disable.bat similarity index 100% rename from bin/antimalware-service-disable.bat rename to dotfiles/bin/antimalware-service-disable.bat diff --git a/bin/antimalware-service-enable.bat b/dotfiles/bin/antimalware-service-enable.bat similarity index 100% rename from bin/antimalware-service-enable.bat rename to dotfiles/bin/antimalware-service-enable.bat diff --git a/bin/aws-list-deep-glacier-files b/dotfiles/bin/aws-list-deep-glacier-files similarity index 100% rename from bin/aws-list-deep-glacier-files rename to dotfiles/bin/aws-list-deep-glacier-files diff --git a/bin/aws-restore-deep-glacier-folder b/dotfiles/bin/aws-restore-deep-glacier-folder similarity index 100% rename from bin/aws-restore-deep-glacier-folder rename to dotfiles/bin/aws-restore-deep-glacier-folder diff --git a/bin/backup-svn-repo b/dotfiles/bin/backup-svn-repo similarity index 100% rename from bin/backup-svn-repo rename to dotfiles/bin/backup-svn-repo diff --git a/bin/compress-video b/dotfiles/bin/compress-video similarity index 100% rename from bin/compress-video rename to dotfiles/bin/compress-video diff --git a/bin/compress-video-with-crf b/dotfiles/bin/compress-video-with-crf similarity index 100% rename from bin/compress-video-with-crf rename to dotfiles/bin/compress-video-with-crf diff --git a/bin/convert-video-avi-to-mp4 b/dotfiles/bin/convert-video-avi-to-mp4 similarity index 100% rename from bin/convert-video-avi-to-mp4 rename to dotfiles/bin/convert-video-avi-to-mp4 diff --git a/bin/convert-video-flv-to-mp4 b/dotfiles/bin/convert-video-flv-to-mp4 similarity index 100% rename from bin/convert-video-flv-to-mp4 rename to dotfiles/bin/convert-video-flv-to-mp4 diff --git a/bin/convert-video-mkv-to-mp4 b/dotfiles/bin/convert-video-mkv-to-mp4 similarity index 100% rename from bin/convert-video-mkv-to-mp4 rename to dotfiles/bin/convert-video-mkv-to-mp4 diff --git a/bin/extract-16bit-wav-from-video b/dotfiles/bin/extract-16bit-wav-from-video similarity index 100% rename from bin/extract-16bit-wav-from-video rename to dotfiles/bin/extract-16bit-wav-from-video diff --git a/bin/extract-audio-from-video b/dotfiles/bin/extract-audio-from-video similarity index 100% rename from bin/extract-audio-from-video rename to dotfiles/bin/extract-audio-from-video diff --git a/bin/file-portex-analyzer.bat b/dotfiles/bin/file-portex-analyzer.bat similarity index 100% rename from bin/file-portex-analyzer.bat rename to dotfiles/bin/file-portex-analyzer.bat diff --git a/bin/file-resource-hacker.bat b/dotfiles/bin/file-resource-hacker.bat similarity index 100% rename from bin/file-resource-hacker.bat rename to dotfiles/bin/file-resource-hacker.bat diff --git a/bin/file-sigcheck.bat b/dotfiles/bin/file-sigcheck.bat similarity index 100% rename from bin/file-sigcheck.bat rename to dotfiles/bin/file-sigcheck.bat diff --git a/bin/file-x32dbg.bat b/dotfiles/bin/file-x32dbg.bat similarity index 100% rename from bin/file-x32dbg.bat rename to dotfiles/bin/file-x32dbg.bat diff --git a/bin/file-x64dbg.bat b/dotfiles/bin/file-x64dbg.bat similarity index 100% rename from bin/file-x64dbg.bat rename to dotfiles/bin/file-x64dbg.bat diff --git a/bin/files-arm.bat b/dotfiles/bin/files-arm.bat similarity index 100% rename from bin/files-arm.bat rename to dotfiles/bin/files-arm.bat diff --git a/bin/files-disarm.bat b/dotfiles/bin/files-disarm.bat similarity index 100% rename from bin/files-disarm.bat rename to dotfiles/bin/files-disarm.bat diff --git a/bin/fix-audio-in-one-channel b/dotfiles/bin/fix-audio-in-one-channel similarity index 100% rename from bin/fix-audio-in-one-channel rename to dotfiles/bin/fix-audio-in-one-channel diff --git a/bin/join-video b/dotfiles/bin/join-video similarity index 100% rename from bin/join-video rename to dotfiles/bin/join-video diff --git a/bin/normalize-video-volume b/dotfiles/bin/normalize-video-volume similarity index 100% rename from bin/normalize-video-volume rename to dotfiles/bin/normalize-video-volume diff --git a/bin/remove-audio-from-video b/dotfiles/bin/remove-audio-from-video similarity index 100% rename from bin/remove-audio-from-video rename to dotfiles/bin/remove-audio-from-video diff --git a/bin/restore-svn-backup b/dotfiles/bin/restore-svn-backup similarity index 100% rename from bin/restore-svn-backup rename to dotfiles/bin/restore-svn-backup diff --git a/bin/scmindent.vim.rkt b/dotfiles/bin/scmindent.vim.rkt similarity index 100% rename from bin/scmindent.vim.rkt rename to dotfiles/bin/scmindent.vim.rkt diff --git a/bin/symbolic-link b/dotfiles/bin/symbolic-link similarity index 92% rename from bin/symbolic-link rename to dotfiles/bin/symbolic-link index cc72502..f672e73 100644 --- a/bin/symbolic-link +++ b/dotfiles/bin/symbolic-link @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source "$HOME/.dotfiles/script_helpers/all.sh" +source "$HOME/dotfiles/script_helpers/all.sh" cwd=$PWD source_path="" diff --git a/bin/sync-android-chrome-tabs b/dotfiles/bin/sync-android-chrome-tabs similarity index 100% rename from bin/sync-android-chrome-tabs rename to dotfiles/bin/sync-android-chrome-tabs diff --git a/bin/transcribe-audio b/dotfiles/bin/transcribe-audio similarity index 100% rename from bin/transcribe-audio rename to dotfiles/bin/transcribe-audio diff --git a/bin/transcribe-video b/dotfiles/bin/transcribe-video similarity index 100% rename from bin/transcribe-video rename to dotfiles/bin/transcribe-video diff --git a/bin/transcribe-video-base b/dotfiles/bin/transcribe-video-base similarity index 100% rename from bin/transcribe-video-base rename to dotfiles/bin/transcribe-video-base diff --git a/bin/transcribe-video-medium b/dotfiles/bin/transcribe-video-medium similarity index 100% rename from bin/transcribe-video-medium rename to dotfiles/bin/transcribe-video-medium diff --git a/bin/transcribe-video-small b/dotfiles/bin/transcribe-video-small similarity index 100% rename from bin/transcribe-video-small rename to dotfiles/bin/transcribe-video-small diff --git a/bin/transcribe-video-tiny b/dotfiles/bin/transcribe-video-tiny similarity index 100% rename from bin/transcribe-video-tiny rename to dotfiles/bin/transcribe-video-tiny diff --git a/bin/trim-accurate-video b/dotfiles/bin/trim-accurate-video similarity index 100% rename from bin/trim-accurate-video rename to dotfiles/bin/trim-accurate-video diff --git a/bin/trim-video b/dotfiles/bin/trim-video similarity index 100% rename from bin/trim-video rename to dotfiles/bin/trim-video diff --git a/bin/update-msys-shell b/dotfiles/bin/update-msys-shell similarity index 87% rename from bin/update-msys-shell rename to dotfiles/bin/update-msys-shell index 397cf67..461022e 100644 --- a/bin/update-msys-shell +++ b/dotfiles/bin/update-msys-shell @@ -2,8 +2,8 @@ # If you're getting signature errors, check out https://www.msys2.org/news/#2020-06-29-new-packagers and/or other news posts. -source "$HOME/.dotfiles/script_helpers/printing.sh" -source "$HOME/.dotfiles/script_helpers/platform.sh" +source "$HOME/dotfiles/script_helpers/printing.sh" +source "$HOME/dotfiles/script_helpers/platform.sh" set -e diff --git a/configs/dnscrypt-proxy.toml b/dotfiles/configs/dnscrypt-proxy.toml similarity index 100% rename from configs/dnscrypt-proxy.toml rename to dotfiles/configs/dnscrypt-proxy.toml diff --git a/install b/dotfiles/install old mode 100755 new mode 100644 similarity index 53% rename from install rename to dotfiles/install index c412e5b..c15a31e --- a/install +++ b/dotfiles/install @@ -52,31 +52,6 @@ setup_zsh() { if [[ $is_linux -eq 1 ]]; then sudo apt install zsh fi - - make_link .dotfiles/zsh/core .zsh - - FILES=() - FILES+=('zshrc') - FILES+=('zlogin') - - for file in "${FILES[@]}" - do - make_link .dotfiles/zsh/$file .$file - done -} - -setup_bash() { - printf "${MAGENTA}==> ${NORMAL}Setting up bash...\n" - - FILES=() - FILES+=('bashrc') - FILES+=('bash_profile') - FILES+=('inputrc') - - for file in "${FILES[@]}" - do - make_link .dotfiles/bash/$file .$file - done } #################################################################################################### @@ -85,40 +60,6 @@ setup_bash() { pushd "$HOME" &>/dev/null -make_link $dotfiles_dir .dotfiles 1 # expand source path in case we're reinstalling and the cwd is a symlink. - -if [[ $is_windows -eq 1 ]]; then - do_vim_copy=1 - if [[ -d "$PWD/.vim" ]]; then - printf "\n${BOLD}Vim folder already found at destination. Overwrite? [1,0]\n> ${NORMAL}" - read -e copy_vim - if [[ $copy_vim != "0" && $copy_vim != "1" ]]; then - fatal "Invalid value '$copy_vim'" - elif [[ $copy_vim == "0" ]]; then - do_vim_copy=0 - printf "\n" - fi - fi - if [[ $do_vim_copy -eq 1 ]]; then - printf "${MAGENTA}==> ${NORMAL}Copying ${YELLOW}.dotfiles/vim${NORMAL} to ${YELLOW}$PWD/.vim${NORMAL}\n" - cp -r .dotfiles/vim .vim - fi -else - make_link .dotfiles/vim .vim -fi - -FILES=() -FILES+=('env.loader') -FILES+=('aliases') -FILES+=('gitconfig') -FILES+=('vimrc') -FILES+=('curlrc') - -for file in "${FILES[@]}" -do - make_link .dotfiles/$file .$file -done - set +e git_comp_filename=".git-completion.bash" printf "${MAGENTA}==> ${NORMAL}Downloading Git completion list to ${YELLOW}$PWD/$git_comp_filename${NORMAL}\n" @@ -129,37 +70,19 @@ set -e # Setup platform files ######################### -if [[ $is_windows -eq 1 ]]; then - printf "\n${BOLD}Setting up Windows${NORMAL}\n\n" - os_name="windows" - # Already using bash if running msys2. - setup_bash -elif [[ $is_macos -eq 1 ]]; then +if [[ $is_macos -eq 1 ]]; then printf "\n${BOLD}Setting up MacOS${NORMAL}\n\n" - os_name="macos" + $dotfiles_dir/macos/install + # might just switch back to bash since the zsh stuff is ancient. setup_zsh - setup_bash use_shell zsh + elif [[ $is_linux -eq 1 ]]; then printf "\n${BOLD}Setting up Linux${NORMAL}\n\n" - os_name="linux" - setup_zsh - setup_bash + $dotfiles_dir/linux/install use_shell bash fi -if [[ $os_name != "" ]]; then - if [ -f .dotfiles/$os_name/env.platform ]; then - make_link .dotfiles/$os_name/env.platform .env.platform - fi - - if [ -f .dotfiles/$os_name/gitconfig.platform ]; then - make_link .dotfiles/$os_name/gitconfig.platform .gitconfig.platform - fi - - $dotfiles_dir/$os_name/install -fi - popd "$HOME" &>/dev/null printf "${BOLD}${GREEN}Done!${NORMAL}\n" diff --git a/keys/gpg-public-campo-at-protonmail-dot-com.asc b/dotfiles/keys/gpg-public-campo-at-protonmail-dot-com.asc similarity index 100% rename from keys/gpg-public-campo-at-protonmail-dot-com.asc rename to dotfiles/keys/gpg-public-campo-at-protonmail-dot-com.asc diff --git a/keys/gpg-public-campo-at-protonmail-dot-com.txt b/dotfiles/keys/gpg-public-campo-at-protonmail-dot-com.txt similarity index 100% rename from keys/gpg-public-campo-at-protonmail-dot-com.txt rename to dotfiles/keys/gpg-public-campo-at-protonmail-dot-com.txt diff --git a/linux/README.md b/dotfiles/linux/README.md similarity index 100% rename from linux/README.md rename to dotfiles/linux/README.md diff --git a/linux/arch/config/compton.conf b/dotfiles/linux/arch/config/compton.conf similarity index 100% rename from linux/arch/config/compton.conf rename to dotfiles/linux/arch/config/compton.conf diff --git a/linux/arch/config/ctags b/dotfiles/linux/arch/config/ctags similarity index 100% rename from linux/arch/config/ctags rename to dotfiles/linux/arch/config/ctags diff --git a/linux/arch/config/gnupg/gpg.conf b/dotfiles/linux/arch/config/gnupg/gpg.conf similarity index 100% rename from linux/arch/config/gnupg/gpg.conf rename to dotfiles/linux/arch/config/gnupg/gpg.conf diff --git a/linux/arch/config/lxpanel/LXDE/config b/dotfiles/linux/arch/config/lxpanel/LXDE/config similarity index 100% rename from linux/arch/config/lxpanel/LXDE/config rename to dotfiles/linux/arch/config/lxpanel/LXDE/config diff --git a/linux/arch/config/lxpanel/LXDE/panels/panel b/dotfiles/linux/arch/config/lxpanel/LXDE/panels/panel similarity index 100% rename from linux/arch/config/lxpanel/LXDE/panels/panel rename to dotfiles/linux/arch/config/lxpanel/LXDE/panels/panel diff --git a/linux/arch/config/lxpanel/launchtaskbar.cfg b/dotfiles/linux/arch/config/lxpanel/launchtaskbar.cfg similarity index 100% rename from linux/arch/config/lxpanel/launchtaskbar.cfg rename to dotfiles/linux/arch/config/lxpanel/launchtaskbar.cfg diff --git a/linux/arch/config/openbox/autostart b/dotfiles/linux/arch/config/openbox/autostart similarity index 100% rename from linux/arch/config/openbox/autostart rename to dotfiles/linux/arch/config/openbox/autostart diff --git a/linux/arch/config/openbox/lxde-rc.xml b/dotfiles/linux/arch/config/openbox/lxde-rc.xml similarity index 100% rename from linux/arch/config/openbox/lxde-rc.xml rename to dotfiles/linux/arch/config/openbox/lxde-rc.xml diff --git a/linux/arch/config/openbox/rc.xml b/dotfiles/linux/arch/config/openbox/rc.xml similarity index 100% rename from linux/arch/config/openbox/rc.xml rename to dotfiles/linux/arch/config/openbox/rc.xml diff --git a/linux/arch/config/pacman/makepkg.conf b/dotfiles/linux/arch/config/pacman/makepkg.conf similarity index 100% rename from linux/arch/config/pacman/makepkg.conf rename to dotfiles/linux/arch/config/pacman/makepkg.conf diff --git a/linux/arch/config/postgresql.conf b/dotfiles/linux/arch/config/postgresql.conf similarity index 100% rename from linux/arch/config/postgresql.conf rename to dotfiles/linux/arch/config/postgresql.conf diff --git a/linux/arch/config/psd/psd.conf b/dotfiles/linux/arch/config/psd/psd.conf similarity index 100% rename from linux/arch/config/psd/psd.conf rename to dotfiles/linux/arch/config/psd/psd.conf diff --git a/linux/arch/config/redshift.conf b/dotfiles/linux/arch/config/redshift.conf similarity index 100% rename from linux/arch/config/redshift.conf rename to dotfiles/linux/arch/config/redshift.conf diff --git a/linux/arch/config/terminator/config b/dotfiles/linux/arch/config/terminator/config similarity index 100% rename from linux/arch/config/terminator/config rename to dotfiles/linux/arch/config/terminator/config diff --git a/linux/arch/config/terminator/plugins/search-google.py b/dotfiles/linux/arch/config/terminator/plugins/search-google.py similarity index 100% rename from linux/arch/config/terminator/plugins/search-google.py rename to dotfiles/linux/arch/config/terminator/plugins/search-google.py diff --git a/linux/arch/home/Xmodmap b/dotfiles/linux/arch/home/Xmodmap similarity index 100% rename from linux/arch/home/Xmodmap rename to dotfiles/linux/arch/home/Xmodmap diff --git a/linux/arch/readme.md b/dotfiles/linux/arch/readme.md similarity index 100% rename from linux/arch/readme.md rename to dotfiles/linux/arch/readme.md diff --git a/linux/arch/systemd/readme.md b/dotfiles/linux/arch/systemd/readme.md similarity index 100% rename from linux/arch/systemd/readme.md rename to dotfiles/linux/arch/systemd/readme.md diff --git a/linux/arch/systemd/remapKeyboard.service b/dotfiles/linux/arch/systemd/remapKeyboard.service similarity index 100% rename from linux/arch/systemd/remapKeyboard.service rename to dotfiles/linux/arch/systemd/remapKeyboard.service diff --git a/linux/bin/dos2unix-recursive b/dotfiles/linux/bin/dos2unix-recursive similarity index 100% rename from linux/bin/dos2unix-recursive rename to dotfiles/linux/bin/dos2unix-recursive diff --git a/linux/bin/fix-vm-resolution b/dotfiles/linux/bin/fix-vm-resolution similarity index 100% rename from linux/bin/fix-vm-resolution rename to dotfiles/linux/bin/fix-vm-resolution diff --git a/linux/bin/remap-keyboard.sh b/dotfiles/linux/bin/remap-keyboard.sh old mode 100755 new mode 100644 similarity index 100% rename from linux/bin/remap-keyboard.sh rename to dotfiles/linux/bin/remap-keyboard.sh diff --git a/linux/config/tmux.conf b/dotfiles/linux/config/tmux.conf similarity index 100% rename from linux/config/tmux.conf rename to dotfiles/linux/config/tmux.conf diff --git a/dotfiles/linux/env.platform b/dotfiles/linux/env.platform new file mode 100644 index 0000000..ce5217e --- /dev/null +++ b/dotfiles/linux/env.platform @@ -0,0 +1 @@ +export PATH=$HOME/dotfiles/linux/bin:$PATH diff --git a/linux/install b/dotfiles/linux/install old mode 100755 new mode 100644 similarity index 68% rename from linux/install rename to dotfiles/linux/install index f0e16f3..4d51200 --- a/linux/install +++ b/dotfiles/linux/install @@ -2,10 +2,10 @@ set -e -source "$HOME/.dotfiles/script_helpers/printing.sh" -source "$HOME/.dotfiles/script_helpers/core.sh" -source "$HOME/.dotfiles/script_helpers/platform.sh" -source "$HOME/.dotfiles/script_helpers/file_ops.sh" +source "$HOME/dotfiles/script_helpers/printing.sh" +source "$HOME/dotfiles/script_helpers/core.sh" +source "$HOME/dotfiles/script_helpers/platform.sh" +source "$HOME/dotfiles/script_helpers/file_ops.sh" #----------------------------------- # Apt packages diff --git a/macos/README.md b/dotfiles/macos/README.md similarity index 100% rename from macos/README.md rename to dotfiles/macos/README.md diff --git a/iterm/campo.itermcolors b/dotfiles/macos/campo.itermcolors similarity index 100% rename from iterm/campo.itermcolors rename to dotfiles/macos/campo.itermcolors diff --git a/macos/capslock-to-ctrl-for-karabiner.json b/dotfiles/macos/capslock-to-ctrl-for-karabiner.json similarity index 100% rename from macos/capslock-to-ctrl-for-karabiner.json rename to dotfiles/macos/capslock-to-ctrl-for-karabiner.json diff --git a/macos/env.platform b/dotfiles/macos/env.platform similarity index 100% rename from macos/env.platform rename to dotfiles/macos/env.platform diff --git a/macos/install b/dotfiles/macos/install similarity index 86% rename from macos/install rename to dotfiles/macos/install index a20d50a..bf22c01 100644 --- a/macos/install +++ b/dotfiles/macos/install @@ -2,15 +2,15 @@ set -e -source "$HOME/.dotfiles/script_helpers/printing.sh" -source "$HOME/.dotfiles/script_helpers/core.sh" -source "$HOME/.dotfiles/script_helpers/platform.sh" -source "$HOME/.dotfiles/script_helpers/file_ops.sh" +source "$HOME/dotfiles/script_helpers/printing.sh" +source "$HOME/dotfiles/script_helpers/core.sh" +source "$HOME/dotfiles/script_helpers/platform.sh" +source "$HOME/dotfiles/script_helpers/file_ops.sh" printf "\n${BOLD}Installing key remap config...${NORMAL}\n" key_dest=$HOME/.config/karabiner/assets/complex_modifications/ mkdir -p $key_dest -make_link $HOME/.dotfiles/osx/capslock-to-ctrl-for-karabiner.json ${key_dest}/custom-capslock.json +make_link $HOME/dotfiles/osx/capslock-to-ctrl-for-karabiner.json ${key_dest}/custom-capslock.json #----------------------------------- # Homebrew packages diff --git a/macos/pre_install b/dotfiles/macos/pre_install similarity index 100% rename from macos/pre_install rename to dotfiles/macos/pre_install diff --git a/script_helpers/all.sh b/dotfiles/script_helpers/all.sh similarity index 77% rename from script_helpers/all.sh rename to dotfiles/script_helpers/all.sh index 24b6c5b..7b47639 100644 --- a/script_helpers/all.sh +++ b/dotfiles/script_helpers/all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source_helpers="$HOME/.dotfiles/script_helpers" +source_helpers="$HOME/dotfiles/script_helpers" source "$source_helpers/printing.sh" source "$source_helpers/core.sh" source "$source_helpers/platform.sh" diff --git a/script_helpers/clang.sh b/dotfiles/script_helpers/clang.sh similarity index 100% rename from script_helpers/clang.sh rename to dotfiles/script_helpers/clang.sh diff --git a/script_helpers/core.sh b/dotfiles/script_helpers/core.sh similarity index 100% rename from script_helpers/core.sh rename to dotfiles/script_helpers/core.sh diff --git a/script_helpers/file_ops.sh b/dotfiles/script_helpers/file_ops.sh similarity index 100% rename from script_helpers/file_ops.sh rename to dotfiles/script_helpers/file_ops.sh diff --git a/script_helpers/msvc.sh b/dotfiles/script_helpers/msvc.sh similarity index 100% rename from script_helpers/msvc.sh rename to dotfiles/script_helpers/msvc.sh diff --git a/script_helpers/platform.sh b/dotfiles/script_helpers/platform.sh similarity index 100% rename from script_helpers/platform.sh rename to dotfiles/script_helpers/platform.sh diff --git a/script_helpers/printing.sh b/dotfiles/script_helpers/printing.sh similarity index 100% rename from script_helpers/printing.sh rename to dotfiles/script_helpers/printing.sh diff --git a/ssh.md b/dotfiles/ssh.md similarity index 100% rename from ssh.md rename to dotfiles/ssh.md diff --git a/windows/Adobe Bridge - Startup Scripts/AlwaysShowSubfolderThumbs.jsx b/dotfiles/windows/Adobe Bridge - Startup Scripts/AlwaysShowSubfolderThumbs.jsx similarity index 100% rename from windows/Adobe Bridge - Startup Scripts/AlwaysShowSubfolderThumbs.jsx rename to dotfiles/windows/Adobe Bridge - Startup Scripts/AlwaysShowSubfolderThumbs.jsx diff --git a/windows/Visual Studio Layout/ApplicationPrivateSettings.xml b/dotfiles/windows/Visual Studio Layout/ApplicationPrivateSettings.xml similarity index 100% rename from windows/Visual Studio Layout/ApplicationPrivateSettings.xml rename to dotfiles/windows/Visual Studio Layout/ApplicationPrivateSettings.xml diff --git a/windows/custom_hosts_list.txt b/dotfiles/windows/custom_hosts_list.txt similarity index 100% rename from windows/custom_hosts_list.txt rename to dotfiles/windows/custom_hosts_list.txt diff --git a/windows/disable-are-you-sure-you-want-to-open-with-the-default-program-dialog.reg b/dotfiles/windows/disable-are-you-sure-you-want-to-open-with-the-default-program-dialog.reg similarity index 100% rename from windows/disable-are-you-sure-you-want-to-open-with-the-default-program-dialog.reg rename to dotfiles/windows/disable-are-you-sure-you-want-to-open-with-the-default-program-dialog.reg diff --git a/windows/disable-windows-error-reporting-dialog.bat b/dotfiles/windows/disable-windows-error-reporting-dialog.bat similarity index 100% rename from windows/disable-windows-error-reporting-dialog.bat rename to dotfiles/windows/disable-windows-error-reporting-dialog.bat diff --git a/windows/disable-windows-platform-binary-table.reg b/dotfiles/windows/disable-windows-platform-binary-table.reg similarity index 100% rename from windows/disable-windows-platform-binary-table.reg rename to dotfiles/windows/disable-windows-platform-binary-table.reg diff --git a/windows/env.platform b/dotfiles/windows/env.platform similarity index 100% rename from windows/env.platform rename to dotfiles/windows/env.platform diff --git a/windows/photo_viewer.reg b/dotfiles/windows/photo_viewer.reg similarity index 100% rename from windows/photo_viewer.reg rename to dotfiles/windows/photo_viewer.reg diff --git a/windows/readme.md b/dotfiles/windows/readme.md similarity index 100% rename from windows/readme.md rename to dotfiles/windows/readme.md diff --git a/linux/env.platform b/linux/env.platform deleted file mode 100644 index 4c48230..0000000 --- a/linux/env.platform +++ /dev/null @@ -1 +0,0 @@ -export PATH=$HOME/.dotfiles/linux/bin:$PATH diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl deleted file mode 100644 index 07487e6..0000000 Binary files a/vim/spell/en.utf-8.add.spl and /dev/null differ diff --git a/windows/install b/windows/install deleted file mode 100755 index 69320e6..0000000 --- a/windows/install +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -set -e - -source "$HOME/.dotfiles/script_helpers/printing.sh" -source "$HOME/.dotfiles/script_helpers/core.sh" -source "$HOME/.dotfiles/script_helpers/platform.sh" -source "$HOME/.dotfiles/script_helpers/file_ops.sh" - -# Nothing to do at the moment. - -printf "\n${BOLD}Finished setting up Windows${NORMAL}\n"