From 3ad338f733ce908dd7f6ed034d43298c3e5c5886 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Wed, 12 Mar 2025 17:58:52 -0400
Subject: [PATCH] Unencrypt and rename to Bun

---
 README.md                                       |   3 +++
 flake.nix                                       |   2 +-
 .../users/custom/{jimbo => bun}/default.nix     |   5 +++--
 system/accounts/users/custom/default.nix        |   2 +-
 system/default.nix                              |   2 +-
 system/devices/disks/disko/default.nix          |  15 ++++-----------
 system/secrets/default.nix                      | Bin 781 -> 779 bytes
 7 files changed, 13 insertions(+), 16 deletions(-)
 rename system/accounts/users/custom/{jimbo => bun}/default.nix (78%)

diff --git a/README.md b/README.md
index bf533e5..3934a2e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
 # ROCKPro64-Server
 
 A flake for Jules' ROCKPro64 server.
+
+For personal use, unlocking secrets can be done with this command:  
+``gpg --pinentry-mode loopback --decrypt local.key.asc | git-crypt unlock -``
diff --git a/flake.nix b/flake.nix
index 237301a..a2bd983 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
     ...
   }@inputs:
   {
-    nixosConfigurations.rubble = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.progesterone = nixpkgs.lib.nixosSystem {
       modules = [ ./system ];
       specialArgs = inputs;
     };
diff --git a/system/accounts/users/custom/jimbo/default.nix b/system/accounts/users/custom/bun/default.nix
similarity index 78%
rename from system/accounts/users/custom/jimbo/default.nix
rename to system/accounts/users/custom/bun/default.nix
index 71f4b4e..192d028 100644
--- a/system/accounts/users/custom/jimbo/default.nix
+++ b/system/accounts/users/custom/bun/default.nix
@@ -1,13 +1,14 @@
 { config, pkgs, ... }:
 {
-  users.users.jimbo = {
-    hashedPassword = config.secrets.jimboAccPass;
+  users.users.bun = {
+    hashedPassword = config.secrets.bunAccPass;
     isNormalUser = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl Desktop"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k Server"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHMJtG55GlIRVs6NzN9MeGZUFeduOcbOhFc0QEqWEl7o"
     ];
     extraGroups = [
       "wheel"
diff --git a/system/accounts/users/custom/default.nix b/system/accounts/users/custom/default.nix
index 486ed0e..89efb03 100644
--- a/system/accounts/users/custom/default.nix
+++ b/system/accounts/users/custom/default.nix
@@ -2,6 +2,6 @@
 {
   imports = [
     ./jules
-    ./jimbo
+    ./bun
   ];
 }
diff --git a/system/default.nix b/system/default.nix
index 4a8f7b3..73ade52 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -11,7 +11,7 @@
   ];
 
   networking = {
-    hostName = "rubble";
+    hostName = "progesterone";
     hostId = "e0b1fcef";
   };
 
diff --git a/system/devices/disks/disko/default.nix b/system/devices/disks/disko/default.nix
index c6a65ae..8a347ae 100644
--- a/system/devices/disks/disko/default.nix
+++ b/system/devices/disks/disko/default.nix
@@ -21,17 +21,11 @@
                 mountOptions = [ "umask=0077" ];
               };
             };
-            luks = {
+            main = {
               size = "100%";
               content = {
-                type = "luks";
-                name = "${config.networking.hostName}-disk";
-                settings.allowDiscards = true;
-                passwordFile = "/tmp/secret.key";
-                content = {
-                  type = "lvm_pv";
-                  vg = "${config.networking.hostName}";
-                };
+                type = "lvm_pv";
+                vg = "${config.networking.hostName}";
               };
             };
           };
@@ -68,14 +62,13 @@
                   mountOptions = [ "compress=zstd" "noatime" "ssd" ];
                 };
                 "/persist/.snapshots" = { };
