From de1dc7bab8cd83132da5d3b025373a3970ffd4a2 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Fri, 26 Apr 2019 06:12:51 -0400
Subject: [PATCH] Replace .homedir with ~, .os with linux

Update README.
---
 .chezmoiignore                                |  2 -
 README.md                                     |  7 +-
 dot_config/chezmoi/chezmoi-template.toml.tmpl |  2 +-
 dot_vimrc.tmpl                                |  2 +
 key_aliases.tmpl                              |  2 +-
 key_dirs.tmpl                                 | 88 +++++++++----------
 key_files.tmpl                                | 71 +++++++--------
 7 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/.chezmoiignore b/.chezmoiignore
index 93702db..a68186d 100755
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -11,6 +11,4 @@ txt/
 .imwheelrc
 .xinitrc
 .Xresources
-.zshrc
 {{ end }}
-.bashrc
diff --git a/README.md b/README.md
index 8c8b08f..cb0d4f8 100755
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Startup finished in 2.341s (kernel) + 1.085s (userspace) = 3.426s
 graphical.target reached after 1.085s in userspace
 ```
 * **Terminal**: [rxvt-unicode-pixbuf](https://www.wikiwand.com/en/Rxvt) 
-* **Shell**: [Zsh](http://zsh.sourceforge.net/) + [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+* **Shell**: [Fish](https://fishshell.com/)
 * **Window Manager**: [i3-gaps](https://github.com/Airblader/i3)
 * **Editor**: [Neovim](https://github.com/neovim/neovim) ([plugins](dotfiles/.vimrc#L51))
 * **File Manager**: [ranger](https://ranger.github.io/)
@@ -27,8 +27,7 @@ graphical.target reached after 1.085s in userspace
 <!---  Setup {{{ --> 
 
 ## Setup
-I use
-[Stow](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html)
-to symbolically link the configs/dotfiles.
+I use [chezmoi](https://github.com/twpayne/chezmoi) to manage varying
+configs for different machines with a single branch.
 
 <!---  }}} Setup --> 
diff --git a/dot_config/chezmoi/chezmoi-template.toml.tmpl b/dot_config/chezmoi/chezmoi-template.toml.tmpl
index 9af0962..505115e 100755
--- a/dot_config/chezmoi/chezmoi-template.toml.tmpl
+++ b/dot_config/chezmoi/chezmoi-template.toml.tmpl
@@ -1,4 +1,4 @@
-sourceDir = "{{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config"
+sourceDir = "~/linux-config"
 
 [data]
     gui = true
diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl
index 98ff0c0..0c27494 100755
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -230,6 +230,8 @@ Plug 'djoshea/vim-autoread'
 " Plug 'mustache/vim-mustache-handlebars'
 " Plug 'trapd00r/vim-syntax-vidir-ls'
 Plug 'calviken/vim-gdscript3'
+" display hex colors in Vim
+" Plug 'RRethy/vim-hexokinase'
 " ]]] vim-plug "
 
 " Mappings [[[ "
diff --git a/key_aliases.tmpl b/key_aliases.tmpl
index d3ebefe..e047cef 100755
--- a/key_aliases.tmpl
+++ b/key_aliases.tmpl
@@ -388,7 +388,7 @@ tcl "tex-clean"
 
 # mfs [[[ #
 
-mfs "nvim {{ .chezmoi.homedir }}/coding/best-mf-site-personal/index.html"
+mfs "nvim ~/coding/best-mf-site-personal/index.html"
 ht "python3 -m http.server"
 # j "jekyll"
 # js "jekyll serve"
diff --git a/key_dirs.tmpl b/key_dirs.tmpl
index 2b164f4..b507087 100755
--- a/key_dirs.tmpl
+++ b/key_dirs.tmpl
@@ -2,69 +2,69 @@
 
 # sys [[[ #
 
-bg {{ .chezmoi.homedir }}/Pictures/Backgrounds
-cf {{ .chezmoi.homedir }}/.config
-d  {{ .chezmoi.homedir }}/Downloads
-D  {{ .chezmoi.homedir }}/Documents
-fo {{ .chezmoi.homedir }}/.config/fish
-k {{ .chezmoi.homedir }}/
-lc {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config
-lf /mnt/{{ .chezmoi.os }}-files
-lfv /mnt/{{ .chezmoi.os }}-files/Videos
+bg ~/Pictures/Backgrounds
+cf ~/.config
+d  ~/Downloads
+D  ~/Documents
+fo ~/.config/fish
+k ~/
+lc ~/linux-config
+lf /mnt/linux-files
+lfv /mnt/linux-files/Videos
 me /run/media/{{ .chezmoi.group }}
 o /
-p {{ .chezmoi.homedir }}/.password-store
-P {{ .chezmoi.homedir }}/Pictures
-sw {{ .chezmoi.homedir }}/.local/share/nvim/swap/
+p ~/.password-store
+P ~/Pictures
+sw ~/.local/share/nvim/swap/
 tm /tmp
 
 # ]]] sys #
 
 # cdn [[[ #
 
-b1 {{ .chezmoi.homedir }}/coding/mf-site/themes/base16
-2d {{ .chezmoi.homedir }}/coding/godot-demos/2d-plat
-ad {{ .chezmoi.homedir }}/coding/ada-mario-prep
-cn {{ .chezmoi.homedir }}/coding
-ib {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/i3blocks/.config/i3blocks/scripts
-j {{ .chezmoi.homedir }}/Documents/journal
-lh {{ .chezmoi.homedir }}/Documents/listening-history
-mm {{ .chezmoi.homedir }}/coding/move-mouse-with-head
-ms {{ .chezmoi.homedir }}/coding/mf-site
-mh {{ .chezmoi.homedir }}/coding/mf-site/layouts
-# mg {{ .chezmoi.homedir }}/coding/best-mf-site-personal
-ra {{ .chezmoi.homedir }}/.config/ranger
-sr {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/scripts
-snp {{ .chezmoi.homedir }}/.vim/plugged/vim-snippets/UltiSnips
-sv {{ .chezmoi.homedir }}/coding/spotify-lib-vis/src
-svg {{ .chezmoi.homedir }}/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
-swa {{ .chezmoi.homedir }}/.local/share/nvim/swap
-tx {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/txt
-wd {{ .chezmoi.homedir }}/.config/watson
-wo {{ .chezmoi.homedir }}/Documents/workout-logs/11
+b1 ~/coding/mf-site/themes/base16
+2d ~/coding/godot-demos/2d-plat
+ad ~/coding/ada-mario-prep
+cn ~/coding
+ib ~/linux-config/i3blocks/.config/i3blocks/scripts
+j ~/Documents/journal
+lh ~/Documents/listening-history
+mm ~/coding/move-mouse-with-head
+ms ~/coding/mf-site
+mh ~/coding/mf-site/layouts
+# mg ~/coding/best-mf-site-personal
+ra ~/.config/ranger
+sr ~/linux-config/scripts
+snp ~/.vim/plugged/vim-snippets/UltiSnips
+sv ~/coding/spotify-lib-vis/src
+svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
+swa ~/.local/share/nvim/swap
+tx ~/linux-config/txt
+wd ~/.config/watson
+wo ~/Documents/workout-logs/11
 
 # ]]] cdn #
 
 # sch [[[ #
 
-lt {{ .chezmoi.homedir }}/school/latex-notes
+lt ~/school/latex-notes
 
 # 309 [[[ #
 
-sc {{ .chezmoi.homedir }}/school
-0c {{ .chezmoi.homedir }}/school/309-proj/css
-0d {{ .chezmoi.homedir }}/school/309
-0j {{ .chezmoi.homedir }}/school/309-proj/public/js
-0l {{ .chezmoi.homedir }}/school/309/l
-0p {{ .chezmoi.homedir }}/school/309-proj
-0m {{ .chezmoi.homedir }}/school/309-proj/mongo
-e4 {{ .chezmoi.homedir }}/school/309/e4
+sc ~/school
+0c ~/school/309-proj/css
+0d ~/school/309
+0j ~/school/309-proj/public/js
+0l ~/school/309/l
+0p ~/school/309-proj
+0m ~/school/309-proj/mongo
+e4 ~/school/309/e4
 
 # ]]] 309 #
 
-6 {{ .chezmoi.homedir }}/school/369
-6l {{ .chezmoi.homedir }}/school/369/notes/lectures
+6 ~/school/369
+6l ~/school/369/notes/lectures
 
-hp {{ .chezmoi.homedir }}/school/hps
+hp ~/school/hps
 
 # ]]] sch #
diff --git a/key_files.tmpl b/key_files.tmpl
index 7093c10..c52e057 100755
--- a/key_files.tmpl
+++ b/key_files.tmpl
@@ -2,44 +2,45 @@
 
 # sys [[[ #
 
-3 ~/{{ .chezmoi.os }}-config/dot_config/i3/config.tmpl
-a ~/{{ .chezmoi.os }}-config/key_aliases.tmpl
-dr ~/{{ .chezmoi.os }}-config/key_dirs.tmpl
-f ~/{{ .chezmoi.os }}-config/key_files.tmpl
-i {{ .chezmoi.homedir }}/.config/i3blocks/i3blocks.conf
-p {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/txt/pacman-pkgs/pacman-pkgs.txt
-r {{ .chezmoi.homedir }}/linux-config/dot_config/ranger/rc.conf
-sr {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/configs/ranger/shortcuts.conf
-ss {{ .chezmoi.homedir }}/.shortcuts
-u {{ .chezmoi.homedir }}/.Xresources
-v {{ .chezmoi.homedir }}/linux-config/dot_vimrc.tmpl
-x ~/{{ .chezmoi.os }}-config/dot_config/private_fish/config.fish.tmpl
-y {{ .chezmoi.homedir }}/.zshrc
-z {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/aliases/zsh_aliases
+3 ~/linux-config/dot_config/i3/config.tmpl
+a ~/linux-config/key_aliases.tmpl
+dr ~/linux-config/key_dirs.tmpl
+f ~/linux-config/key_files.tmpl
+hs ~/.local/share/fish/fish_history
+i ~/.config/i3blocks/i3blocks.conf
+p ~/linux-config/txt/pacman-pkgs/pacman-pkgs.txt
+r ~/linux-config/dot_config/ranger/rc.conf
+sr ~/linux-config/configs/ranger/shortcuts.conf
+ss ~/.shortcuts
+u ~/.Xresources
+v ~/linux-config/dot_vimrc.tmpl
+x ~/linux-config/dot_config/private_fish/config.fish.tmpl
+y ~/.zshrc
+z ~/linux-config/aliases/zsh_aliases
 
 # ]]] sys #
 
 # cdn [[[ #
 
 cm /tmp/commit-msg.txt
-bid {{ .chezmoi.homedir }}/coding/project-ideas/blog.md
-ci {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/txt/ideas.md
+bid ~/coding/project-ideas/blog.md
+ci ~/linux-config/txt/ideas.md
 cmd ./commit-msg.txt
-hlg {{ .chezmoi.homedir }}/coding/spotify-lib-vis/src/api/management/commands/update-history.log
-id {{ .chezmoi.homedir }}/coding/project-ideas/ideas.md
+hlg ~/coding/spotify-lib-vis/src/api/management/commands/update-history.log
+id ~/coding/project-ideas/ideas.md
 ig ./.gitignore
-jn {{ .chezmoi.homedir }}/Documents/journal/todo/2.md
-jt {{ .chezmoi.homedir }}/Documents/journal/todo/todo.md
-lh {{ .chezmoi.homedir }}/Documents/listening-history/polarbier.csv
-mc {{ .chezmoi.homedir }}/coding/mf-site/assets/sass/main.scss
-mi {{ .chezmoi.homedir }}/coding/mf-site/ideas.md
-ne {{ .chezmoi.homedir }}/{{ .chezmoi.os }}-config/configs/neofetch/config.conf
+jn ~/Documents/journal/todo/2.md
+jt ~/Documents/journal/todo/todo.md
+lh ~/Documents/listening-history/polarbier.csv
+mc ~/coding/mf-site/assets/sass/main.scss
+mi ~/coding/mf-site/ideas.md
+ne ~/linux-config/configs/neofetch/config.conf
 re README.md
 t todo.md
 tt txt/todo.md
-tm {{ .chezmoi.homedir }}/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets
-wh {{ .chezmoi.homedir }}/Documents/journal/todo/work-habit.md
-wt {{ .chezmoi.homedir }}/.config/watson/state.tmp
+tm ~/.vim/plugged/vim-snippets/UltiSnips/texmath.snippets
+wh ~/Documents/journal/todo/work-habit.md
+wt ~/.config/watson/state.tmp
 
 # ]]] cdn #
 
@@ -47,14 +48,14 @@ wt {{ .chezmoi.homedir }}/.config/watson/state.tmp
 
 # 309 [[[ #
 
-0c {{ .chezmoi.homedir }}/school/309-proj/sass/main.scss
-0h {{ .chezmoi.homedir }}/school/309-proj/public/js/helpers.js
-0i {{ .chezmoi.homedir }}/school/309-proj/public/index.html
-0m {{ .chezmoi.homedir }}/school/309-proj/public/js/main.js
-0f {{ .chezmoi.homedir }}/school/309-proj/public/js/food.js
-0s {{ .chezmoi.homedir }}/school/309-proj/server.js
-0t {{ .chezmoi.homedir }}/school/309-proj/public/js/stores.js
-0k {{ .chezmoi.homedir }}/school/309-proj/json/{{ .chezmoi.group }}.md
+0c ~/school/309-proj/sass/main.scss
+0h ~/school/309-proj/public/js/helpers.js
+0i ~/school/309-proj/public/index.html
+0m ~/school/309-proj/public/js/main.js
+0f ~/school/309-proj/public/js/food.js
+0s ~/school/309-proj/server.js
+0t ~/school/309-proj/public/js/stores.js
+0k ~/school/309-proj/json/{{ .chezmoi.group }}.md
 
 # ]]] 309 #