From b079adbf484c0a57688a24c68ea018ccd0b60cb1 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 8 Sep 2018 16:30:51 +0200 Subject: [PATCH] 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,