From 967ffe1310479eb09b47e8e7362f8cf6805d5b6f Mon Sep 17 00:00:00 2001 From: Salt Date: Tue, 19 Jan 2021 02:16:17 -0600 Subject: [PATCH] Add a script for updating submodules, make README nicer --- README.md | 20 +++++++++++++++++++- submodule-checkout-masters-and-update.sh | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100755 submodule-checkout-masters-and-update.sh diff --git a/README.md b/README.md index 8e373002..0bfa97c2 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,22 @@ However, I would *also* highly recommend using this stow-based approach instead ## Overview -TODO: Overview of config sets +This stash contains a number of packages for numerous situations: + +| 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. | +| `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-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. | +| `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. | +| `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. + +| script | description | +| --- | --- | +| `submodule-checkout-masters-and-update.sh` | For every submodule in the repo, checks out its master branch (instead of the exact commit specified in the base repo) and then pulls from upstream. Effectively, this updates any submodules in the repo, such as Vim plugins, themes, etc. | diff --git a/submodule-checkout-masters-and-update.sh b/submodule-checkout-masters-and-update.sh new file mode 100755 index 00000000..7440c7db --- /dev/null +++ b/submodule-checkout-masters-and-update.sh @@ -0,0 +1,4 @@ +#! /bin/sh +git submodule update --recursive --remote --init +git submodule -q foreach 'git checkout -q master && git pull' +git status