From 4074fe0908a9aedb7b97571cb4c1b6cc118124fe Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 30 Jul 2022 05:14:17 +0300
Subject: [PATCH] woo

---
 flake.lock                  |  22 ++++------------------
 flake.nix                   |   1 +
 hosts/wolumonde/default.nix |   2 ++
 modules/base/nix.nix        |   3 ---
 secrets/default.nix         | Bin 642 -> 809 bytes
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1ec1755..bb03db8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -220,7 +220,9 @@
     },
     "nixinate": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1654872030,
@@ -267,22 +269,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1657447684,
         "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=",
@@ -322,7 +308,7 @@
         "nixinate": "nixinate",
         "nixos-hardware": "nixos-hardware",
         "nixos-persistence": "nixos-persistence",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nur": "nur"
       }
     },
diff --git a/flake.nix b/flake.nix
index 76583f6..b1f9b57 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     nixos-persistence.url = "github:nix-community/impermanence";
 
     nixinate.url = "github:matthewcroughan/nixinate";
+    nixinate.inputs.nixpkgs.follows = "nixpkgs";
 
     helix.url = "github:helix-editor/helix";
     helix.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix
index 2f4b9da..5a1295f 100644
--- a/hosts/wolumonde/default.nix
+++ b/hosts/wolumonde/default.nix
@@ -22,4 +22,6 @@
     substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s"
     hermetic = true;
   };
+
+  system.stateVersion = "22.05";
 }
diff --git a/modules/base/nix.nix b/modules/base/nix.nix
index 72aac6b..fedf7e3 100644
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -30,7 +30,4 @@
     trusted-users = ["root" "@wheel"];
     auto-optimise-store = true;
   };
-  environment.etc."nix/netrc".text = ''
-    machine private-ardanalabs.cachix.org password ${config.environment.sessionVariables.CACHIX_AUTH_TOKEN}
-  '';
 }
diff --git a/secrets/default.nix b/secrets/default.nix
index 304184baee2532d400a12528df8609150d4ff284..42525ec30f72909544ec2bd68e69bbe545062a3d 100644
GIT binary patch
literal 809
zcmV+^1J?WiM@dveQdv+`0Cn6XwXv~Vs*$m)B7(TaGYjFoue0$=u{W4+StyaHs)WG_
z5So6hz|WT&a-EN7n7Cd_OwV^a!M5x6;fFf~@ozLT@izKeHYLasggWs#K#De5(!$Io
z{uPN_6^I*7J1_Z+;-$gba4qH8$FsLlxSOr*IETZ1Z6uL~xd){3XJJ=kPA81agmZ^D
zL~Kfhmo@6t6CQXgI^Us9WGF!YSM2vxVM1bK=1_RJNiuU7ULBkuLN#6b%Pu>G5yO&>
z%)3pp3`q<!7&0WJH?y7&F_PkfX;POCALkt3C@vgsS~*v;rnY-;*AF93zrF#;A6PHD
zlzxPJJ5F_;;*RG+A_e%wzda=wORlH6%w}|h=PegHZT;yXw4Se#(=5#Pew>{`$4!8x
z%x==%SHg;TTSAq#IHQUUp7D>`v9WgNxD9$}W3fmiUsv&2ENg#08VLn62`6g>#u-*+
zyS)84pUVk~E7JF_dVJ5`khX=M#fi7adtl<#URwwNjoZLGA7dMhse{O+pdDX|9s8aT
zsa<S9xcY=%HE~3Dtl%Yp^};4(r@(;bI+2MKnj0X$CeHosedGDaiIj3i1pOj>vtD9z
zs|)nh{6Y9ZZ5Tbhg-z4r+|@MEE?89SzKQ5%-i~4WEjQBUv7`f6|8ExV+Ig;Qj<?2u
zO&)3hv{(t@)@eDA)2j%kGO7^re~kOhZ4iC0p5%K-?5Atd9#kP5rOLe&EP+eT%S(Gc
z;C-sJXz+ED)e^o6JQP#?3XTT=)4#!x%!~(GH-E-3mGyC4!y5vHwL%j<mMyJ4b&Sf$
z5VJScUWMhBgas7DOO+x|stela1(yGk8`@x{0^5!LhCWfB8R`W(&u$5FW9_sf)AvJr
zcPfsx88e<Yc_Z2R<ZKkLO5;nQ@$OCC>z~IxB~&eZlll|lIr!(HRnqi;GJa&+CjI5g
zjA!mjg|*pr#g)pPeNc!UL6Z1NyPu${^$E0GkXXhcHP-o`uQ#JYdmeBWr`BK|xZZRL
nfwB)M0^2()6bkvb0ABD5t3+c{Z8jJ9FpcQU!9sX67v_>_qA-uZ

literal 642
zcmV-|0)71eM@dveQdv+`0Fw`+vJ(W2SfAB_?FoIH&`L6mUN-fGI_CJQm3w#vrgWFY
z<D@xk=Vr%$jZ^!!tK5az`t`(~%=OfIsYpBl6x_mBlQpbpY{gk{L#pF3$$JL@KmIUu
zUaSq-|9_%%U$3@V*>E7<G%p6XcC}5I1(yZ{MX7ifQE+b!LC0`n_(dQ#`f?^rP118Z
z=WNk*@J!p^!0YQdOUR-f#IkZ?slrgp?9xe<$ukfT`r?yDVGskEP43%+MeUKX`j^*C
zQy^&f!3|$RNOGv^m#>ry^(Yn&(*M`vv(;8MZ1!4T%i2&wgy$aGk}|I;DXoRAja^ow
z;IdjNK=8dWI-iKtf)@4M@?jA(ps#!vNMQt!^s%~<Zjgmc#EJw)bR9`4?T9n!umecy
z+@Rceo$Sm~6R1;D9h`FO9Hg}B9Ih(mYvOq2gEa{sM{U(0<*b5d1-E#NWV=KOs7i=5
z23xr)CJ7;GTWb5Sl)(?_b)c3j@J*ckeSwg-DX4rF+-Q4lzTo-c>*Y7quWUdl-ILiv
z7Z8Xp^E0~lmu(^oz;0igX{y@!PEh@GD^p8r`H9M9iS`X^u=gi%IImx&OE73~E`Ry&
zJUgemJbyk)aRI`usvl)ytL>rF`u;@%-z{#HQ@$BJDoq(+_ZL%qmIw-a0-~wY{t{C(
z1b={RW9NGl?tPBb>gVf}BzA_KjdqV@A)8V)731RDSqXYzE^B!vmzFe@YL)&A%wY_n
z5Kd&RN24I7NoOzmM82Pkv%LYro>YUwl<8FcG=8VOrla-e+>unGX+D1Y^}95si!pxS
cx7`FfB&h2`0|Y%_jbzzu=F4WQo&nU%?jssPf&c&j