From d1da7c6e1544f1084a36c75d11f93d95f26ba349 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 10 Jun 2021 10:10:59 +0100
Subject: [PATCH] Re-organise to use a bare repo
Re-organise to use a bare repo, e.g.
https://www.atlassian.com/git/tutorials/dotfiles.
---
{tag-php/composer => .composer}/.gitignore | 0
{tag-php/composer => .composer}/composer.json | 0
{tag-php/composer => .composer}/composer.lock | 0
.../coc/extensions/package.json | 0
{config => .config}/dconf-settings.ini | 0
.../config => .config}/nvim/coc-settings.json | 0
{tag-vim/config => .config}/nvim/init.vim | 0
.config/nvim/plugged/auto-pairs | 1 +
.config/nvim/plugged/blamer.nvim | 1 +
.config/nvim/plugged/coc.nvim | 1 +
.config/nvim/plugged/editorconfig-vim | 1 +
.config/nvim/plugged/fzf | 1 +
.config/nvim/plugged/fzf.vim | 1 +
.config/nvim/plugged/indentLine | 1 +
.config/nvim/plugged/nerdcommenter | 1 +
.config/nvim/plugged/nerdtree | 1 +
.config/nvim/plugged/nord-vim | 1 +
.config/nvim/plugged/phpactor | 1 +
.config/nvim/plugged/vim-airline | 1 +
.config/nvim/plugged/vim-gitgutter | 1 +
.config/nvim/plugged/vim-highlightedyank | 1 +
.config/nvim/plugged/vim-polyglot | 1 +
.config/nvim/plugged/vim-sort-motion | 1 +
.config/nvim/plugged/vim-surround | 1 +
.config/nvim/plugged/vim-tmux-navigator | 1 +
.config/nvim/plugged/vim-visual-multi | 1 +
{tag-vim/config => .config}/nvim/plugins.vim | 0
.../nvim/plugins/airline.vim | 0
.../nvim/plugins/blamer.vim | 0
.../config => .config}/nvim/plugins/coc.vim | 0
.../nvim/plugins/nerdtree.vim | 0
.../config => .config}/nvim/plugins/nord.vim | 0
{tag-git/git_template => .git_template}/HEAD | 0
tag-git/gitconfig => .gitconfig | 0
tag-git/gitignore-global => .gitignore-global | 0
tag-git/gitmessage => .gitmessage | 0
hushlogin => .hushlogin | 0
tag-npm/npmrc => .npmrc | 0
tag-tmux/tmux.conf => .tmux.conf | 0
{tag-zsh/zsh => .zsh}/completion-scripts/_g | 0
{tag-zsh/zsh => .zsh}/completion-scripts/_m | 0
{tag-zsh/zsh => .zsh}/configs/aliases.zsh | 0
{tag-zsh/zsh => .zsh}/configs/colour.zsh | 0
{tag-zsh/zsh => .zsh}/configs/functions.zsh | 0
{tag-zsh/zsh => .zsh}/configs/general.zsh | 0
{tag-zsh/zsh => .zsh}/configs/git.zsh | 0
{tag-zsh/zsh => .zsh}/configs/history.zsh | 0
{tag-zsh/zsh => .zsh}/configs/nvm.zsh | 0
{tag-zsh/zsh => .zsh}/configs/options.zsh | 0
{tag-zsh/zsh => .zsh}/configs/path.zsh | 0
{tag-zsh/zsh => .zsh}/configs/platformsh.zsh | 0
{tag-zsh/zsh => .zsh}/configs/plugins.zsh | 0
.../zsh => .zsh}/configs/post/completion.zsh | 0
{tag-zsh/zsh => .zsh}/configs/prompt.zsh | 0
{tag-zsh/zsh => .zsh}/configs/tmux.zsh | 0
tag-zsh/zshenv => .zshenv | 0
tag-zsh/zshrc => .zshrc | 0
tag-alacritty/config/alacritty/alacritty.yml | 66 -------------------
tag-git/gitconfig-inviqa | 2 -
59 files changed, 19 insertions(+), 68 deletions(-)
rename {tag-php/composer => .composer}/.gitignore (100%)
rename {tag-php/composer => .composer}/composer.json (100%)
rename {tag-php/composer => .composer}/composer.lock (100%)
rename {tag-vim/config => .config}/coc/extensions/package.json (100%)
rename {config => .config}/dconf-settings.ini (100%)
rename {tag-vim/config => .config}/nvim/coc-settings.json (100%)
rename {tag-vim/config => .config}/nvim/init.vim (100%)
create mode 160000 .config/nvim/plugged/auto-pairs
create mode 160000 .config/nvim/plugged/blamer.nvim
create mode 160000 .config/nvim/plugged/coc.nvim
create mode 160000 .config/nvim/plugged/editorconfig-vim
create mode 160000 .config/nvim/plugged/fzf
create mode 160000 .config/nvim/plugged/fzf.vim
create mode 160000 .config/nvim/plugged/indentLine
create mode 160000 .config/nvim/plugged/nerdcommenter
create mode 160000 .config/nvim/plugged/nerdtree
create mode 160000 .config/nvim/plugged/nord-vim
create mode 160000 .config/nvim/plugged/phpactor
create mode 160000 .config/nvim/plugged/vim-airline
create mode 160000 .config/nvim/plugged/vim-gitgutter
create mode 160000 .config/nvim/plugged/vim-highlightedyank
create mode 160000 .config/nvim/plugged/vim-polyglot
create mode 160000 .config/nvim/plugged/vim-sort-motion
create mode 160000 .config/nvim/plugged/vim-surround
create mode 160000 .config/nvim/plugged/vim-tmux-navigator
create mode 160000 .config/nvim/plugged/vim-visual-multi
rename {tag-vim/config => .config}/nvim/plugins.vim (100%)
rename {tag-vim/config => .config}/nvim/plugins/airline.vim (100%)
rename {tag-vim/config => .config}/nvim/plugins/blamer.vim (100%)
rename {tag-vim/config => .config}/nvim/plugins/coc.vim (100%)
rename {tag-vim/config => .config}/nvim/plugins/nerdtree.vim (100%)
rename {tag-vim/config => .config}/nvim/plugins/nord.vim (100%)
rename {tag-git/git_template => .git_template}/HEAD (100%)
rename tag-git/gitconfig => .gitconfig (100%)
rename tag-git/gitignore-global => .gitignore-global (100%)
rename tag-git/gitmessage => .gitmessage (100%)
rename hushlogin => .hushlogin (100%)
rename tag-npm/npmrc => .npmrc (100%)
rename tag-tmux/tmux.conf => .tmux.conf (100%)
rename {tag-zsh/zsh => .zsh}/completion-scripts/_g (100%)
rename {tag-zsh/zsh => .zsh}/completion-scripts/_m (100%)
rename {tag-zsh/zsh => .zsh}/configs/aliases.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/colour.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/functions.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/general.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/git.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/history.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/nvm.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/options.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/path.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/platformsh.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/plugins.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/post/completion.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/prompt.zsh (100%)
rename {tag-zsh/zsh => .zsh}/configs/tmux.zsh (100%)
rename tag-zsh/zshenv => .zshenv (100%)
rename tag-zsh/zshrc => .zshrc (100%)
delete mode 100644 tag-alacritty/config/alacritty/alacritty.yml
delete mode 100644 tag-git/gitconfig-inviqa
diff --git a/tag-php/composer/.gitignore b/.composer/.gitignore
similarity index 100%
rename from tag-php/composer/.gitignore
rename to .composer/.gitignore
diff --git a/tag-php/composer/composer.json b/.composer/composer.json
similarity index 100%
rename from tag-php/composer/composer.json
rename to .composer/composer.json
diff --git a/tag-php/composer/composer.lock b/.composer/composer.lock
similarity index 100%
rename from tag-php/composer/composer.lock
rename to .composer/composer.lock
diff --git a/tag-vim/config/coc/extensions/package.json b/.config/coc/extensions/package.json
similarity index 100%
rename from tag-vim/config/coc/extensions/package.json
rename to .config/coc/extensions/package.json
diff --git a/config/dconf-settings.ini b/.config/dconf-settings.ini
similarity index 100%
rename from config/dconf-settings.ini
rename to .config/dconf-settings.ini
diff --git a/tag-vim/config/nvim/coc-settings.json b/.config/nvim/coc-settings.json
similarity index 100%
rename from tag-vim/config/nvim/coc-settings.json
rename to .config/nvim/coc-settings.json
diff --git a/tag-vim/config/nvim/init.vim b/.config/nvim/init.vim
similarity index 100%
rename from tag-vim/config/nvim/init.vim
rename to .config/nvim/init.vim
diff --git a/.config/nvim/plugged/auto-pairs b/.config/nvim/plugged/auto-pairs
new file mode 160000
index 00000000..39f06b87
--- /dev/null
+++ b/.config/nvim/plugged/auto-pairs
@@ -0,0 +1 @@
+Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76
diff --git a/.config/nvim/plugged/blamer.nvim b/.config/nvim/plugged/blamer.nvim
new file mode 160000
index 00000000..1d5c4b5b
--- /dev/null
+++ b/.config/nvim/plugged/blamer.nvim
@@ -0,0 +1 @@
+Subproject commit 1d5c4b5bcb0e25265ec6e112dcbd1226c4875648
diff --git a/.config/nvim/plugged/coc.nvim b/.config/nvim/plugged/coc.nvim
new file mode 160000
index 00000000..1a74bf3c
--- /dev/null
+++ b/.config/nvim/plugged/coc.nvim
@@ -0,0 +1 @@
+Subproject commit 1a74bf3c57fec8442f837b3baad0d6fb75d1b97a
diff --git a/.config/nvim/plugged/editorconfig-vim b/.config/nvim/plugged/editorconfig-vim
new file mode 160000
index 00000000..f305bc77
--- /dev/null
+++ b/.config/nvim/plugged/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit f305bc77faef4b418aee65682d7d147f64cfd5a9
diff --git a/.config/nvim/plugged/fzf b/.config/nvim/plugged/fzf
new file mode 160000
index 00000000..a4bc08f5
--- /dev/null
+++ b/.config/nvim/plugged/fzf
@@ -0,0 +1 @@
+Subproject commit a4bc08f5a35da6e374a2ce0da4c931d7fd32fdf1
diff --git a/.config/nvim/plugged/fzf.vim b/.config/nvim/plugged/fzf.vim
new file mode 160000
index 00000000..e34f6c12
--- /dev/null
+++ b/.config/nvim/plugged/fzf.vim
@@ -0,0 +1 @@
+Subproject commit e34f6c129d39b90db44df1107c8b7dfacfd18946
diff --git a/.config/nvim/plugged/indentLine b/.config/nvim/plugged/indentLine
new file mode 160000
index 00000000..5617a1cf
--- /dev/null
+++ b/.config/nvim/plugged/indentLine
@@ -0,0 +1 @@
+Subproject commit 5617a1cf7d315e6e6f84d825c85e3b669d220bfa
diff --git a/.config/nvim/plugged/nerdcommenter b/.config/nvim/plugged/nerdcommenter
new file mode 160000
index 00000000..a5d16631
--- /dev/null
+++ b/.config/nvim/plugged/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit a5d1663185bee20bfb120c9ab212144444514982
diff --git a/.config/nvim/plugged/nerdtree b/.config/nvim/plugged/nerdtree
new file mode 160000
index 00000000..81f3eaba
--- /dev/null
+++ b/.config/nvim/plugged/nerdtree
@@ -0,0 +1 @@
+Subproject commit 81f3eaba295b3fceb2d032db57e5eae99ae480f8
diff --git a/.config/nvim/plugged/nord-vim b/.config/nvim/plugged/nord-vim
new file mode 160000
index 00000000..e5a54c7f
--- /dev/null
+++ b/.config/nvim/plugged/nord-vim
@@ -0,0 +1 @@
+Subproject commit e5a54c7f0928de8b89bc00eea4dfeeb179f546e4
diff --git a/.config/nvim/plugged/phpactor b/.config/nvim/plugged/phpactor
new file mode 160000
index 00000000..6d400b88
--- /dev/null
+++ b/.config/nvim/plugged/phpactor
@@ -0,0 +1 @@
+Subproject commit 6d400b88d5f790d91427e333caa0cd9d5b0441ad
diff --git a/.config/nvim/plugged/vim-airline b/.config/nvim/plugged/vim-airline
new file mode 160000
index 00000000..a8b3c254
--- /dev/null
+++ b/.config/nvim/plugged/vim-airline
@@ -0,0 +1 @@
+Subproject commit a8b3c254d0e5c43be24298ce16cd01f740fe8d42
diff --git a/.config/nvim/plugged/vim-gitgutter b/.config/nvim/plugged/vim-gitgutter
new file mode 160000
index 00000000..10998f30
--- /dev/null
+++ b/.config/nvim/plugged/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit 10998f303cd85405e51380f6dc406dd756c105e8
diff --git a/.config/nvim/plugged/vim-highlightedyank b/.config/nvim/plugged/vim-highlightedyank
new file mode 160000
index 00000000..931cc6bd
--- /dev/null
+++ b/.config/nvim/plugged/vim-highlightedyank
@@ -0,0 +1 @@
+Subproject commit 931cc6bd53e4a1fdbe592751f0e13c0e401f0a49
diff --git a/.config/nvim/plugged/vim-polyglot b/.config/nvim/plugged/vim-polyglot
new file mode 160000
index 00000000..730dcb02
--- /dev/null
+++ b/.config/nvim/plugged/vim-polyglot
@@ -0,0 +1 @@
+Subproject commit 730dcb02caab60a6ae5d8b4bdc16d290041061ec
diff --git a/.config/nvim/plugged/vim-sort-motion b/.config/nvim/plugged/vim-sort-motion
new file mode 160000
index 00000000..c8782be8
--- /dev/null
+++ b/.config/nvim/plugged/vim-sort-motion
@@ -0,0 +1 @@
+Subproject commit c8782be8f7da414c6442b3ba4b6abb0345d392d9
diff --git a/.config/nvim/plugged/vim-surround b/.config/nvim/plugged/vim-surround
new file mode 160000
index 00000000..f51a26d3
--- /dev/null
+++ b/.config/nvim/plugged/vim-surround
@@ -0,0 +1 @@
+Subproject commit f51a26d3710629d031806305b6c8727189cd1935
diff --git a/.config/nvim/plugged/vim-tmux-navigator b/.config/nvim/plugged/vim-tmux-navigator
new file mode 160000
index 00000000..0cabb1ef
--- /dev/null
+++ b/.config/nvim/plugged/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit 0cabb1ef01af0986b7bf6fb7acf631debdbbb470
diff --git a/.config/nvim/plugged/vim-visual-multi b/.config/nvim/plugged/vim-visual-multi
new file mode 160000
index 00000000..8041a909
--- /dev/null
+++ b/.config/nvim/plugged/vim-visual-multi
@@ -0,0 +1 @@
+Subproject commit 8041a909fc3f740e9d110dd2e95980ff4645785b
diff --git a/tag-vim/config/nvim/plugins.vim b/.config/nvim/plugins.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins.vim
rename to .config/nvim/plugins.vim
diff --git a/tag-vim/config/nvim/plugins/airline.vim b/.config/nvim/plugins/airline.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins/airline.vim
rename to .config/nvim/plugins/airline.vim
diff --git a/tag-vim/config/nvim/plugins/blamer.vim b/.config/nvim/plugins/blamer.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins/blamer.vim
rename to .config/nvim/plugins/blamer.vim
diff --git a/tag-vim/config/nvim/plugins/coc.vim b/.config/nvim/plugins/coc.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins/coc.vim
rename to .config/nvim/plugins/coc.vim
diff --git a/tag-vim/config/nvim/plugins/nerdtree.vim b/.config/nvim/plugins/nerdtree.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins/nerdtree.vim
rename to .config/nvim/plugins/nerdtree.vim
diff --git a/tag-vim/config/nvim/plugins/nord.vim b/.config/nvim/plugins/nord.vim
similarity index 100%
rename from tag-vim/config/nvim/plugins/nord.vim
rename to .config/nvim/plugins/nord.vim
diff --git a/tag-git/git_template/HEAD b/.git_template/HEAD
similarity index 100%
rename from tag-git/git_template/HEAD
rename to .git_template/HEAD
diff --git a/tag-git/gitconfig b/.gitconfig
similarity index 100%
rename from tag-git/gitconfig
rename to .gitconfig
diff --git a/tag-git/gitignore-global b/.gitignore-global
similarity index 100%
rename from tag-git/gitignore-global
rename to .gitignore-global
diff --git a/tag-git/gitmessage b/.gitmessage
similarity index 100%
rename from tag-git/gitmessage
rename to .gitmessage
diff --git a/hushlogin b/.hushlogin
similarity index 100%
rename from hushlogin
rename to .hushlogin
diff --git a/tag-npm/npmrc b/.npmrc
similarity index 100%
rename from tag-npm/npmrc
rename to .npmrc
diff --git a/tag-tmux/tmux.conf b/.tmux.conf
similarity index 100%
rename from tag-tmux/tmux.conf
rename to .tmux.conf
diff --git a/tag-zsh/zsh/completion-scripts/_g b/.zsh/completion-scripts/_g
similarity index 100%
rename from tag-zsh/zsh/completion-scripts/_g
rename to .zsh/completion-scripts/_g
diff --git a/tag-zsh/zsh/completion-scripts/_m b/.zsh/completion-scripts/_m
similarity index 100%
rename from tag-zsh/zsh/completion-scripts/_m
rename to .zsh/completion-scripts/_m
diff --git a/tag-zsh/zsh/configs/aliases.zsh b/.zsh/configs/aliases.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/aliases.zsh
rename to .zsh/configs/aliases.zsh
diff --git a/tag-zsh/zsh/configs/colour.zsh b/.zsh/configs/colour.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/colour.zsh
rename to .zsh/configs/colour.zsh
diff --git a/tag-zsh/zsh/configs/functions.zsh b/.zsh/configs/functions.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/functions.zsh
rename to .zsh/configs/functions.zsh
diff --git a/tag-zsh/zsh/configs/general.zsh b/.zsh/configs/general.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/general.zsh
rename to .zsh/configs/general.zsh
diff --git a/tag-zsh/zsh/configs/git.zsh b/.zsh/configs/git.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/git.zsh
rename to .zsh/configs/git.zsh
diff --git a/tag-zsh/zsh/configs/history.zsh b/.zsh/configs/history.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/history.zsh
rename to .zsh/configs/history.zsh
diff --git a/tag-zsh/zsh/configs/nvm.zsh b/.zsh/configs/nvm.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/nvm.zsh
rename to .zsh/configs/nvm.zsh
diff --git a/tag-zsh/zsh/configs/options.zsh b/.zsh/configs/options.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/options.zsh
rename to .zsh/configs/options.zsh
diff --git a/tag-zsh/zsh/configs/path.zsh b/.zsh/configs/path.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/path.zsh
rename to .zsh/configs/path.zsh
diff --git a/tag-zsh/zsh/configs/platformsh.zsh b/.zsh/configs/platformsh.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/platformsh.zsh
rename to .zsh/configs/platformsh.zsh
diff --git a/tag-zsh/zsh/configs/plugins.zsh b/.zsh/configs/plugins.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/plugins.zsh
rename to .zsh/configs/plugins.zsh
diff --git a/tag-zsh/zsh/configs/post/completion.zsh b/.zsh/configs/post/completion.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/post/completion.zsh
rename to .zsh/configs/post/completion.zsh
diff --git a/tag-zsh/zsh/configs/prompt.zsh b/.zsh/configs/prompt.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/prompt.zsh
rename to .zsh/configs/prompt.zsh
diff --git a/tag-zsh/zsh/configs/tmux.zsh b/.zsh/configs/tmux.zsh
similarity index 100%
rename from tag-zsh/zsh/configs/tmux.zsh
rename to .zsh/configs/tmux.zsh
diff --git a/tag-zsh/zshenv b/.zshenv
similarity index 100%
rename from tag-zsh/zshenv
rename to .zshenv
diff --git a/tag-zsh/zshrc b/.zshrc
similarity index 100%
rename from tag-zsh/zshrc
rename to .zshrc
diff --git a/tag-alacritty/config/alacritty/alacritty.yml b/tag-alacritty/config/alacritty/alacritty.yml
deleted file mode 100644
index 1b08f8b9..00000000
--- a/tag-alacritty/config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-window:
- background_opacity: 1
- decorations: full
- dyanmic_title: false
- padding:
- x: 6
- y: 6
-
-font:
- italic:
- family: 'Source Code Pro'
- style: Regular
- normal:
- family: 'Source Code Pro'
- style: Regular
- size: 15
-
-# Nord
-colors:
- primary:
- background: '0x2e3440'
- dim_foreground: '0xa5abb6'
- foreground: '0xd8dee9'
- cursor:
- cursor: '0xd8dee9'
- text: '0x2e3440'
- vi_mode_cursor:
- cursor: '0xd8dee9'
- text: '0x2e3440'
- selection:
- background: '0x4c566a'
- text: CellForeground
- search:
- matches:
- background: '0x88c0d0'
- foreground: CellBackground
- bar:
- background: '0x434c5e'
- foreground: '0xd8dee9'
- normal:
- black: '0x3b4252'
- blue: '0x81a1c1'
- cyan: '0x88c0d0'
- green: '0xa3be8c'
- magenta: '0xb48ead'
- red: '0xbf616a'
- white: '0xe5e9f0'
- yellow: '0xebcb8b'
- bright:
- black: '0x4c566a'
- blue: '0x81a1c1'
- cyan: '0x8fbcbb'
- green: '0xa3be8c'
- magenta: '0xb48ead'
- red: '0xbf616a'
- white: '0xeceff4'
- yellow: '0xebcb8b'
- dim:
- black: '0x373e4d'
- blue: '0x68809a'
- cyan: '0x6d96a5'
- green: '0x809575'
- magenta: '0x8c738c'
- red: '0x94545d'
- white: '0xaeb3bb'
- yellow: '0xb29e75'
diff --git a/tag-git/gitconfig-inviqa b/tag-git/gitconfig-inviqa
deleted file mode 100644
index 1e1dd142..00000000
--- a/tag-git/gitconfig-inviqa
+++ /dev/null
@@ -1,2 +0,0 @@
-[user]
- email = oliver.davies+github@inviqa.com