Compare commits

..

No commits in common. "b22eb9b2ebf7fc9ae15606e887dd41c46e4a2cf6" and "006aa36b1ce6fcbaad605420459d3cfb82bfe68a" have entirely different histories.

19 changed files with 15 additions and 13 deletions

26
.gitmodules vendored
View File

@ -1,44 +1,44 @@
[submodule "vim/.vim/pathogen"] [submodule "vim/.vim/pathogen"]
path = base/.vim/pathogen path = vim/.vim/pathogen
url = https://github.com/tpope/vim-pathogen url = https://github.com/tpope/vim-pathogen
[submodule "vim/.vim/bundle/vim-closetag"] [submodule "vim/.vim/bundle/vim-closetag"]
path = base/.vim/bundle/vim-closetag path = vim/.vim/bundle/vim-closetag
url = https://github.com/alvan/vim-closetag.git url = https://github.com/alvan/vim-closetag.git
[submodule "vim/.vim/bundle/gruvbox"] [submodule "vim/.vim/bundle/gruvbox"]
path = base/.vim/bundle/gruvbox path = vim/.vim/bundle/gruvbox
url = https://github.com/morhetz/gruvbox url = https://github.com/morhetz/gruvbox
[submodule "vim/.vim/bundle/SimpylFold"] [submodule "vim/.vim/bundle/SimpylFold"]
path = base/.vim/bundle/SimpylFold path = vim/.vim/bundle/SimpylFold
url = https://github.com/tmhedberg/SimpylFold.git url = https://github.com/tmhedberg/SimpylFold.git
[submodule "vim/.vim/bundle/vim-template"] [submodule "vim/.vim/bundle/vim-template"]
path = base/.vim/bundle/vim-template path = vim/.vim/bundle/vim-template
url = https://github.com/aperezdc/vim-template.git url = https://github.com/aperezdc/vim-template.git
[submodule "vim/.vim/bundle/incsearch.vim"] [submodule "vim/.vim/bundle/incsearch.vim"]
path = base/.vim/bundle/incsearch.vim path = vim/.vim/bundle/incsearch.vim
url = https://github.com/haya14busa/incsearch.vim.git url = https://github.com/haya14busa/incsearch.vim.git
[submodule "vim/.vim/bundle/lightline.vim"] [submodule "vim/.vim/bundle/lightline.vim"]
path = base/.vim/bundle/lightline.vim path = vim/.vim/bundle/lightline.vim
url = https://github.com/itchyny/lightline.vim url = https://github.com/itchyny/lightline.vim
[submodule "vim/.vim/bundle/ale"] [submodule "vim/.vim/bundle/ale"]
path = base/.vim/bundle/ale path = vim/.vim/bundle/ale
url = https://github.com/w0rp/ale url = https://github.com/w0rp/ale
[submodule "vim/.vim/bundle/lightline-gruvbox.vim"] [submodule "vim/.vim/bundle/lightline-gruvbox.vim"]
path = base/.vim/bundle/lightline-gruvbox.vim path = vim/.vim/bundle/lightline-gruvbox.vim
url = https://github.com/shinchu/lightline-gruvbox.vim url = https://github.com/shinchu/lightline-gruvbox.vim
[submodule "vim/.vim/bundle/vim-css-color"] [submodule "vim/.vim/bundle/vim-css-color"]
path = base/.vim/bundle/vim-css-color path = vim/.vim/bundle/vim-css-color
url = https://github.com/ap/vim-css-color url = https://github.com/ap/vim-css-color
[submodule "vim/.vim/bundle/vim-javascript"] [submodule "vim/.vim/bundle/vim-javascript"]
path = base/.vim/bundle/vim-javascript path = vim/.vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript url = https://github.com/pangloss/vim-javascript
[submodule "vim/.vim/bundle/vim-ansible-yaml"] [submodule "vim/.vim/bundle/vim-ansible-yaml"]
path = base/.vim/bundle/vim-ansible-yaml path = vim/.vim/bundle/vim-ansible-yaml
url = https://github.com/chase/vim-ansible-yaml url = https://github.com/chase/vim-ansible-yaml
[submodule "firestarter/.firestarter"] [submodule "firestarter/.firestarter"]
path = firestarter/.firestarter path = firestarter/.firestarter
url = git@git.desu.ltd:salt/firestarter url = git@git.desu.ltd:salt/firestarter
[submodule "bin/.bin"] [submodule "bin/.bin"]
path = base/.bin path = bin/.bin
url = git@git.desu.ltd:salt/bin url = git@git.desu.ltd:salt/bin
[submodule "desktop-common/.minetest/games/mineclone2"] [submodule "desktop-common/.minetest/games/mineclone2"]
path = desktop-common/.minetest/games/mineclone2 path = desktop-common/.minetest/games/mineclone2

View File

@ -25,12 +25,14 @@ This stash contains a number of packages for numerous situations:
| package | description | | package | description |
| --- | --- | | --- | --- |
| `base` | The base package contains shell and core utility configuration. Other packages do not depend on it; it merely contains basic configuration that I find necessary in every case. | | `base` | The base package contains shell and core utility configuration. Other packages do not depend on it; it merely contains basic configuration that I find necessary in every case. |
| `bin` | My custom binaries, plonked at `~/.bin`. |
| `desktop-common` | Common configuration shared across all possible rices. This contains things such as keybindings for applications, Quake configs, Redshift, etc. Configuration files with themes are avoided where possible. | | `desktop-common` | Common configuration shared across all possible rices. This contains things such as keybindings for applications, Quake configs, Redshift, etc. Configuration files with themes are avoided where possible. |
| `desktop-gruvbox` | My current rice and its accompanying configs. A nice and simple one with Rofi, bspwm, Dunst, Compton, and Polybar. | | `desktop-gruvbox` | My current rice and its accompanying configs. A nice and simple one with Rofi, bspwm, Dunst, Compton, and Polybar. |
| `firestarter` | A custom set of desktop environment scripts that I threw together to manage my environment without worrying about the fine details all the time. See the Firestarter repo for more info. | | `firestarter` | A custom set of desktop environment scripts that I threw together to manage my environment without worrying about the fine details all the time. See the Firestarter repo for more info. |
| `git` | My personal git configuration. Separated from base because sometimes I don't want cockmail on all my commits. | | `git` | My personal git configuration. Separated from base because sometimes I don't want cockmail on all my commits. |
| `mac` | MacOS-specific configs. Very sparse; I hardly ever have to use one. | | `mac` | MacOS-specific configs. Very sparse; I hardly ever have to use one. |
| `ssh` | SSH configuration for my desktop machines. | | `ssh` | SSH configuration for my desktop machines. |
| `vim` | Configuration for Vim, everybody\*'s favorite text editor. Contains a fair few plugins and a mildly flabby `.vimrc`. |
Included within are also a handful of management scripts. Included within are also a handful of management scripts.

View File