From f65b217a928456e175d321f58768a0ff8f8da3d5 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Mon, 22 May 2023 23:53:45 +0200
Subject: [PATCH] feat: change passwords and hide new hashes

---
 README.md                   |   9 +++++----
 hosts/common/core/issue.nix |   1 +
 secrets/global.nix.age      | Bin 477 -> 770 bytes
 users/myuser/default.nix    |   4 ++--
 users/root/default.nix      |   6 +++++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0f961b8..526062c 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ This is my personal nix config.
     - `hardware/` configuration for various hardware components
     - `<something>.nix` commonly required configuration for `<something>`
   - `<hostname>/` configuration for `<hostname>`
+    - `[microvms/]` configuration for microvms. This is optional even for existing microvms, since they can also be defined in-place.
     - `secrets/` Local secrets for this host. Still theoretically accessible by other hosts, but owned by this one.
       - `local.nix.age` Repository-wide local secrets. Decrypted on import via `builtins.extraBuiltins.rageImportEncrypted`.
       - `[host.pub]` This host's public key. Used for agenix rekeying if it exists.
@@ -102,10 +103,10 @@ all commands using these extra parameters, or permanently add the following the
 2. Run all commands with `--option plugin-files "$NIX_PLUGINS"/lib/nix/plugins --option extra-builtins-file ./nix/extra-builtins.nix`
    or permantently
 
-	```ini
-	plugin-files = <copy path from $NIX_PLUGINS>/lib/nix/plugins
-	extra-builtins-file = /path/to/nix-config/nix/extra-builtins.nix
-	```
+  ```ini
+  plugin-files = <copy path from $NIX_PLUGINS>/lib/nix/plugins
+  extra-builtins-file = /path/to/nix-config/nix/extra-builtins.nix
+  ```
 
 ## Misc
 
diff --git a/hosts/common/core/issue.nix b/hosts/common/core/issue.nix
index d089afa..ba51081 100644
--- a/hosts/common/core/issue.nix
+++ b/hosts/common/core/issue.nix
@@ -1,4 +1,5 @@
 let
+  # IP addresses: ${"${interface} \e{halfbright}\4{${interface}}\e{reset} \e{halfbright}\6{${interface}}\e{reset}"}
   issue_text = ''
     \d  \t
     This is \e{cyan}\n\e{reset} [\e{lightblue}\l\e{reset}] (\s \m \r)
