From b9d8518472190524a6b0f6a9a64756363e2b8cea Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 15:31:33 +0200 Subject: [PATCH 1/5] Reverse solution from GH-64 1. Deleted the custom `git-diff-igloocrypt` script 2. Removed the custom `[diff "igloocrypt"]` section from the `gitconfig` file 3. Removed the custom filter "igloocrypt" from the `gitconfig` file 4. Updated the `filter` and `diff` custom global Git attributes handler for all `*.igloocrypt` files to the new `git-crypt` setup GH-113 --- snowblocks/git/git-diff-igloocrypt | 12 ------------ snowblocks/git/gitattributes | 4 +++- snowblocks/git/gitconfig | 7 ------- snowblocks/git/snowblock.json | 1 - 4 files changed, 3 insertions(+), 21 deletions(-) delete mode 100755 snowblocks/git/git-diff-igloocrypt diff --git a/snowblocks/git/git-diff-igloocrypt b/snowblocks/git/git-diff-igloocrypt deleted file mode 100755 index a3080d4..0000000 --- a/snowblocks/git/git-diff-igloocrypt +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2016-2017 Arctic Ice Studio -# Copyright (c) 2016-2017 Sven Greb - -# Project: igloo -# Repository: https://github.com/arcticicestudio/igloo -# License: MIT - -# GPG decryption command for the "igloocrypt" diff filter -# The output is redirected to suppress error messages caused by the Git filter flow. - -gpg --decrypt --batch --no-tty "$1" > /dev/null 2>&1 || cat $1 diff --git a/snowblocks/git/gitattributes b/snowblocks/git/gitattributes index 400e25b..2fa4441 100644 --- a/snowblocks/git/gitattributes +++ b/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 diff --git a/snowblocks/git/gitconfig b/snowblocks/git/gitconfig index 35874a9..a65ec72 100755 --- a/snowblocks/git/gitconfig +++ b/snowblocks/git/gitconfig @@ -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 diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json index 424439a..471b96a 100644 --- a/snowblocks/git/snowblock.json +++ b/snowblocks/git/snowblock.json @@ -11,7 +11,6 @@ } }, "~/.git-commit-msg": null, - "~/.git-diff-igloocrypt": null, "~/.gitconfig": null, "~/.gitconfig_auth": { "hosts": { From 6cb24f2ee51f595245a086410e1a775cfca5d829 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 15:58:12 +0200 Subject: [PATCH 2/5] Remove currently encrypted files 1. Decrypted all `*.igloocrypt` files and backuped them up outside the repository 2. Deleted all `*.igloocrypt` files within the repository GH-113 --- snowblocks/git/gitconfig_auth | 5 ----- snowblocks/git/gitconfig_auth_job.igloocrypt | Bin 690 -> 0 bytes snowblocks/git/snowblock.json | 12 ------------ .../tilix/bookmarks.json.archbook.igloocrypt | Bin 966 -> 0 bytes snowblocks/tilix/bookmarks.json.igloo.igloocrypt | Bin 876 -> 0 bytes snowblocks/tilix/snowblock.json | 11 ----------- snowblocks/xdg/snowblock.json | 8 -------- 7 files changed, 36 deletions(-) delete mode 100644 snowblocks/git/gitconfig_auth delete mode 100644 snowblocks/git/gitconfig_auth_job.igloocrypt delete mode 100644 snowblocks/tilix/bookmarks.json.archbook.igloocrypt delete mode 100644 snowblocks/tilix/bookmarks.json.igloo.igloocrypt diff --git a/snowblocks/git/gitconfig_auth b/snowblocks/git/gitconfig_auth deleted file mode 100644 index 55f85fb..0000000 --- a/snowblocks/git/gitconfig_auth +++ /dev/null @@ -1,5 +0,0 @@ -[user] - name = Arctic Ice Studio - email = development@arcticicestudio.com - signingkey = 60C54F1519346085 - useconfigonly = true diff --git a/snowblocks/git/gitconfig_auth_job.igloocrypt b/snowblocks/git/gitconfig_auth_job.igloocrypt deleted file mode 100644 index 17d731e3d3378c27770fc0becc0fd9ae3b673146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{se0t^H4xkqa?CzqW85B@wp+t_+%#8vY4K!TfelCHM?fc5W;@WR!YV;^m_ z_edc%o9cCH*M6+=a{q|<$v*5eKkDZe26NMNqI2QE!t((vQh>T^B*}h_KEni6I~dOE z0${LLW++bIq2xg!Zajd}8QQEzj~2*4NR}w`e85@TsIVg&W~Dt{VN8ULQ@F=y=B5s}c><*}&8`xY>~aYHRbVFB33fJ=+Qu&2|Nx5)Ysb!bTM?s=->0bztPRUcI+mwTVtbEfPr|Ec=O9#u^q7+}+m(`zUDcHN10{+WO3q=ZLCGXtzv*$1pf z;#_1<`7=NvDrlbBO$vgN5bXTGGRxJz9?U?i#0}1rXUF45OO%2RZi1U2CBUY#ML%ta zb1b+ACtGaA5dk-A`CIP{{b^5aG1~PHHVFW9xc&_-K;PjF7K(H&KmsR1`fkWbq)1=HD~@M2bmo6u%k{ZW{s_mmG(<-YtC5GwG!{xfYorW^ z7YCI9_r$(6kqQX)t2X;fqkaC%pK>m}Dyqo>BcO3Moz-HP1Qn*TtLOn_x{~ok;AbbP YYhRZ<`QU~G?Q}^x*p=+dpG||t3yK_2XaE2J diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json index 471b96a..3c62dfe 100644 --- a/snowblocks/git/snowblock.json +++ b/snowblocks/git/snowblock.json @@ -12,18 +12,6 @@ }, "~/.git-commit-msg": null, "~/.gitconfig": null, - "~/.gitconfig_auth": { - "hosts": { - "archbook": "gitconfig_auth", - "igloo": "gitconfig_auth" - } - }, - "~/.gitconfig_auth_job": { - "hosts": { - "archbook": "gitconfig_auth_job.igloocrypt", - "igloo": "gitconfig_auth_job.igloocrypt" - } - }, "~/.gitignore": null } } diff --git a/snowblocks/tilix/bookmarks.json.archbook.igloocrypt b/snowblocks/tilix/bookmarks.json.archbook.igloocrypt deleted file mode 100644 index 4c1b1fcae772b604811505ec59bc6d2293f5aef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 966 zcmV;%13CPK0t^H4xkqa?CzqW85C2@lcas@;pG(+2ElCeoGq;DQh9nltWZ)X@(RRdA zBIEMnaHwS5ZU+mzmGFrbTK8GMf9uYSlx5E{%tpYD0{_}H#K6NP84`lTR{oax<=0hB zq3ZI*%tZ{k`)rgv?6>G5>l!+=5-YWe^Oqn?FDLKj3w!sh@M9XxYV1d1uh!)c)zqO= zpPyDppGlO)ON~IP^Dn@!E8js04kruzy>Ur3ouZS!6U!T0%1@H#&2k>|9H_uOr(XQ( zv*PyBCm~FdB9k^QTqBr6^N@3l%iD9hO!SKmDz8;uOSQeE_Uyw!W+!?zhIJJ(^`qgo zycEXn^9G<;Q7SiB@ftX*it!EN4J^rf?Pb33U?7u#`xwOJiz{ zWInsA-<%W`$x}Q06VPs5^7R}|1O4SO?dA>Fz+%9@K2Fc~8IWk0Z3CQ3-j6AHKRI-^ zJ6xccueh=mJ5jrRN>m1v<345tJs37|0bAsKp9?Tyyp9^u>4jc^iq9`g=Es|%`@1sHN(zGm?c2qdYmK9@GDMyKWCOZ)BNvG omew?fb|m%@7Up_`-d_p(IrsX86`reNn0h!7jNiY4S8V03OxsA|M*si- diff --git a/snowblocks/tilix/bookmarks.json.igloo.igloocrypt b/snowblocks/tilix/bookmarks.json.igloo.igloocrypt deleted file mode 100644 index ba0530e05d6bf45f6b2bebb9683210a6f5b3799c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 876 zcmV-y1C#uP0t^H4xkqa?CzqW85C3)0BMZS_+{<9prU#2p@3?}jPsN=#yjM_$%o1{; zH#<6l#D?R--*8AwX zLPs%pa}4Q@`()@>%UOxiI-OnQENHqsLfPir^*W@|rwso$e7~eCYB|MSSSh&^6pnTZ zgq8!2D-EAS!%4|Pxit=;>OPpe!(mHsE}Y*s zRsf+nqgL@*G*|3J*DquO$?yKhTHoM@ITfISV$3h0lqh^tz@^(HqLrQAdd|<(o+9Z5 zf)QReOwakb&9xa}w$EjelgrW6l;eXfn=fd@MGm!OtN@@tZYP$>hGDG+t8af-wOMi2 z@^8tL7a5L4(5jTJcSR~L7|x-qSzqQSc7=vIG<5T{EaW@MmY+V z&a2qVsHxJeuo$u>bmG#$ngIvzQu@5ld;DERf+Y(ulCP=g7<*e;i%l5G z%=rEBj_7Ku6+ECDcmZdQJ9=uG%jv5vqvn4=uE%4T2q{czLgY=k48|+2wBz zr{OHu6v8NNGN{IIe8?V|X?HN0?x^r=)#Yi&w9vHG_LDt(t|R2*rz@0izp)ZXkp$D CgTGP$ diff --git a/snowblocks/tilix/snowblock.json b/snowblocks/tilix/snowblock.json index a25a4a1..0ca743b 100644 --- a/snowblocks/tilix/snowblock.json +++ b/snowblocks/tilix/snowblock.json @@ -1,16 +1,5 @@ [ { "clean": ["~/.config/tilix"] - }, - { - "link": { - "~/.config/tilix/bookmarks.json": { - "create": true, - "hosts": { - "archbook": "bookmarks.json.archbook.igloocrypt", - "igloo": "bookmarks.json.igloo.igloocrypt" - } - } - } } ] diff --git a/snowblocks/xdg/snowblock.json b/snowblocks/xdg/snowblock.json index b7fbd04..6bb4347 100644 --- a/snowblocks/xdg/snowblock.json +++ b/snowblocks/xdg/snowblock.json @@ -18,14 +18,6 @@ "~/.config/user-dirs.locale": { "force": true }, - "~/.config/gtk-3.0/bookmarks": { - "create": true, - "force": true, - "hosts": { - "archbook": "gtk-3.0/bookmarks.archbook.igloocrypt", - "igloo": "gtk-3.0/bookmarks.igloo.igloocrypt" - } - }, "~/.local/share/applications/atom.desktop": { "create": true, "force": true, From 4362ef5152e656d76c60600a0486e3d7271245df Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 16:05:01 +0200 Subject: [PATCH 3/5] Initialize "git"crypt" and add Arctic Ice Studio GPG key 1. Initialized `git-crypt` for the repository: `git-crypt init` (default key) 2. Added the main Arctic Ice Studio GPG key: `git-crypt add-gpg-user -n ` (`-n` flag prevents automatic commit of generated files) GH-113 --- .git-crypt/.gitattributes | 4 ++++ .../40F729E5476E46C260F8556E60C54F1519346085.gpg | Bin 0 -> 725 bytes 2 files changed, 4 insertions(+) create mode 100644 .git-crypt/.gitattributes create mode 100644 .git-crypt/keys/default/0/40F729E5476E46C260F8556E60C54F1519346085.gpg diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes new file mode 100644 index 0000000..665b10e --- /dev/null +++ b/.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 diff --git a/.git-crypt/keys/default/0/40F729E5476E46C260F8556E60C54F1519346085.gpg b/.git-crypt/keys/default/0/40F729E5476E46C260F8556E60C54F1519346085.gpg new file mode 100644 index 0000000000000000000000000000000000000000..07ecdfdac97eb64b8e109a451f611c3492d4b454 GIT binary patch literal 725 zcmV;`0xJE50t^H4xkqa?CzqW85BvxQF=!TU*1X=jD4R+)pVCV?0dSzRv#NFZs><4u zIrq1qz%}T21RuVV0ClFtFwYqRb$jihPq7AF=ex<~&1sClcx{(J;Zd57nKU0{EZd+m6 z@4)7|9oRv+EXi!L>KGLxVgk4&;eEhxYBST-;OzN*(N}Xhvqn-DZ(b&i&Sg2SRnS?T z4EnG$B1mMvP`#<$zRYCQv>TWk?BCkA{(y7f*t7WRf0uK>hRh z=sJNTAZwcsgEg;`R>GZ4nS zS|7b)t;xrqVkLO)f9@C=pzz86t@k4#(a5wm0z`0eg8zaRwAj6m?`Z#EqXz zF!~vl$`vDvDvCtekW!4Cfv2YR+!R7d3z6%h*^B46Gh2psJI)h>pCdTf*&BDnYymC| z{LL H2)A9-QI}s0 literal 0 HcmV?d00001 From cff197e9051fbb0c725f55aee07fa1a39bc44370 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 16:09:47 +0200 Subject: [PATCH 4/5] Remove forgotten "old" encrypted files GH-113 --- .../xdg/gtk-3.0/bookmarks.archbook.igloocrypt | Bin 734 -> 0 bytes snowblocks/xdg/gtk-3.0/bookmarks.igloo.igloocrypt | Bin 742 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 snowblocks/xdg/gtk-3.0/bookmarks.archbook.igloocrypt delete mode 100644 snowblocks/xdg/gtk-3.0/bookmarks.igloo.igloocrypt diff --git a/snowblocks/xdg/gtk-3.0/bookmarks.archbook.igloocrypt b/snowblocks/xdg/gtk-3.0/bookmarks.archbook.igloocrypt deleted file mode 100644 index 7e37949c76c3f6efdb8acbed8a3e3e120e5b4d35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 734 zcmV<40wMi{0t^H4xkqa?CzqW85C2?Q@-UEh0%AFv7ROuxEqs6*LasrEs(45fj6~L6 zIi-ny@-=T`BdJFHbK$~6*A^JNOETrVO~CRHQm4175Rb5r)*A+s>e5#PD~qgu^kR^@ z%Ph%OvU75(mJYDr1*`BcA_*p$gg?GymiGtqWC2!OEiK$|GmmQPtz&J z1^u&&mQAy&#ldHLN++dV>rYSEca927U=&}DP>?fbQ6SrrO}aS;hu86RG`a@1AO(1G zSQK+{%ww60hec-5FvTLWJ|Y!llvGmA(Q~T@TBGNbI{B>qT*qZ~y9>!VUDRskcEUl^ zv5g)#1l`jcrl(-QX5oqnfWQA7701Bec?;CN4cIph*zJB=J#bcM2sU=l=ith0|Flq1 zjd)ogk}QW1iE(!KX?0;|GfkI(2%cSx@RStbigW8LNMKL5v`cR1qq#yD5%#PD+QN<^ zEYsd*0cO*!7USUtnf(i4;I^wY`(3y!sDs6hVv`deB|)6welQM9g7}Ivq8IoHVTcH! z2pajoMVxi_zA>2>KH;O*!0JL%PCp=!*^O!D^_nRx_dY6fg{z#DT|$R;V9E42JE*;C zOKP8p?D)`Hq9*D1+OrqzvA7q#WcXxsj*mr0mO(V##L9N~No*en+enP%6k>JH)c>Mf zP;G^iV`l7x%6(;NrK!@u3<1=?J=u3qJgV?eY=m&GbNu68e;a(1e8Ft*jpJ9~Ou_p3 zZY+OJ8n9PjMz!FJz8nwz!M(G5AV!h*jo;0k6KPsHz{}g(f9EnUL~3{boFySXN3N`} zZ%-CuoX!Qh6N*JFYW=Ulu?bMa>q{4Ci$$UZK@zooUQX5!L3(?f#gswb#$_W3vk!Y$ zD26$%t3(O1fs47nwD_g}EI3K(D>vd&bLhiEnMMlb`cR@?|8swvQD{G>I$^!-k#Q>) QjObirS9nq^0vF z0s=K{f+eiEf)M+ycH`E0ULG}x4A}hZ0IT?ACJ)vBCJXP(DEZf(d$Xu9aXz#(yepTK z*)e3Xa*&?^l{#x+Nh#>`Ib*qDpk`c?uT}M`a(!n@c1tt2nP}{LnIYWfPWv z@Vr&AG+{vSardJ)+zgdL`o&D7pQi9K%Z|ttON?_9iwf#!Z=1s7f!V($aNre7tL7GD z(5h;LPq&B1v)o6SFX{#4Uv*|cr*wQ_iMch`Qk9zK{B z(U_mjM}`X=nBx(RMx9$j{G=SA)v7)Rz%hlp)B%i+dK|9jU9vL!JJW7?$$^Dfi6R3h zWo}!OJ~C1-du75T_b$*4*oge(KEB?}Bi_a|9t;BYU({Mkc`_#u!HB~@90NrG6xHPi ztYu{#N5)I1lWqd(Z<*pKMw@s+mxRd@&a~2kP61Sc)-sSLWL~+nkH+Ix>_}tRK6ajI-2#vltWD@e4Xcp7#Yc%1R70A%h3)g=*17aZhpGfd$ahcVxIY~=&?vnZ-8dEr6ky#=wH*fq~WF715dNEztF41-;TmZ39^sg!;fSlmv zTUQG~Y_?(WX_tB$#lVt#;-C9~aWi1oQwPx^W?4Dyw?k3h40mLG1tn)p+}g|n7a)U= zH25=V^_R;#WN!z~H#qTxm@Hxfq4Bxn`yJRxpNBLU?Rd`C#MDgs`ddn>lH;Lt_u4+# Yi&NzrMBK>40}@QR$;pHG$o1+&MblAhIsgCw From b079adbf484c0a57688a24c68ea018ccd0b60cb1 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 16:30:51 +0200 Subject: [PATCH 5/5] Add (backed up) previously encrypted files back again 1. Unlocked the repository: `git-crypt unlock` 2. Added all backed up `*.igloocrypt` files back into the repository 3. Ensured all `*.igloocrypt` are tracked to be encryped: `git-crypt status` After this commit the encryption can be validated to by locking the repository again: `git-crypt lock` GH-113 --- snowblocks/git/gitconfig | 16 ++++++++-------- snowblocks/git/gitconfig-auth-job.igloocrypt | Bin 0 -> 136 bytes .../git/gitconfig-auth-svengreb.igloocrypt | Bin 0 -> 139 bytes snowblocks/git/gitconfig-auth.igloocrypt | Bin 0 -> 155 bytes snowblocks/git/snowblock.json | 18 ++++++++++++++++++ .../tilix/bookmarks-archbook.json.igloocrypt | Bin 0 -> 1839 bytes .../tilix/bookmarks-igloo.json.igloocrypt | Bin 0 -> 1530 bytes snowblocks/tilix/snowblock.json | 11 +++++++++++ .../xdg/gtk-3.0/bookmarks-archbook.igloocrypt | Bin 0 -> 328 bytes .../xdg/gtk-3.0/bookmarks-igloo.igloocrypt | Bin 0 -> 418 bytes snowblocks/xdg/snowblock.json | 8 ++++++++ 11 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 snowblocks/git/gitconfig-auth-job.igloocrypt create mode 100644 snowblocks/git/gitconfig-auth-svengreb.igloocrypt create mode 100644 snowblocks/git/gitconfig-auth.igloocrypt create mode 100644 snowblocks/tilix/bookmarks-archbook.json.igloocrypt create mode 100644 snowblocks/tilix/bookmarks-igloo.json.igloocrypt create mode 100644 snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt create mode 100644 snowblocks/xdg/gtk-3.0/bookmarks-igloo.igloocrypt diff --git a/snowblocks/git/gitconfig b/snowblocks/git/gitconfig index a65ec72..b919c2d 100755 --- a/snowblocks/git/gitconfig +++ b/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 diff --git a/snowblocks/git/gitconfig-auth-job.igloocrypt b/snowblocks/git/gitconfig-auth-job.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..182d4174ed758574b8d0c31e58eafad4a7147d95 GIT binary patch literal 136 zcmV;30C)cYM@dveQdv+`0QcEGK;obMn}^1-HVbe&qe(Zil11R2s^y~rjE6kfe~<6Ho*5d;m7Xxzp`BaDsNV#JDUyXl!;J*+|CyZL2>9iJ2B1s qA~G~06ds4dXePKM4y{Z~rQt6$NSiK1>FwCox#~cuq;`opgd@?I7D8hH literal 0 HcmV?d00001 diff --git a/snowblocks/git/gitconfig-auth-svengreb.igloocrypt b/snowblocks/git/gitconfig-auth-svengreb.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..dfc79dfbb8ca5ec3ead3d236c7797ccca30e97b4 GIT binary patch literal 139 zcmV;60CfKVM@dveQdv+`00cIg_96(=d2^uA=ka8}VL{yF^s`;K5v)lGNsp+Vh`A3z zmTBCAe1#K8cA5vPuof1A?{qZf`VMDxor82-Id&mX(gz%n0!4s`S4Vwui&Y4A&$w<8 tR91R?SwV8bVvT{mQA>1(?2%J6O|cU#$e^ATFgJq%1k#%xd@TcYx<<7sJE;Hw literal 0 HcmV?d00001 diff --git a/snowblocks/git/gitconfig-auth.igloocrypt b/snowblocks/git/gitconfig-auth.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..c0fd67a56e7817750ae0b2f110136a46a5dd9281 GIT binary patch literal 155 zcmV;M0A&9FM@dveQdv+`08+HVLXb!ZdpoCVdJ-?-Hl`65WrTDzOir2fU)KP3`>c5m z7pOWP)K8^BPk;9i%s0p7KBD3XlaStBK2#+k3itleBNiM>Agp+llM5ZFtt~eO} J%Q=5PuRk{#MV$Zu literal 0 HcmV?d00001 diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json index 3c62dfe..6099521 100644 --- a/snowblocks/git/snowblock.json +++ b/snowblocks/git/snowblock.json @@ -12,6 +12,24 @@ }, "~/.git-commit-msg": null, "~/.gitconfig": null, + "~/.gitconfig-auth": { + "hosts": { + "archbook": "gitconfig-auth", + "igloo": "gitconfig-auth" + } + }, + "~/.gitconfig-auth-svengreb": { + "hosts": { + "archbook": "gitconfig-auth-svengreb", + "igloo": "gitconfig-auth-svengreb" + } + }, + "~/.gitconfig-auth-job": { + "hosts": { + "archbook": "gitconfig-auth-job.igloocrypt", + "igloo": "gitconfig-auth-job.igloocrypt" + } + }, "~/.gitignore": null } } diff --git a/snowblocks/tilix/bookmarks-archbook.json.igloocrypt b/snowblocks/tilix/bookmarks-archbook.json.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..c2a77250c67647b8682f9877967d0ffa4287e0fe GIT binary patch literal 1839 zcmV+~2hjKcM@dveQdv+`06?xs4k7VU;Z4S7e^xZshylF5JlGPYab8SgH>cL0EosJ6 zLb#)3%dxfrwJm@VUBGo!z0jdjp5L1lt&3Jpmkyn+@Bw5j!Fe7T8e`O6?@#tv$d0uM zD^hb8_!WH74oXvtv^YqfM~7=y;PnAkYMOCpw(W7|FwNptOP@VLjQmn9!LoW&7cUB5 zr%w@M+REZjn!vJ3l>%P=ApY=aOERyb*$8hHciF?jT%|cCf17J zw*|EFmGjuV$^>OD#U?iV1+r@hHbxpEvPjG9`i}# zGnsVZ47J8YT$tpvI|4KOTzHuMa9u=6^6m#;f;dE?L?-ydrWTxSe;8zOPdi?MEo zJ+lYK+l+Hu^h)^=SMfa2l~7o?!a;ba^UW4+x2@p9F-8KRX|9F4ufOK0QZX5h1o7=I z4plu)m1)WNtW_!Yv-H{T$u%jVEJH2)MbqZb$TqU`|(3OhlFoG1nyCpNTv)UX&2c} zr9;BAhCO|sSu;f!A$}Lr{Ctbvft@&?1_n4QS+>{fqK*(w+9*>%*)SvgC6c*6j6$zO zfUW~h*!KlilPo8f1;PPZ$gFq#n!zxWw`@4=C*%fKbg&+_(xt{H3I5 z6Pwm094(_0BPUH34b{Yge{cFQ1u}Nn(@C@~BGHTQzm`vk zp^Y8kcrEb8s!>7cm<;PN!OJ2(rI7z&R~M0)8jTovv*?V%dh?n!M62o0w zj__|Ay=(GR?nfjW)oA+RufQXXJaKKR;gj8V9Ky|`FAJTh8KS^TVs0Au6J&Dwqk|T` zZ5mn9JmWG4P%)xBhlLoA9;gL1oC#OG9Y(1ZRSmc$U#+4sT+ON4Yz4|h2gtKWmAvM_ zNiz-Bh)VfAHd8^X+;ea`R?B$aO$!tqw}kV<)n<^RQ_9MhS&Y9kjz`~i$s!-pD$fZ_ z@5*7e5SI#bZDhdofps5o5@Z^PQ1!qF(+jL7sy~rk z6#lJt4z@0zI~(YZVN+?rn@OB9_YdlaGm(qa63dPuhlVSf&1wwht=w_r!?tOemY-SB z;#OSBRo84FT>PyP6R3md4id4BB%7zHnuGj1$k392{a1Z zw#8{DC~f>YZ{Wc|IPzBl4E9bKaW=5sZ$cwo8VV57r{hT|X#XnVfL{2U5_Uj!3i+es dhFug}808IRU7MqCXelUo#ynNc);cUU1q(sFbM62D literal 0 HcmV?d00001 diff --git a/snowblocks/tilix/bookmarks-igloo.json.igloocrypt b/snowblocks/tilix/bookmarks-igloo.json.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..bfc4d18954fbc1447c7f10dc95a4c190de92a752 GIT binary patch literal 1530 zcmV;#)mr@D8wNq-35_1UPm+aw-qevKzf{l1Bt#>%^IXz{s#z^!O{G?;t{=a^8rkPl>< zieQx_?9td^j5LO*9%8H~xcmod!SoXJZaI$&s1rg4cwxmYyp^iW)gnX&j7fgPrDz5q zH*!oWi5Kq#CoFG0tvda{d;*Dl!phorveh2$ZOsfsT7Q?H|LgljC#a`RgVsQu=r1!) zI6)Hvf6+aIK&&(W&Wc(Ml>s1vh;;j2LKKfe3QMa7ysi4}ie_GeN8Bk|QUDZ@BNzu< zZ>PmcYr~g{Wrf#bwJ)T&4pPUKP5ob!FVopj(T@xYpqxYB89?G z>4u&kStKP%g_$}lY4ma51i_P8+OVH8UfkBUAOIS-YqOe2^SFF1?Xo2E1F( z8O+yoRC%1VIX^Dl#7=iZ*dtvnO3M`8f?M7$T@!;smna$Gutat}NKb&<2Q;36{Kv^~ zF_;)1{q3w4-Ei>d>*01!xmehPHf&xaF&^ z9AO5MoZP4ry;YJQZmtKG9g-)SZ=g4w#d%<{SGZ(|;#uK~{{6|YD<@p7J>%qds>E1g z<{dK>4e70WiH|R!hL~8du=LCZJPU(Icm=q785%RIQgS5C{#8YdvU_R)RCHs}YQW)P z;?M!33-8Bh;l5jQf_%R7KU>jmde2~FYWRqLs(Kz`7e8ycX`oN4wjZFuOlQ^+y=dU1 zkQzp?ncG5@&Pf@2r3kmAwt={HXCkt;9rCq2F@lzzgud zx;d50v-rF1+eH9;pGTjQeGu?aIw~~uB z1C7P;4@q+wgPJ>%=-qTN>>gRNlZWI(r2r$B)W+G15{WWgL>-0bKfuTC(i+amn@jO+@9W@s>l6A=NnD#3;+NC literal 0 HcmV?d00001 diff --git a/snowblocks/tilix/snowblock.json b/snowblocks/tilix/snowblock.json index 0ca743b..6c87581 100644 --- a/snowblocks/tilix/snowblock.json +++ b/snowblocks/tilix/snowblock.json @@ -1,5 +1,16 @@ [ { "clean": ["~/.config/tilix"] + }, + { + "link": { + "~/.config/tilix/bookmarks.json": { + "create": true, + "hosts": { + "archbook": "bookmarks-archbook.json.igloocrypt", + "igloo": "bookmarks-igloo.json.igloocrypt" + } + } + } } ] diff --git a/snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt b/snowblocks/xdg/gtk-3.0/bookmarks-archbook.igloocrypt new file mode 100644 index 0000000000000000000000000000000000000000..fb6bf3b82a870424e19d95a713cde6977098b67c GIT binary patch literal 328 zcmV-O0k{4DM@dveQdv+`0DHJl=hUImfAkM~mW>J_#Eh*(aW0~;Hr~N4hWTQ~eg}1- zkCh4Z`Yx%KVgbA#50VABM_Q;Dnt$dF-=U~VOgPAtS!WmS$TH3eTtV%LRhYO5{o#)M z2{L2vJ<&ywP^5ss0-X7ri6BG<^>ikazY)FG63JZ6tUbC|b>7`W^!$1kz?Osx@`=7Y z0%gbUZpqhiSpu0$&gUp^e1vo*L9Dm6XP}F+bpJ<~k4l{7M=PQIR~qMtm(--i%nelZ zeUG|(AX@!Mz0PizQpqh@%OI=l3BtxFzcSny`Ip0TWfshKrR$FkPgIXG&(&%RCyoxl zo|Fbp34(=NnzLj?HvsM+o$wdC&5uC7ed%Z#lKM!_Un5b_#H_3Ifza4&`H!Qe(>QkZl`a#zsN@AacJu_Q!VRKF~q~f_hozGoWL58*WMib zL2G|OmR%92)eIgEQ8ib)o;VbM)8@VPM#NStQ3e-#Ja<&)a0SOCf#0FPo@Wft&3N4p zJI`GRI7@k5xM_mfD#EDZ|PTBkm-Y>C@AN zu^yKSU#2HK7kRf+gWAfKRkQ2IPw)kM4NA3hJ6c@j(16P`tu!$gNvQhZ$7aZP&N+T} z<4aiXNoe*WJt+xb@DD+w`Q3OasHp8d#mQMiHl>%Y2(U6>74Iwg)dJb&1zAHll&GP$ zzxQjqNXO~dIAP>-iE~>FPqBC3ZIWO|C4213;u@iKg7+A_w8n%f*tO~%Az6TBG_Eu%MZdFZ9_2$ka1r!7f6K;5x-U>BDl6b<_4O2- MP=jc*S?#9p6M5##DgXcg literal 0 HcmV?d00001 diff --git a/snowblocks/xdg/snowblock.json b/snowblocks/xdg/snowblock.json index 6bb4347..7bd798b 100644 --- a/snowblocks/xdg/snowblock.json +++ b/snowblocks/xdg/snowblock.json @@ -18,6 +18,14 @@ "~/.config/user-dirs.locale": { "force": true }, + "~/.config/gtk-3.0/bookmarks": { + "create": true, + "force": true, + "hosts": { + "archbook": "gtk-3.0/bookmarks-archbook.igloocrypt", + "igloo": "gtk-3.0/bookmarks-igloo.igloocrypt" + } + }, "~/.local/share/applications/atom.desktop": { "create": true, "force": true,