From 8994b2ca56307e45d1d1adbc9dbb9864dc48aa08 Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Tue, 23 Jul 2024 15:16:04 -0400
Subject: [PATCH] Trying To Move User Creation To A Separate File

---
 hosts/nixbird/default.nix       | 20 ++++++++++++++++++++
 modules/nixos/default.nix       |  1 +
 modules/nixos/users/annika.nix  | 13 +++++++++++++
 modules/nixos/users/default.nix |  6 ++++++
 secrets/secrets.yaml            |  7 ++++---
 5 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 hosts/nixbird/default.nix
 create mode 100644 modules/nixos/users/annika.nix
 create mode 100644 modules/nixos/users/default.nix

diff --git a/hosts/nixbird/default.nix b/hosts/nixbird/default.nix
new file mode 100644
index 0000000..9a6dd7a
--- /dev/null
+++ b/hosts/nixbird/default.nix
@@ -0,0 +1,20 @@
+{ inputs, globals, ... }:
+
+with inputs;
+
+inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  # specialArgs = {inherit inputs;};
+  modules = [
+    globals
+    lix-module.nixosModules.default
+    home-manager.nixosModules.home-manager
+    ../../modules/common
+    ../../modules/nixos
+    {
+      physical = false;
+      server = true;
+      networking.hostName = "nixbird";
+    }
+  ];
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index fc48230..2d26a30 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./hardware
     ./software
+    ./users
   ];
 }
\ No newline at end of file
diff --git a/modules/nixos/users/annika.nix b/modules/nixos/users/annika.nix
new file mode 100644
index 0000000..ea72058
--- /dev/null
+++ b/modules/nixos/users/annika.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+{
+  sops.secrets.annika_password.neededForUsers = true;
+
+  users.users.annika = {
+    isNormalUser = true;
+    home = "/home/annika";
+    description = "Annika Merris";
+    extraGroups = [ "networkmanager", "wheel" ];
+    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9NhsAOBwWBdBeenfaPoRtqQrAIgg7E5m4sKYQU9cFx annika@kim" ];
+    hashedPasswordFile = config.sops.secrets.annika_password;
+  };
+}
diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix
new file mode 100644
index 0000000..d64f0a6
--- /dev/null
+++ b/modules/nixos/users/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./annika.nix
+  ];
+}
\ No newline at end of file
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index f038767..9cb4029 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -2,6 +2,7 @@ spotifyd:
     settings:
         global:
             password: ENC[AES256_GCM,data:YnfXoQ7pbqoZ8QcqfkYd3A==,iv:+QwDqlZ5HEIasmeMAT48kvF3LpbTzJMu4OR1kjWOZCQ=,tag:rANAqr1GlYzHNItb2AmCmg==,type:str]
+annika_password: ENC[AES256_GCM,data:qRdNYmU7Z0A0r3rhyTQMa9I/uNjlSMSjPzRNDBUvpV8t+jlN+l+5XzGawS7E1cwBTuU/rkdSha2vU2hCyWgxqOmLjSp8okCUSw==,iv:12lV4/zC5uneYnDrps9cdv5J1fXiuMfIGmoaYDaVD5c=,tag:d8SNVCcbYOT0iiUjeKVsWA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -26,8 +27,8 @@ sops:
             YUxQYnZmRUc0TkZkaEFHSGp6RzdwdGcK/Y8BuOQrcOgWpA18FijIpRR7zw+VYl2+
             bJLhkeIjYvDc+mNoKf/GCVmJVtSAWanoHGKasDfkDkuSkAJfao9WzA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-05-12T13:52:54Z"
-    mac: ENC[AES256_GCM,data:m/6tsxQDl+Ox+pWlWb46GvO49pTdzVNrDhaNlEHZ8clwqCqGB0onUJR8rWI8dVIeEyCqXhQ5dHn6B0QMJcyAxhLd6R8fc193hSmv7e5oBm5Qj0L1sd83lQRhrcFyM1qUpJzQydWVlp7vQFqpLzNqsQ6ZwH0r3hK4eRaqS4GaNfo=,iv:j+5mN1yI00Tdii2cfN3imbB56msfB0wUZ/ANNW143jo=,tag:ROQfmDd2uq0zvIX6FhwyTQ==,type:str]
+    lastmodified: "2024-07-23T19:08:33Z"
+    mac: ENC[AES256_GCM,data:6XxNXxnjzCxVHOK/7+e4x+PLEzyqDtClfvdPyOXJnvX7iz8p5zjXazUV0gq1kbUVrD6Uh2XumomNOeyA+VP7g5bpxkbOEGUoptzU+VsEQtTIvRlQn09J3J733yKlwDJ6dglTUuyOD66e21dIRF6JJ1UWOFkwptToHdEe+PqcWLc=,iv:T0Vr851SJcv6tprN0+wshu+WfSMWug5tEkPluVKRx4A=,tag:Dt10qxRJuUPBlK4oNyNgNg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.9.0