From 1ea019bf234f646861f989df177f187e866f9918 Mon Sep 17 00:00:00 2001
From: Matei Adriel <rafaeladriel11@gmail.com>
Date: Fri, 10 Apr 2020 14:51:37 +0300
Subject: [PATCH] feat: added git-secret and stuff

---
 .gitignore                           |   7 ++++++-
 .gitsecret/keys/pubring.kbx          | Bin 0 -> 1463 bytes
 .gitsecret/keys/pubring.kbx~         | Bin 0 -> 32 bytes
 .gitsecret/keys/trustdb.gpg          | Bin 0 -> 1200 bytes
 .gitsecret/paths/mapping.cfg         |   1 +
 modules/applications/git/default.nix |   6 +++++-
 modules/applications/misc.nix        |   2 ++
 modules/users.nix                    |   9 +++++----
 secrets.nix.secret                   | Bin 0 -> 473 bytes
 9 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .gitsecret/keys/pubring.kbx
 create mode 100644 .gitsecret/keys/pubring.kbx~
 create mode 100644 .gitsecret/keys/trustdb.gpg
 create mode 100644 .gitsecret/paths/mapping.cfg
 create mode 100644 secrets.nix.secret

diff --git a/.gitignore b/.gitignore
index b512c09..2537f5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
-node_modules
\ No newline at end of file
+node_modules
+
+secrets.nix
+
+.gitsecret/keys/random_seed
+!*.secret
\ No newline at end of file
diff --git a/.gitsecret/keys/pubring.kbx b/.gitsecret/keys/pubring.kbx
new file mode 100644
index 0000000000000000000000000000000000000000..370ef27a7f655c6bf2cb44e06ad63d4453338eb2
GIT binary patch
literal 1463
zcmZQzU{GLWWMJ}kib!Jsg18BRJRl5WLjdb^CPpx;j)8%dm4S&t=9k^Vbr&9)9dKE;
z)-}G-YnM*&tW7`_3LsT)9v}N>vg6{p7dHFTt~qk7cG+a^0~EFa$pHZ)1JGo~c|evr
zn9sz(0;bUjm<why^0LHD@So1e!LY$2qrB(!)b}e&0?!yP_Q^kd=Foh@=8TDRKWv?`
z@6O)p4VMl#>KCv)Ezt__G__lFK*ZRk#eMR#OGbq^4CV*Bd++ppdjGB8sdw^CnyYMQ
zMxDGc>0q9L=#I+Vr}NLtZ9Ta1aK)b=)8zOzPd~RUc=oJC_Ivu?cu(oQC%Mya`q_qd
z8>i}J&-pcKWBz_%k?IR%KXiYeW%BHGrb`y(>~w4^_MVX_6@EQ=!6fO-%?7>y3YRl5
zzMcI0%kh<;KV%>9UHJU9UGOQZ+#P)j=B%E5+mOTb&cnYi8Y9~`+;W?L{{M-^8yu2X
zsYpaFJsvhGUDLJO;mR6OQ{&Zr2N!tAsyTXRNu2wAU710Uk%4goF!a(3(joD|utnWB
zu_QH9!7-&MGc`xSrYJEjF*PR<%ri7}NY72o%+X8E&$WYUV}gWoC!-&WFfc?dn53Cm
zxj8x5nb<_RI61hPSj3o^8JXl5nZz5!6j`vvGAmQugaAbbE=~bhyqip8|7SQw?|8tU
z6~Wo=qOk{64l(8~`xgIDef`quI*WKhcUY@=7TRr+YWin>S}W_CSToDsb^W&vsjlk%
zeQ@Iwwe8EJ!XDl@`mx}llUn38hlB%51T7=JrfyxnJ7xVr&q}Qn&->4p><M4*k@0KR
zMy@@JZ?H&nBqzomJAX9BPOBu~v?2Qq!{TW&hAKQ_lD8hc+j69b`L%tx&%Wm?eQc&~
zyze$U{Q~nEmrJwwTYkke)*n&U+%sF`OR-v`zw@-cFH_dMbI+(=xWoBj!}2S(SAPCp
z{^fu>zphi2R=nz>9IZ<4KQjwDe{QU0{N5mNMSgP~Lqd?A7x%dd(|$}}=C2aSz|Z+@
z#U{3$8`v0_fw97{6OmdU*REkP(z<W_+N5ZjKkv(g?m*`3vrRrnuF3EI{PfxJi<>N*
zf6ef7TUk{3S6rv##guIu=5O3|uS#uBgIvpot-GyHT{^45+~%(*<oA0T*Xz{=zb;(b
zl~(y|$D!26$^j17qJFDxWLd?3<JpXVy_<QDGk>aJJ+^F{-~r~<xpu27*&lw~lCksB
z$0-t%;uG`ord9`vuIv@t&-k`9u=D)UmugR<8NDOSzXq?WuUESo63v&p%6o5DU-JSb
z(ff;DdEej7Qd9A&PfTvTP;l>MyT3-4ZdU3q{&B71WN}&hy_%KB><#_HPNr|@%>TZu
z$vNnOq5OXHSZ=S#kdQ3L4Ur$;Xb2oGX$Pm)PDUFR31C7~!;_l)r!z_OuyQgVN@qY$
zR!nm^7}k7LyV2tKCHp={&xy1NDpPv`q8lRSx8DD~fkAA~`p-9?3AP@2X{K`8cxv^L
z#4hEHEPoy+3jN$Q=jh`L=eb)MxBCk+UhZSz($o~(e5Q<DbKZUdUiFD@jcZJE8Jzzf
z5RUD)7W-~gv)%Q{N=KDj$`<O^`mF>`d^F2Cw4g&Yf#cJK>q?7Sn9`Oz)_hz0WbTP$
zs&Unm?|!;>B70X><DDOE{&!y*{#RHmru!{rVX*51=UZ1@QVbnF&B^$_;ceQM+@>dH
zlit^yS`wM?;FEmZS9Y-@rzK6Ut=?c4bSOXaV1!LGA9MB18{9Sel2x5ABrcy>6#nq<
rq34eM^JV_WyPAY5MZS9mOI98>f=s)k1J@sq{uri~yZevlN(WZ}=mvGv

literal 0
HcmV?d00001

diff --git a/.gitsecret/keys/pubring.kbx~ b/.gitsecret/keys/pubring.kbx~
new file mode 100644
index 0000000000000000000000000000000000000000..bacd41b69a3698c77068bcfbde6308dd53933949
GIT binary patch
literal 32
ecmZQzU{GLWWMJ}kib!Jsg18BRJRl5Wg8%?Rl>`O=

literal 0
HcmV?d00001

diff --git a/.gitsecret/keys/trustdb.gpg b/.gitsecret/keys/trustdb.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..c644d8027ed179b7411266641755b358f3d1e2d1
GIT binary patch
literal 1200
zcmZQfFGy!*W@Ke#Vql1y5Xi%T9WZiX7sn7CRfiEIV1dza84VXu2#lr!%F+P<%QpkP

literal 0
HcmV?d00001

diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
new file mode 100644
index 0000000..d1fa05a
--- /dev/null
+++ b/.gitsecret/paths/mapping.cfg
@@ -0,0 +1 @@
+secrets.nix:4bbdbaf5a1e73f35b556f2eeba1f002c99fd1314b10e7b214f79fa28a18afe04
diff --git a/modules/applications/git/default.nix b/modules/applications/git/default.nix
index 3030bcf..da599a1 100644
--- a/modules/applications/git/default.nix
+++ b/modules/applications/git/default.nix
@@ -1,6 +1,10 @@
 { pkgs, ... }: {
   home-manager.users.adrielus = {
-    home.packages = with pkgs; [ gource gitAndTools.hub ];
+    home.packages = with pkgs; [
+      gource
+      gitAndTools.hub
+      gitAndTools.git-secret
+    ];
     programs.git = {
       enable = true;
 
diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix
index 8e23d76..d6115fc 100644
--- a/modules/applications/misc.nix
+++ b/modules/applications/misc.nix
@@ -1,6 +1,8 @@
 { pkgs, ... }: {
   home-manager.users.adrielus.home.packages = with pkgs; [
+    tree
     mkpasswd
+    gnupg
     vscodium
     google-chrome
     discord
diff --git a/modules/users.nix b/modules/users.nix
index 37b41ab..881b7e5 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -1,11 +1,12 @@
-{ ... }: {
+{ ... }:
+with import ../secrets.nix; {
   users = {
     mutableUsers = false;
     users.adrielus = {
-      isNormalUser = true;
+      inherit hashedPassword;
+
       extraGroups = [ "wheel" "networkmanager" ];
-      hashedPassword =
-        "$6$5NX9cuUbX$yjiBbroplRLanLfJ5wNjjsd9rSvN81BCNEnuF2DUgfMa/TPYdl5PUYcWF52VxNbisDPsR2Q5EhgNrgALatpT3/";
+      isNormalUser = true;
     };
   };
 }
diff --git a/secrets.nix.secret b/secrets.nix.secret
new file mode 100644
index 0000000000000000000000000000000000000000..14f50b35e90e2d0feee36ff8c83d353fbbaddca9
GIT binary patch
literal 473
zcmV;~0Ve*10Sp7yK?tivvNuct2mej7715_RNMem_eoh-!Ok(l0b!ixkX$d!3{Q(Wr
z`^nYuXC!+Wuw-s86)(a7B?{rqLHAVTN%}{d?ST#K)NdT9r=+){h~PO2*nXYlbLTr`
z!p?b7wH^PoqNBz(uW6LshDZ_VHg=eX2y)Iav?E<z6GgO6z)yD!FGR?w<Z_7L;VvDT
z=kH^scYNE2%pJ`B586UBdic0jeS=t74hf}u2i<DH*$)lpUr14Ji7G-y+uKe0a0zJr
zlgwJS8x*xVE9uh2Y7uxVwtZ#a7D6M(nK%%%(3ScVWGk9jGj>K@k-=tjm=k@U^=<em
zQK=v>a7Vpst>WF?tNB67^=;C?2LXS^d?bNcErA;oKk0e`0nTX+3+V^TvZZP9eS`BC
ztAG(r+CvBab|7ufnJm5EjRKH2Q1^EnVbrBHz<(bahZef)a6J07n;HN(DJ-5<YW@xq
z`cXFtZUy2R%xETmW1j=On(IR!4;Z*y0MDgc!66D98ZwspZc|U&mQn#M-6_$FCG}w(
zR3O&h-`njo$}=)q0@65wP$*BcvO>p0?h-;^;*u6BfsIVwlHBme0FYD`x`8(rmtc~D
P7cym#3p7zIdf>bv*Ad$d

literal 0
HcmV?d00001