From 5bf0935eb2b2c6cb8e89fca45b06586cb1824593 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Wed, 15 Mar 2023 01:59:30 +0100
Subject: [PATCH] feat: get myuser's username from repository secrets

---
 secrets/secrets.nix.age  | 10 ++++++++++
 users/myuser/default.nix | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 secrets/secrets.nix.age

diff --git a/secrets/secrets.nix.age b/secrets/secrets.nix.age
new file mode 100644
index 0000000..6b9f3c0
--- /dev/null
+++ b/secrets/secrets.nix.age
@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> X25519 G4gcvnrT5F96VKuJKWCZnu3FaQl8Mw53cTfAw75HvDo
+aW5tQryfBWLjGAhxzds0tNgD2Q7+GbC19ev0LTmnAag
+-> piv-p256 xqSe8Q Ak7W7nWemREYSyuxsCGZq3anjmSBjZXxInYRjyxhlULw
+a4D3LWlMB8mROXAtHeVtt8WckgBdrRwD0y2hJt9qLKg
+-> \aR-grease 2J>j% 4M/Y^- x1`AZ_,W )YZ/;NT
+pWcsdkCVXg9tB54p3/YcZt8VGpH+5FdZCZM6xFDvXai0AED9V9AKMWK9jOfqCQYN
+RvhfpOVyL0r8
+--- GYfc2AZAGyiEdSaSfw/BdsMFVQrVCYLM0rDAUtk3k9E
+�[S��^}�*�Tϳ.�S"�����H_ �z�i蔐`}�,)�x���/;���t�w���V���
\ No newline at end of file
diff --git a/users/myuser/default.nix b/users/myuser/default.nix
index 033713d..d0b419d 100644
--- a/users/myuser/default.nix
+++ b/users/myuser/default.nix
@@ -2,15 +2,18 @@
   config,
   lib,
   pkgs,
+  secrets,
   ...
 }:
-with lib; {
-  users.groups.myuser.gid = config.users.users.myuser.uid;
-  users.users.myuser = {
+with lib; let
+  inherit (secrets) myuser;
+in {
+  users.groups.${myuser}.gid = config.users.users.${myuser}.uid;
+  users.users.${myuser} = {
     uid = 1000;
     hashedPassword = "$6$YogAnKRz8qW2Gz.I$chgMKKrpPAfV0WuGN6ChOgUJistpCzFsHOT6mhHyj07mwI1kSfDJvnMB13frMvkpv2aGpXHVH.yxk5fYHeeET/";
     createHome = true;
-    group = "myuser";
+    group = myuser;
     extraGroups =
       ["wheel" "input" "video"]
       ++ optionals config.sound.enable ["audio"];
@@ -18,7 +21,7 @@ with lib; {
     shell = pkgs.zsh;
   };
 
-  home-manager.users.myuser = {
+  home-manager.users.${myuser} = {
     imports = [
       #impermanence.home-manager.impermanence
       ../common
@@ -28,8 +31,8 @@ with lib; {
     ];
 
     home = {
-      username = config.users.users.myuser.name;
-      inherit (config.users.users.myuser) uid;
+      username = config.users.users.${myuser}.name;
+      inherit (config.users.users.${myuser}) uid;
       shellAliases = {
         p = "cd ~/projects";
       };