Merge pull request #114 from arcticicestudio/feature/gh-113-migrate-t…

…o-git-crypt

Migrate to "git-crypt"

.git-crypt/.gitattributes

@@ -0,0 +1,4 @@
+# Do not edit this file. To specify the files to encrypt, create your own
+# .gitattributes file in the directory where your files are.
+* !filter !diff
+*.gpg binary

snowblocks/git/gitattributes

@@ -10,5 +10,7 @@
 # https://www.gnupg.org
 # https://wiki.archlinux.org/index.php/GnuPG
 
-*.igloocrypt filter=igloocrypt diff=igloocrypt
+*.igloocrypt filter=git-crypt diff=git-crypt
 .gitattributes !filter !diff
+.gitignore !filter !diff
+.gitmodules !filter !diff

snowblocks/git/gitconfig

@@ -11,28 +11,28 @@
 # https://github.com/so-fancy/diff-so-fancy#options
 
 [includeIf "gitdir:~/yggdrasil/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/bitbucket/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/bitfroest/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/github/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/gitlab/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/incubator/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/.igloo/"]
- path = ~/.gitconfig_auth
+ path = ~/.gitconfig-auth
 
 [includeIf "gitdir:~/code/job/"]
- path = ~/.gitconfig_auth_job
+ path = ~/.gitconfig-auth-job
 
 [core]
  repositoryFormatVersion = 0
@@ -54,9 +54,6 @@
  tool = intellij
  compactionHeuristic = true
 
-[diff "igloocrypt"]
- textconv = "~/.git-diff-igloocrypt"
-
 [difftool "intellij"]
  prompt = true
  cmd = idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
@@ -70,10 +67,6 @@
 [interactive]
  diffFilter = diff-so-fancy
 
-[filter "igloocrypt"]
- clean = "gpg --encrypt --recipient 60C54F1519346085"
- smudge = "gpg --decrypt"
-
 [merge]
  tool = intellij
  ff = false

snowblocks/git/snowblock.json

@@ -11,18 +11,23 @@
  }
  },
  "~/.git-commit-msg": null,
- "~/.git-diff-igloocrypt": null,
  "~/.gitconfig": null,
- "~/.gitconfig_auth": {
+ "~/.gitconfig-auth": {
  "hosts": {
- "archbook": "gitconfig_auth",
- "igloo": "gitconfig_auth"
+ "archbook": "gitconfig-auth",
+ "igloo": "gitconfig-auth"
  }
  },
- "~/.gitconfig_auth_job": {
+ "~/.gitconfig-auth-svengreb": {
  "hosts": {
- "archbook": "gitconfig_auth_job.igloocrypt",
- "igloo": "gitconfig_auth_job.igloocrypt"
+ "archbook": "gitconfig-auth-svengreb",
+ "igloo": "gitconfig-auth-svengreb"
+ }
+ },
+ "~/.gitconfig-auth-job": {
+ "hosts": {
+ "archbook": "gitconfig-auth-job.igloocrypt",
+ "igloo": "gitconfig-auth-job.igloocrypt"
  }
  },
  "~/.gitignore": null

snowblocks/tilix/snowblock.json

@@ -7,8 +7,8 @@
  "~/.config/tilix/bookmarks.json": {
  "create": true,
  "hosts": {
- "archbook": "bookmarks.json.archbook.igloocrypt",
- "igloo": "bookmarks.json.igloo.igloocrypt"
+ "archbook": "bookmarks-archbook.json.igloocrypt",
+ "igloo": "bookmarks-igloo.json.igloocrypt"
  }
  }
  }

snowblocks/xdg/snowblock.json

@@ -22,8 +22,8 @@
  "create": true,
  "force": true,
  "hosts": {
- "archbook": "gtk-3.0/bookmarks.archbook.igloocrypt",
- "igloo": "gtk-3.0/bookmarks.igloo.igloocrypt"
+ "archbook": "gtk-3.0/bookmarks-archbook.igloocrypt",
+ "igloo": "gtk-3.0/bookmarks-igloo.igloocrypt"
  }
  },
  "~/.local/share/applications/atom.desktop": {