From 88d121dd648e761c34093baf7a56f77e98fe8ffb Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Fri, 7 May 2021 10:14:26 -0400 Subject: [PATCH] README as Org File - Emacs font adjustment - Xmonad default terminal - Re-write dotfiles README as org file --- .config/emacs | 2 +- .xmonad | 2 +- README.md | 37 ------------------------- README.org | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 39 deletions(-) delete mode 100644 README.md create mode 100644 README.org diff --git a/.config/emacs b/.config/emacs index 45132b9..dfb8ea5 160000 --- a/.config/emacs +++ b/.config/emacs @@ -1 +1 @@ -Subproject commit 45132b934bdd951f7b7b87c53814de09ade5a37f +Subproject commit dfb8ea5e862699701bf4a46c74653153d9eaee36 diff --git a/.xmonad b/.xmonad index 1c3eb14..0dd425a 160000 --- a/.xmonad +++ b/.xmonad @@ -1 +1 @@ -Subproject commit 1c3eb1476ac58fd79b0882d3f191b2f183a4deb4 +Subproject commit 0dd425a4e4a83b77b76e68764b335a07b0278f51 diff --git a/README.md b/README.md deleted file mode 100644 index 882cca1..0000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# dotfiles - -Personal dotfiles repository - -## Install on a new system - -See [Acknowledgements](#Acknowledgements) for tutorial source. - -* Prior to the installation, create alias for config - * `alias config="GIT_WORK_TREE=~ GIT_DIR=~/.cfg"` -* Add `.cfg` to `.gitignore` - * `echo ".cfg" >> .gitignore` -* Clone dotfiles into a bare repository - * `git clone --bare $HOME/.cfg` -* Define the alias in the current shell scope - * `alias config="GIT_WORK_TREE=~ GIT_DIR=~/.cfg"` -* Checkout content from bare repository to `$HOME` - * `config git checkout` -* Step above might fail with a message like: - * ``` - error: The following untracked working tree files would be overwritten by checkout: - .bashrc - .gitignore - Please move or remove them before you can switch branches. - Aborting - ``` -* Delete `.bashrc` and `.gitignore` - * `rm ~/.bashrc ~/.gitignore` -* Re-run checkout - * `config git checkout` -* Set the flag `showUntrackedFiles` to `no` on this specific (local) repo - * `config git config --local status.showUntrackedFiles no` - -## Acknowledgements - -I followed [DistroTube](https://www.youtube.com/channel/UCVls1GmFKf6WlTraIb_IaJg)'s process for setting up a git bare repository as shown in [Git Bare Repository - A Better Way To Manage Dotfiles](https://youtu.be/tBoLDpTWVOM). -He references [The best way to store your dotfiles: A bare Git repository](https://www.atlassian.com/git/tutorials/dotfiles) by [Nicola Paolucci](https://www.durdn.com/). diff --git a/README.org b/README.org new file mode 100644 index 0000000..3267639 --- /dev/null +++ b/README.org @@ -0,0 +1,75 @@ +#+title: Personal Dotfiles +#+author: Sravan Balaji + +* Installation + +See [[*Acknowledgements]] for tutorial source. + +Prior to the installation, create alias for config + +#+begin_src shell + alias config="GIT_WORK_TREE=~ GIT_DIR=~/.cfg" +#+end_src + +Add ~.cfg~ to ~.gitignore~ + +#+begin_src shell + echo ".cfg" >> .gitignore +#+end_src + +Clone dotfiles into a bare repository + +#+begin_src shell + git clone --bare $HOME/.cfg +#+end_src + +Define the alias in the current shell scope + +#+begin_src shell + alias config="GIT_WORK_TREE=~ GIT_DIR=~/.cfg" +#+end_src + +Checkout content from bare repository to ~$HOME~ + +#+begin_src shell + config git checkout +#+end_src + +Step above might fail with a message like: + +#+begin_example + error: The following untracked working tree files would be overwritten by checkout: + .bashrc + .gitignore + Please move or remove them before you can switch branches. + Aborting +#+end_example + +Delete the untracked files so they can be overwritten with the version from dotfiles + +#+begin_src shell + rm ~/.bashrc ~/.gitignore +#+end_src + +Re-run checkout + +#+begin_src shell + config git checkout +#+end_src + +Set the flag ~showUntrackedFiles~ to ~no~ on this specific (local) repo + +#+begin_src shell + config git config --local status.showUntrackedFiles no +#+end_src + +Pull and update submodules + +#+begin_src shell + config git submodule update --init --recursive +#+end_src + +* Acknowledgements + +I followed [[https://www.youtube.com/channel/UCVls1GmFKf6WlTraIb_IaJg][DistroTube]]'s process for setting up a git bare repository as shown in [[https://youtu.be/tBoLDpTWVOM][Git Bare Repository - A Better Way To Manage Dotfiles]]. +He references [[https://www.atlassian.com/git/tutorials/dotfiles][The best way to store your dotfiles: A bare Git repository]] by [[https://www.durdn.com/][Nicola Paolucci]].