From b24321d3922aaab6c069b488f013a09adb93b1a8 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Tue, 22 Oct 2019 16:04:37 -0400 Subject: [PATCH] Reorganize files for easier restoring via stow, more familiar file structure. --- urxvt/.Xresources => .Xresources | 0 bash/.bash_aliases => .bash_aliases | 0 bash/.bashrc => .bashrc | 0 .../Code - OSS/User/settings.json | 0 .../Code - OSS/languagepacks.json | 0 {compton/.config => .config}/compton.conf | 0 .../.config => .config}/conky/shortcuts_green | 0 .../.config => .config}/conky/sysinfo_green | 0 {i3/.config => .config}/i3/config | 0 {polybar/.config => .config}/polybar/config | 0 .../polybar/start-polybar.sh | 0 .../powerline-shell/config.json | 0 .../powerline-shell/kapp.py | 0 .../powerline-shell/powerline-shell | 0 dircolors/.dir_colors => .dir_colors | 0 .gitmodules | 53 ++++++++++--------- .../bin/i3scripts/i3empty.py | 0 .../bin/i3scripts/info-hackspeed | 0 .../.local => .local}/bin/i3scripts/info-idle | 0 .../bin/i3scripts/popup-calendar | 0 .../bin/i3scripts/start_konky | 0 .../bin/i3scripts/weathermap | 0 {bin/.local => .local}/bin/i3scripts/xoffee | 0 tmux/.tmux-gitbar => .tmux-gitbar | 0 tmux/.tmux-gitbar.conf => .tmux-gitbar.conf | 0 tmux/.tmux.conf => .tmux.conf | 0 tmux/.tmux.conf.local => .tmux.conf.local | 0 {tmux/.tmux => .tmux}/plugins/tpm | 0 {vim/.vim => .vim}/.VimballRecord | 0 {vim/.vim => .vim}/.netrwhist | 0 {vim/.vim => .vim}/autoload/Colorizer.vim | 0 {vim/.vim => .vim}/autoload/pathogen.vim | 0 {vim/.vim => .vim}/bundle/Colorizer | 0 {vim/.vim => .vim}/bundle/clang_complete | 0 {vim/.vim => .vim}/bundle/supertab | 0 {vim/.vim => .vim}/bundle/unicode.vim | 0 .vim/bundle/vim-airline | 1 + {vim/.vim => .vim}/bundle/vim-airline-themes | 0 .vim/bundle/vim-signify | 1 + {vim/.vim => .vim}/colors/sourcerer.vim | 0 {vim/.vim => .vim}/doc/Colorizer.txt | 0 {vim/.vim => .vim}/doc/tags | 0 {vim/.vim => .vim}/plugin/ColorizerPlugin.vim | 0 vim/.vimrc => .vimrc | 0 README.md | 18 ++++--- nitrogen/bg-saved.cfg => bg-saved.cfg | 0 nitrogen/nitrogen.cfg => nitrogen.cfg | 0 vim/.vim/bundle/vim-airline | 1 - vim/.vim/bundle/vim-signify | 1 - 49 files changed, 42 insertions(+), 33 deletions(-) rename urxvt/.Xresources => .Xresources (100%) rename bash/.bash_aliases => .bash_aliases (100%) rename bash/.bashrc => .bashrc (100%) rename {vscode/.config => .config}/Code - OSS/User/settings.json (100%) rename {vscode/.config => .config}/Code - OSS/languagepacks.json (100%) rename {compton/.config => .config}/compton.conf (100%) rename {conky/.config => .config}/conky/shortcuts_green (100%) rename {conky/.config => .config}/conky/sysinfo_green (100%) rename {i3/.config => .config}/i3/config (100%) rename {polybar/.config => .config}/polybar/config (100%) rename {polybar/.config => .config}/polybar/start-polybar.sh (100%) rename {plshell/.config => .config}/powerline-shell/config.json (100%) rename {plshell/.config => .config}/powerline-shell/kapp.py (100%) rename {plshell/.config => .config}/powerline-shell/powerline-shell (100%) rename dircolors/.dir_colors => .dir_colors (100%) rename {bin/.local => .local}/bin/i3scripts/i3empty.py (100%) rename {bin/.local => .local}/bin/i3scripts/info-hackspeed (100%) rename {bin/.local => .local}/bin/i3scripts/info-idle (100%) rename {bin/.local => .local}/bin/i3scripts/popup-calendar (100%) rename {bin/.local => .local}/bin/i3scripts/start_konky (100%) rename {bin/.local => .local}/bin/i3scripts/weathermap (100%) rename {bin/.local => .local}/bin/i3scripts/xoffee (100%) rename tmux/.tmux-gitbar => .tmux-gitbar (100%) rename tmux/.tmux-gitbar.conf => .tmux-gitbar.conf (100%) rename tmux/.tmux.conf => .tmux.conf (100%) rename tmux/.tmux.conf.local => .tmux.conf.local (100%) rename {tmux/.tmux => .tmux}/plugins/tpm (100%) rename {vim/.vim => .vim}/.VimballRecord (100%) rename {vim/.vim => .vim}/.netrwhist (100%) rename {vim/.vim => .vim}/autoload/Colorizer.vim (100%) rename {vim/.vim => .vim}/autoload/pathogen.vim (100%) rename {vim/.vim => .vim}/bundle/Colorizer (100%) rename {vim/.vim => .vim}/bundle/clang_complete (100%) rename {vim/.vim => .vim}/bundle/supertab (100%) rename {vim/.vim => .vim}/bundle/unicode.vim (100%) create mode 160000 .vim/bundle/vim-airline rename {vim/.vim => .vim}/bundle/vim-airline-themes (100%) create mode 160000 .vim/bundle/vim-signify rename {vim/.vim => .vim}/colors/sourcerer.vim (100%) rename {vim/.vim => .vim}/doc/Colorizer.txt (100%) rename {vim/.vim => .vim}/doc/tags (100%) rename {vim/.vim => .vim}/plugin/ColorizerPlugin.vim (100%) rename vim/.vimrc => .vimrc (100%) rename nitrogen/bg-saved.cfg => bg-saved.cfg (100%) rename nitrogen/nitrogen.cfg => nitrogen.cfg (100%) delete mode 160000 vim/.vim/bundle/vim-airline delete mode 160000 vim/.vim/bundle/vim-signify diff --git a/urxvt/.Xresources b/.Xresources similarity index 100% rename from urxvt/.Xresources rename to .Xresources diff --git a/bash/.bash_aliases b/.bash_aliases similarity index 100% rename from bash/.bash_aliases rename to .bash_aliases diff --git a/bash/.bashrc b/.bashrc similarity index 100% rename from bash/.bashrc rename to .bashrc diff --git a/vscode/.config/Code - OSS/User/settings.json b/.config/Code - OSS/User/settings.json similarity index 100% rename from vscode/.config/Code - OSS/User/settings.json rename to .config/Code - OSS/User/settings.json diff --git a/vscode/.config/Code - OSS/languagepacks.json b/.config/Code - OSS/languagepacks.json similarity index 100% rename from vscode/.config/Code - OSS/languagepacks.json rename to .config/Code - OSS/languagepacks.json diff --git a/compton/.config/compton.conf b/.config/compton.conf similarity index 100% rename from compton/.config/compton.conf rename to .config/compton.conf diff --git a/conky/.config/conky/shortcuts_green b/.config/conky/shortcuts_green similarity index 100% rename from conky/.config/conky/shortcuts_green rename to .config/conky/shortcuts_green diff --git a/conky/.config/conky/sysinfo_green b/.config/conky/sysinfo_green similarity index 100% rename from conky/.config/conky/sysinfo_green rename to .config/conky/sysinfo_green diff --git a/i3/.config/i3/config b/.config/i3/config similarity index 100% rename from i3/.config/i3/config rename to .config/i3/config diff --git a/polybar/.config/polybar/config b/.config/polybar/config similarity index 100% rename from polybar/.config/polybar/config rename to .config/polybar/config diff --git a/polybar/.config/polybar/start-polybar.sh b/.config/polybar/start-polybar.sh similarity index 100% rename from polybar/.config/polybar/start-polybar.sh rename to .config/polybar/start-polybar.sh diff --git a/plshell/.config/powerline-shell/config.json b/.config/powerline-shell/config.json similarity index 100% rename from plshell/.config/powerline-shell/config.json rename to .config/powerline-shell/config.json diff --git a/plshell/.config/powerline-shell/kapp.py b/.config/powerline-shell/kapp.py similarity index 100% rename from plshell/.config/powerline-shell/kapp.py rename to .config/powerline-shell/kapp.py diff --git a/plshell/.config/powerline-shell/powerline-shell b/.config/powerline-shell/powerline-shell similarity index 100% rename from plshell/.config/powerline-shell/powerline-shell rename to .config/powerline-shell/powerline-shell diff --git a/dircolors/.dir_colors b/.dir_colors similarity index 100% rename from dircolors/.dir_colors rename to .dir_colors diff --git a/.gitmodules b/.gitmodules index 8efd27e..8a8d5cb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,30 @@ -[submodule "vim/.vim/bundle/clang_complete"] - path = vim/.vim/bundle/clang_complete - url = https://github.com/xavierd/clang_complete -[submodule "vim/.vim/bundle/Colorizer"] - path = vim/.vim/bundle/Colorizer - url = https://github.com/chrisbra/Colorizer -[submodule "vim/.vim/bundle/supertab"] - path = vim/.vim/bundle/supertab - url = https://github.com/ervandew/supertab -[submodule "vim/.vim/bundle/unicode.vim"] - path = vim/.vim/bundle/unicode.vim - url = https://github.com/chrisbra/unicode.vim -[submodule "vim/.vim/bundle/vim-airline"] - path = vim/.vim/bundle/vim-airline - url = https://github.com/vim-airline/vim-airline -[submodule "vim/.vim/bundle/vim-airline-themes"] - path = vim/.vim/bundle/vim-airline-themes - url = https://github.com/vim-airline/vim-airline-themes -[submodule "vim/.vim/bundle/vim-signify"] - path = vim/.vim/bundle/vim-signify - url = https://github.com/mhinz/vim-signify -[submodule "tmux/.tmux-gitbar"] - path = tmux/.tmux-gitbar - url = https://github.com/arl/tmux-gitbar [submodule "tmux/.tmux/plugins/tpm"] - path = tmux/.tmux/plugins/tpm + path = .tmux/plugins/tpm url = https://github.com/tmux-plugins/tpm +[submodule "tmux/.tmux-gitbar"] + path = .tmux-gitbar + url = https://github.com/arl/tmux-gitbar +[submodule ".config/powerline-shell/powerline-shell"] + path = .config/powerline-shell/powerline-shell + url = https://github.com/b-ryan/powerline-shell +[submodule ".vim/bundle/clang_complete"] + path = .vim/bundle/clang_complete + url = https://github.com/xavierd/clang_complete +[submodule ".vim/bundle/Colorizer"] + path = .vim/bundle/Colorizer + url = https://github.com/chrisbra/Colorizer +[submodule ".vim/bundle/supertab"] + path = .vim/bundle/supertab + url = https://github.com/ervandew/supertab +[submodule ".vim/bundle/unicode.vim"] + path = .vim/bundle/unicode.vim + url = https://github.com/chrisbra/unicode.vim +[submodule ".vim/bundle/vim-airline"] + path = .vim/bundle/vim-airline + url = https://github.com/vim-airline/vim-airline +[submodule ".vim/bundle/vim-airline-themes"] + path = .vim/bundle/vim-airline-themes + url = https://github.com/vim-airline/vim-airline-themes +[submodule ".vim/bundle/vim-signify"] + path = .vim/bundle/vim-signify + url = https://github.com/mhinz/vim-signify diff --git a/bin/.local/bin/i3scripts/i3empty.py b/.local/bin/i3scripts/i3empty.py similarity index 100% rename from bin/.local/bin/i3scripts/i3empty.py rename to .local/bin/i3scripts/i3empty.py diff --git a/bin/.local/bin/i3scripts/info-hackspeed b/.local/bin/i3scripts/info-hackspeed similarity index 100% rename from bin/.local/bin/i3scripts/info-hackspeed rename to .local/bin/i3scripts/info-hackspeed diff --git a/bin/.local/bin/i3scripts/info-idle b/.local/bin/i3scripts/info-idle similarity index 100% rename from bin/.local/bin/i3scripts/info-idle rename to .local/bin/i3scripts/info-idle diff --git a/bin/.local/bin/i3scripts/popup-calendar b/.local/bin/i3scripts/popup-calendar similarity index 100% rename from bin/.local/bin/i3scripts/popup-calendar rename to .local/bin/i3scripts/popup-calendar diff --git a/bin/.local/bin/i3scripts/start_konky b/.local/bin/i3scripts/start_konky similarity index 100% rename from bin/.local/bin/i3scripts/start_konky rename to .local/bin/i3scripts/start_konky diff --git a/bin/.local/bin/i3scripts/weathermap b/.local/bin/i3scripts/weathermap similarity index 100% rename from bin/.local/bin/i3scripts/weathermap rename to .local/bin/i3scripts/weathermap diff --git a/bin/.local/bin/i3scripts/xoffee b/.local/bin/i3scripts/xoffee similarity index 100% rename from bin/.local/bin/i3scripts/xoffee rename to .local/bin/i3scripts/xoffee diff --git a/tmux/.tmux-gitbar b/.tmux-gitbar similarity index 100% rename from tmux/.tmux-gitbar rename to .tmux-gitbar diff --git a/tmux/.tmux-gitbar.conf b/.tmux-gitbar.conf similarity index 100% rename from tmux/.tmux-gitbar.conf rename to .tmux-gitbar.conf diff --git a/tmux/.tmux.conf b/.tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to .tmux.conf diff --git a/tmux/.tmux.conf.local b/.tmux.conf.local similarity index 100% rename from tmux/.tmux.conf.local rename to .tmux.conf.local diff --git a/tmux/.tmux/plugins/tpm b/.tmux/plugins/tpm similarity index 100% rename from tmux/.tmux/plugins/tpm rename to .tmux/plugins/tpm diff --git a/vim/.vim/.VimballRecord b/.vim/.VimballRecord similarity index 100% rename from vim/.vim/.VimballRecord rename to .vim/.VimballRecord diff --git a/vim/.vim/.netrwhist b/.vim/.netrwhist similarity index 100% rename from vim/.vim/.netrwhist rename to .vim/.netrwhist diff --git a/vim/.vim/autoload/Colorizer.vim b/.vim/autoload/Colorizer.vim similarity index 100% rename from vim/.vim/autoload/Colorizer.vim rename to .vim/autoload/Colorizer.vim diff --git a/vim/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim similarity index 100% rename from vim/.vim/autoload/pathogen.vim rename to .vim/autoload/pathogen.vim diff --git a/vim/.vim/bundle/Colorizer b/.vim/bundle/Colorizer similarity index 100% rename from vim/.vim/bundle/Colorizer rename to .vim/bundle/Colorizer diff --git a/vim/.vim/bundle/clang_complete b/.vim/bundle/clang_complete similarity index 100% rename from vim/.vim/bundle/clang_complete rename to .vim/bundle/clang_complete diff --git a/vim/.vim/bundle/supertab b/.vim/bundle/supertab similarity index 100% rename from vim/.vim/bundle/supertab rename to .vim/bundle/supertab diff --git a/vim/.vim/bundle/unicode.vim b/.vim/bundle/unicode.vim similarity index 100% rename from vim/.vim/bundle/unicode.vim rename to .vim/bundle/unicode.vim diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline new file mode 160000 index 0000000..6d66558 --- /dev/null +++ b/.vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 6d665580a3435f21ad560af192d854d4b608fff5 diff --git a/vim/.vim/bundle/vim-airline-themes b/.vim/bundle/vim-airline-themes similarity index 100% rename from vim/.vim/bundle/vim-airline-themes rename to .vim/bundle/vim-airline-themes diff --git a/.vim/bundle/vim-signify b/.vim/bundle/vim-signify new file mode 160000 index 0000000..16eee41 --- /dev/null +++ b/.vim/bundle/vim-signify @@ -0,0 +1 @@ +Subproject commit 16eee41d2b267523b84bd4ac111627588bfd1a47 diff --git a/vim/.vim/colors/sourcerer.vim b/.vim/colors/sourcerer.vim similarity index 100% rename from vim/.vim/colors/sourcerer.vim rename to .vim/colors/sourcerer.vim diff --git a/vim/.vim/doc/Colorizer.txt b/.vim/doc/Colorizer.txt similarity index 100% rename from vim/.vim/doc/Colorizer.txt rename to .vim/doc/Colorizer.txt diff --git a/vim/.vim/doc/tags b/.vim/doc/tags similarity index 100% rename from vim/.vim/doc/tags rename to .vim/doc/tags diff --git a/vim/.vim/plugin/ColorizerPlugin.vim b/.vim/plugin/ColorizerPlugin.vim similarity index 100% rename from vim/.vim/plugin/ColorizerPlugin.vim rename to .vim/plugin/ColorizerPlugin.vim diff --git a/vim/.vimrc b/.vimrc similarity index 100% rename from vim/.vimrc rename to .vimrc diff --git a/README.md b/README.md index b8d09a9..cb53eee 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,20 @@ A place for backing up my dotfiles. -Usage - +Easiest installation is to clone repository into home directory - ```bash -git clone https://github.com/shaunrd0/dot -cd dot/ -stow i3 # Install i3 settings -stow bash # Install bash settings -# ... etc ... +git clone https://github.com/shaunrd0/dot ~/dot +cd ~/dot/ +stow . +``` + +If you'd rather clone elsewhere - + +```bash +git clone https://github.com/shaunrd0/dot /path/to/dot +cd /path/to/dot/ +stow -t ~ . ``` Note that the `dot/packages/` directory is for reference and is the only directory included not meant to be used with stow. If this directory is stowed there will be no real change to the system - you will still need to install the package lists manually. diff --git a/nitrogen/bg-saved.cfg b/bg-saved.cfg similarity index 100% rename from nitrogen/bg-saved.cfg rename to bg-saved.cfg diff --git a/nitrogen/nitrogen.cfg b/nitrogen.cfg similarity index 100% rename from nitrogen/nitrogen.cfg rename to nitrogen.cfg diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline deleted file mode 160000 index 297ca3d..0000000 --- a/vim/.vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 297ca3d00406064004be5f2a9923fe8c2406e6e9 diff --git a/vim/.vim/bundle/vim-signify b/vim/.vim/bundle/vim-signify deleted file mode 160000 index cb734ba..0000000 --- a/vim/.vim/bundle/vim-signify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cb734ba88d633aab1857b89f35495c8902d87248