From 1e43f145117fc1be4a8a2e8a7144b3b1404d7a73 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 18 Mar 2025 19:37:52 -0400
Subject: [PATCH] feat: declare uid of main user for every device
---
configurations/bbsteamie/default.nix | 1 +
configurations/binto/default.nix | 1 +
configurations/cluster/default.nix | 1 +
configurations/homie/default.nix | 1 +
configurations/nos/default.nix | 1 +
configurations/nos/modules/docker/default.nix | 6 +++---
configurations/servivi/default.nix | 1 +
configurations/wim/default.nix | 1 +
8 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/configurations/bbsteamie/default.nix b/configurations/bbsteamie/default.nix
index 02c773c0..fee65c5a 100644
--- a/configurations/bbsteamie/default.nix
+++ b/configurations/bbsteamie/default.nix
@@ -25,6 +25,7 @@
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$b6YdvHx1b/HOD6Kt3Tw1W.$yIy5Km1xBViJA2kra9l38S/0auhEHPdXOMb6RBhgxID";
diff --git a/configurations/binto/default.nix b/configurations/binto/default.nix
index c1a76b68..916e8934 100644
--- a/configurations/binto/default.nix
+++ b/configurations/binto/default.nix
@@ -26,6 +26,7 @@
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$uCv3kB5LI3Shj/5liU9cS0$4s3wWoH4iY29DLC3lJwNaIcurcjsj8L02cMY4EDtnC6";
diff --git a/configurations/cluster/default.nix b/configurations/cluster/default.nix
index 184bc302..6af2cb61 100644
--- a/configurations/cluster/default.nix
+++ b/configurations/cluster/default.nix
@@ -29,6 +29,7 @@ in {
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword =
if deviceName == "thingone"
diff --git a/configurations/homie/default.nix b/configurations/homie/default.nix
index a978218f..23892c2d 100644
--- a/configurations/homie/default.nix
+++ b/configurations/homie/default.nix
@@ -27,6 +27,7 @@
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$CBC0wX9ZrZeXE296CWTvK.$xTJE54Pd4EPrv/Q4TQ42ahIDXQYoavcnwcsItw0hk.B";
diff --git a/configurations/nos/default.nix b/configurations/nos/default.nix
index ac0438cb..0946e7c1 100644
--- a/configurations/nos/default.nix
+++ b/configurations/nos/default.nix
@@ -26,6 +26,7 @@
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$DSLWphPlpiahIw7KQciF1/$FOjIbplU1Fknv5W.A15Xgdk.WNXP.zeWkJiewSUTGPC";
diff --git a/configurations/nos/modules/docker/default.nix b/configurations/nos/modules/docker/default.nix
index 4f045cd0..9667ee52 100644
--- a/configurations/nos/modules/docker/default.nix
+++ b/configurations/nos/modules/docker/default.nix
@@ -1,8 +1,8 @@
-{...}: let
+{config, mainUser, ...}: let
globalEnv = {
configPath = "/var/lib/docker-data";
- mainUID = "1000";
- mainGID = "1000";
+ mainUID = toString config.users.users.${mainUser}.uid;
+ mainGID = toString config.users.users.${mainUser}.uid;
TZ = "America/New_York";
};
in {
diff --git a/configurations/servivi/default.nix b/configurations/servivi/default.nix
index 8ea5eed2..3a5f8e14 100644
--- a/configurations/servivi/default.nix
+++ b/configurations/servivi/default.nix
@@ -27,6 +27,7 @@
users.users = {
${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$723InNIdzpJ1.TqxroiXa0$thewApg1l3lpgq.qAwh3k0c/.fu1H1TWRyA8dfjvpP0";
diff --git a/configurations/wim/default.nix b/configurations/wim/default.nix
index 3eabe900..7211a389 100644
--- a/configurations/wim/default.nix
+++ b/configurations/wim/default.nix
@@ -29,6 +29,7 @@
# ------------------------------------------------
users.users.${mainUser} = {
isNormalUser = true;
+ uid = 1000;
hashedPassword = "$y$j9T$ZwnaqAzFjKB/1oJSvypdt.$CtQzgoUWxNutP1DsTBrFHXiTGP6JJp/bMchl1VaADSA";