diff --git a/secrets/global.nix.age b/secrets/global.nix.age
index 9cce0ec177c54ce6176e36bc2ced7fbf30a34ffb..34c4d440f533a7c26150d6d6b028635ea2e4b0ae 100644
GIT binary patch
delta 750
zcmV<K0ulY)1A+#SAb)yEa4%w1NJC0lF=%ITNLhI?ZE{d{SVTl`LsVsUQ7d#;P)1T>
zc~*K;Gzv{oOm28pWp`$0NpLn+adtH@H#9S7IaG2vFic``LwI9TRV#Q>WHfDaQ3@?S
zAaH4REpRe5HXwL$Q)M_&AVD`_OlC}KaCT}@OLJOFO+{yPXn#sEFFANgdRk2}OG#*O
zL@;MFGeuBVd29++RCIW3bXi$hb81a)Pf2TQbxUqmOF3jsbZ~b`Lr-{ma5-}~bV4sh
zQAr9dJ|HYDXL4m>b7dedFj_GnFMDNGayK_LAR=5{NO5p&3QI~vWlcC!SW9m?T319=
zYFTY=K}uOxX@5CsI8$yfNoZzcP**f?D_M4WFljP2P--hnT0(kKb6QzWWOQyfNoWdW
zWlu&=S~qt=PE}GiHFGjiQb|~PY<O5nO>jYaST-_AY;bBTWK?WNX;yf5FK$J8V{<`a
zLNp33EiE8YHg!!mD|uy1W;SkkZfa*RHd9kHGh}yhD}QiAH!(prZdNg2G;KFISyXch
zD%ZrOYd}l!jXHR2`F85Mf1m#~)@-}Y-j*$O#j_w%qZ-5Ca5C4)YG)6116?(B?(e%V
zf*#h3X?krAE5Wqm;`Me|bASCC97+ECkvziILCY$VS+hY#^)<`3yhUJqGZ>(=4)Hrx
z8ASezzJG$E>>L&*nYaZj-({w_QE|EOk1QwbY4rm?>33_){e!f-$!8v#TeFI;^?)aE
z)CpTtw^EhwR{7Zdz6xxuc;&hmj83c;Ei>toh^uG}pL+Dx!ocJnN6H6rh6X#GmuK#6
zaE<LE$Tg;gj_JxATm>URveSJQ%eypTG<ITKVrLD>YfQFm8?&7*hM<ySv#lB?W{1(*
zUfl~mmWjGO6l_rSOeA?F!uN};pU<J6cH6TT_{**eTPE}(GwEBf;+VHTUho{ZRc>_F
gYQhQgclVx>IN;9wwdR!hIa5Sdpo`C3JNX~3UZo{9a{vGU

delta 455
zcmWm7J&%)M007`iOiW}k>L0*GFUJu+q=hc#-cm|w3;m+dvT+4opj->Q(6`{wME`(;
zj>gr+)#V092WL%;(Me;BgNehr8lOM#Jih+r+Eel%Fy<O7l9E+$>J@?y**zFe@=-sj
z_|y(SV1Z3(I!ke_6GcDv8Hh?IRJ7qNX&@{(RJ7w)c;zT)8zL3CEfm#S0~7Q^GL3e0
z$~T(iKAZW{gaoa9-R4{v$T)?1hz8x5J5*aWNsFCQ;D!8v0vsdQqS0AWgellmLNVyv
za1?jo%t8}e3%xTIc+}e4W3eMK8St!x)#m>*CZ<m<8s@%>d~(Z?^W$E$N}YS8dVJQG
z?-QC;a_X{<IcnO^`rQBlQ1Fa&P))WPxfBcIG1Ti(uPcdE++56fcHnnM_643U^Jbmo
z9uYPK-L9(CLE&UBLoKMnso@FWT*FK|D-&b0f#bZJZDijfXqqMqNQL`eC%?cOV64+N
z);%zkr&7Z<P0tqx%eo5AqB33B(wd;YpSnN)K8eR~jT;~TTs`{iolI_DDj#0IJ2_&1
fKY#IzcqK}gw|?CjyuABEIQq7_`RVHG8{z#w((;`d

diff --git a/users/myuser/default.nix b/users/myuser/default.nix
index 73a72bd..f08e8c5 100644
--- a/users/myuser/default.nix
+++ b/users/myuser/default.nix
@@ -5,12 +5,12 @@
   stateVersion,
   ...
 }: let
-  inherit (config.repo.secrets.global) myuser;
+  myuser = config.repo.secrets.global.myuser.name;
 in {
   users.groups.${myuser}.gid = config.users.users.${myuser}.uid;
   users.users.${myuser} = {
     uid = 1000;
-    hashedPassword = "$6$YogAnKRz8qW2Gz.I$chgMKKrpPAfV0WuGN6ChOgUJistpCzFsHOT6mhHyj07mwI1kSfDJvnMB13frMvkpv2aGpXHVH.yxk5fYHeeET/";
+    inherit (config.repo.secrets.global.myuser) hashedPassword;
     createHome = true;
     group = myuser;
     extraGroups =
diff --git a/users/root/default.nix b/users/root/default.nix
index a342de0..d58697f 100644
--- a/users/root/default.nix
+++ b/users/root/default.nix
@@ -6,7 +6,7 @@
   ...
 }: {
   users.users.root = {
-    hashedPassword = "$6$EBo/CaxB.dQoq2W8$lo2b5vKgJlLPdGGhEqa08q3Irf1Zd1PcFBCwJOrG8lqjwbABkn1DEhrMh1P3ezwnww2HusUBuZGDSMa4nvSQg1";
+    inherit (config.repo.secrets.global.root) hashedPassword;
     openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5Uq+CDy5Pmt3If5M6d8K/Q7HArU6sZ7sgoj3T521Wm"];
     shell = pkgs.zsh;
   };
@@ -20,6 +20,10 @@
       inherit stateVersion;
       inherit (config.users.users.root) uid;
       username = config.users.users.root.name;
+
+      packages = with pkgs; [
+        wireguard-tools
+      ];
     };
   };
 }