-
                 "/persist/home/jules" = { };
                 "/persist/home/jules/.snapshots" = { };
               };
             };
           };
           swap = {
-            size = "4G";
+            size = "2G";
             content = {
               type = "swap";
               discardPolicy = "both";
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
index 6f2918ef0a6fe069c1bf453727c7d3ac32e0cb76..a09c591fa56ff80bb70a35024dca3441fcd83a9c 100644
GIT binary patch
literal 779
zcmV+m1N8g=M@dveQdv+`02WRzBx|s@t9__NqQGxf34g6x7~VW-AqBj27CUfH<3&n8
zS*7rotydr;8jv^2LU9|OH|XwSP%^%au~7wmGZFfA_)1_87D*_`gO609aQd87xhmT(
zEF?BS1*Pv=nrx%VSBm_VB_$0E#40AgZPK!8{Io#gZ-ldz+{Cw<2iDWh>U$K)>2haJ
zk4t_8`%U!nh8ejzUuP$?orD#w3c3%jA@QZ)1^zkLqz_aNM0(bPdgfd>Nu3D^JJG_~
zMjN7PIZL)^VJd?_UdL@pB=bVFPwVjooTe|WJSY-nCNp^~%YcM_mh}s~EUS0cWE<^x
zyZJ=R$S2C+S9%<*HE&(Q5cy7!ArD2r#xu5RrJ<USi;*x#G4c_{<=iE{g9P$;Xz0JP
z;*qQT(NQs!$gh<h1e6QOiSqfm+p;?+E_k}aG1bNe6O!`r+_gfe?O%rd2y5SqmbKbi
zCAc4;i3hY3$riML0S)uMP><VJDN3Xkl8`rE>v#g+|5-~dt>x{Tqhq4jrB(xWyj=W_
zoK^*eE<)=Lf{jVVTC5QU+q7Pjz`$9@iSt&yueY8}k<a@-n{UlLDvQ&_1dnHrmD>O%
z#H=XK#n|BEZn0xJ6!&Ton9a`U&**7X2*Za2_JM<LAPE6A2e-tNJ3K7T@XGuhZjDkV
z84ppdCxhUD*PHI%@QZnzHxe<C7-RJ|@|vmVP&<x({ZyEVpFZ&t={F53RaYq35b#U3
zES7aYCQS4PZw51L_roAbqXIa02DbSWBvpi2_@iq17eNP5*ta7x?N%if#Ei@31Otij
zWzq8dI|F57ho>;J*|{s)y8)NoLmwygd;K|y(Iggts^R0);bZAsnhl)SbDqulWl&CR
zgX*!)WjBCd94?5r<t*sE8N2zwXrK!?P?Hd;^_jtW-j<!pS^13%vIJwwK3<!3$t%aM
z^?4y`<A*MT-G1)c4qC8-*_u^k4h01Hk{mRsbCrzst4PTD2l6|Fx$=G%pz5$8%!O)*
J3)~MRMg~(qe!~C&

literal 781
zcmV+o1M>U;M@dveQdv+`0Kmms4`c|sivN}A%@UDBS1n9zt6lk9VP+C;9cU)X7EyGP
zuC<4goS>gPem;CvVsvjC4uj+`)C?bhj)Olp9sNV9Dz}`$8l7GrQF-D9tk?{{S;Tbl
z#%Mmk!8Y8``}%J)c|w(>t+Io(x{T-i6Zpvp;kTR;{V?B!Ykt_D8)_9M9?_=|m1IAm
zNdm`~G!bVxw}SnvPQtgeX%ytv#nKqwFR56h_)>)D*Gr}kwq@iU>jiXe&Aw?J;Enp?
z|L%%9$h3t=+d|o`^T_+wfkzZ(mXs%KIy1V<o~pEMbRJsa3aU9=(Un?iKA}XfuH<&u
z&NK^Yp@>w0B$p#Rjf6B%7JgIBKEIGny5A1sX`uYBiV^D(H;>d^WVY&cG=J#v`q>_U
zPE7yWuCZ%Xm}Z>Z_?j(Mw41IB)s0XNoABfpm~b#<*O&zy2K3V(vSKLW(D8Q%NP*M_
zqCxBQX(By0H^7tywv-<w0K!<GN+7;uufVYfgv5uOs2FJ+k_{@A*-j;2WRF|GJ{KdZ
z@LvX{oW^iv0|ycKQ2Mzn_*nagZ0STWK2Udx#P_e8mb<F!y8n^4Vi@0vd~kS)7tJ97
zBwfJv*7#p`IcoVibpSC8a-o5(0CS|<GC}HFZokwru43m4YxfZsI+(foALi!C=@?tL
zyb5DBZO~k=3~=DNh0D!#%b+PIH3-p`9&{{M@f8<|)|FjRHrNM@dkN;iZ;WUMeCYVp
z4_4$jOa>O|zOg>t^SaC{7a-^EWO^q)#BQ&3IWD41J;af&?RR-~_3^4|B%!`)G>|Ls
zl$KhuNqT~?yV}{csLbXl<T^(NIO))b!#FVSt%WetH<%{TlK!-!c&$}J<W}L0r=1ZM
zVdk^nk+I4=C%c~o^Y{gTXMN$0KzYj~(22c3<GPQ!H5ZicPBUB5c_MdQ^$!u&0iw}e
zY%l&4#0X=;=&2+|udtSNs0(h!v_7@$Zy5G!jd&S;_ivEYFHIdx=nV`Q>Y$a2!}U{(
L5I9j<&t(rGIPZqm