From 1e810adc517b73179f9fd8856090b9cf0756f936 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 5 May 2025 12:23:15 +0200
Subject: [PATCH 1/4] users/frank: Add user

---
 users/frank/default.nix | 13 +++++++++++++
 users/frank/ssh.pub     |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 users/frank/default.nix
 create mode 100644 users/frank/ssh.pub

diff --git a/users/frank/default.nix b/users/frank/default.nix
new file mode 100644
index 0000000..f3b456b
--- /dev/null
+++ b/users/frank/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  users.users.frank = {
+    isNormalUser = true;
+    group = "frank";
+    openssh.authorizedKeys.keys = [
+      (builtins.readFile ./ssh.pub)
+    ];
+  };
+
+  users.groups.frank = {};
+}
diff --git a/users/frank/ssh.pub b/users/frank/ssh.pub
new file mode 100644
index 0000000..1252fdd
--- /dev/null
+++ b/users/frank/ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDD8uI/Tj2247iZHlP6yS1V7c8VlsZK0lBg92SNjuxAt91nfkMFQoG/pGt1UrBU+P0a4pN8bC9AJznfdmvymj0AuWaPrFM4W8oESQ1rajjfy+wTdEXHw8VTnP5iixymAadRdwc+afYTdVPeeHiec/bcFkShs5aIWb4I34gL+LMGp0At22Sz4QizDY5GRr0WwQXkNIkRAaMsoDN4KjS5Rzfg+hdmeWvdnrx59/b8d5pnA8FW/xNS0uR2Xef5l+ZigM+1w+7N5K+hkcesDlVliNWNf8MzN7fc8E4YUMrTuWjF+Ej6Y+JV5z5qGdToJN9UWgCXTxt1Cl9oITCrpFSD5AUgtZXahIWb21WbNFygoVqxsJEJEqDG5zXduIrxJKbV6Lpn8G0ejq+p0BlY10xLer5jUqyK9ecvNu+bUyJmXHG3u+plb4z1y7FIowzJn6JVusHIrrCRlrvMxkYQj6E0BWZZCqP14AZIHPW7IXrHQrGslH+Bx7khLgJXieVvxnrryKM=

From 593739120a06f4cf81bfa919a467c1ffef59ae53 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 5 May 2025 12:24:00 +0200
Subject: [PATCH 2/4] hosts/storage-2: Add location em

---
 hosts/storage-2/configuration.nix |  1 +
 hosts/storage-2/em.nix            | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 hosts/storage-2/em.nix

diff --git a/hosts/storage-2/configuration.nix b/hosts/storage-2/configuration.nix
index 9cc111e..bfa5e41 100644
--- a/hosts/storage-2/configuration.nix
+++ b/hosts/storage-2/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ./em.nix
       ./firmware.nix
       ./mixcloud.nix
       ./syncthing.nix
diff --git a/hosts/storage-2/em.nix b/hosts/storage-2/em.nix
new file mode 100644
index 0000000..d08affa
--- /dev/null
+++ b/hosts/storage-2/em.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  users.users.data-em = {
+    group = "data-em";
+    home = "/data/em";
+    useDefaultShell = true;
+    isSystemUser = true;
+  };
+  users.groups.data-em = {};
+
+  systemd.tmpfiles.rules = [
+    "d /data/em - data-em data-em - -"
+  ];
+}

From 70cde0e367c589466d501413062494b49c1b199a Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 5 May 2025 12:24:26 +0200
Subject: [PATCH 3/4] hosts/storage-2: Allow frank access to em

---
 flake.nix                 | 6 +++++-
 hosts/storage-2/users.nix | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 9525d32..a50e111 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,11 @@
       osmium = {};
       palladium = {};
       porter = {};
-      storage-2 = {};
+      storage-2 = {
+        modules = [
+          ./users/frank
+        ];
+      };
       tungsten = {};
       web-2 = {};
       zinc = {
diff --git a/hosts/storage-2/users.nix b/hosts/storage-2/users.nix
index 984ce62..9c800d5 100644
--- a/hosts/storage-2/users.nix
+++ b/hosts/storage-2/users.nix
@@ -2,4 +2,5 @@
 
 {
   users.users.clerie.extraGroups = [ "data-firmware" ];
+  users.users.frank.extraGroups = [ "data-em" ];
 }

From 87b0c382603ba09f1fbb093696c9289bf9e54889 Mon Sep 17 00:00:00 2001
From: Flake Update Bot <flake-update-bot@clerie.de>
Date: Tue, 6 May 2025 03:03:05 +0200
Subject: [PATCH 4/4] Update nixpkgs 2025-05-06-01-03

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d926d2..a86e8d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -551,11 +551,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1745234285,
-        "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
+        "lastModified": 1746328495,
+        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
+        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
         "type": "github"
       },
       "original": {