From 05be525be6d0896b155da7305b2cee950fb3530e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 21 Feb 2016 06:56:57 +0100
Subject: [PATCH] krebs.types.user: add uid :: int

---
 krebs/3modules/tv/default.nix     | 1 +
 krebs/4lib/default.nix            | 2 +-
 krebs/4lib/types.nix              | 4 ++++
 tv/2configs/default.nix           | 4 ++--
 tv/3modules/charybdis/default.nix | 3 +--
 tv/3modules/ejabberd/default.nix  | 3 +--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix
index 1a9198b4e..b0011ccf7 100644
--- a/krebs/3modules/tv/default.nix
+++ b/krebs/3modules/tv/default.nix
@@ -354,6 +354,7 @@ with config.krebs.lib;
     tv = {
       mail = "tv@nomic.retiolum";
       pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDFR//RnCvEZAt0F6ExDsatKZ/DDdifanuSL360mqOhaFieKI34RoOwfQT9T+Ga52Vh5V2La6esvlph686EdgzeKLvDoxEwFM9ZYFBcMrNzu4bMTlgE7YUYw5JiORyXNfznBGnme6qpuvx9ibYhUyiZo99kM8ys5YrUHrP2JXQJMezDFZHxT4GFMOuSdh/1daGoKKD6hYL/jEHX8CI4E3BSmKK6ygYr1fVX0K0Tv77lIi5mLXucjR7CytWYWYnhM6DC3Hxpv2zRkPgf3k0x/Y1hrw3V/r0Me5h90pd2C8pFaWA2ZoUT/fmyVqvx1tZPYToU/O2dMItY0zgx2kR0yD+6g7Aahz3R+KlXkV8k5c8bbTbfGnZWDR1ZlbLRM9Yt5vosfwapUD90MmVkpmR3wUkO2sUKi80QfC7b4KvSDXQ+MImbGxMaU5Bnsq1PqLN95q+uat3nlAVBAELkcx51FlE9CaIS65y4J7FEDg8BE5JeuCNshh62VSYRXVSFt8bk3f/TFGgzC8OIo14BhVmiRQQ503Z1sROyf5xLX2a/EJavMm1i2Bs2TH6ROKY9z5Pz8hT5US0r381V8oG7TZyLF9HTtoy3wCYsgWA5EmLanjAsVU2YEeAA0rxzdtYP8Y2okFiJ6u+M4HQZ3Wg3peSodyp3vxdYce2vk4EKeqEFuuS82850DYb7Et7fmp+wQQUT8Q/bMO0DreWjHoMM5lE4LJ4ME6AxksmMiFtfo/4Fe2q9D+LAqZ+ANOcv9M+8Rn6ngiYmuRNd0l/a02q1PEvO6vTfXgcl4f7Z1IULHPEaDNZHCJS1K5RXYFqYQ6OHsTmOm7hnwaRAS97+VFMo1i5uvTx9nYaAcY7yzq3Ckfb67dMBKApGOpJpkvPgfrP7bgBO5rOZXM1opXqVPb09nljAhhAhyCTh1e/8+mJrBo0cLQ/LupQzVxGDgm3awSMPxsZAN45PSWz76zzxdDa1MMo51do+VJHfs7Wl0NcXAQrniOBYL9Wqt0qNkn1gY5smkkISGeQ/vxNap4MmzeZE7b5fpOy+2fpcRVQLpc4nooQzJvSVTFz+25lgZ6iHf45K87gQFMIAri1Pf/EDDpL87az+bRWvWi+BA2kMe1kf+Ay1LyMz8r+g51H0ma0bNFh6+fbWMfUiD9JCepIObclnUJ4NlWfcgHxTf17d/4tl6z4DTcLpCCk8Da77JouSHgvtcRbRlFV1OfhWZLXUsrlfpaQTiItv6TGIr3k7+7b66o3Qw/GQVs5GmYifaIZIz8n8my4XjkaMBd0SZfBzzvFjHMq6YUP9+SbjvReqofuoO+5tW1wTYZXitFFBfwuHlXm6w77K5QDBW6olT7pat41/F5eGxLcz tv@wu";
+      uid = 1337; # TODO use default
     };
     tv-nomic = {
       inherit (tv) mail;
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index d5b6d03ac..8e5cab71f 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -15,7 +15,7 @@ let out = rec {
 
   addNames = mapAttrs addName;
 
-  types = import ./types.nix { inherit lib; };
+  types = import ./types.nix { lib = lib // { inherit genid; }; };
 
   dir.has-default-nix = path: pathExists (path + "/default.nix");
 
diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix
index 41af1cd4f..422627296 100644
--- a/krebs/4lib/types.nix
+++ b/krebs/4lib/types.nix
@@ -179,6 +179,10 @@ types // rec {
       pubkey = mkOption {
         type = str;
       };
+      uid = mkOption {
+        type = int;
+        default = genid config.name;
+      };
     };
   });
 
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 13699a3d5..5a1e90bc4 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -40,8 +40,8 @@ with config.krebs.lib;
         mutableUsers = false;
         users = {
           tv = {
+            inherit (config.krebs.users.tv) home uid;
             isNormalUser = true;
-            uid = 1337;
             extraGroups = [ "tv" ];
           };
         };
@@ -124,7 +124,7 @@ with config.krebs.lib;
             0)
               PS1='\[\e[1;31m\]\w\[\e[0m\] '
               ;;
-            1337)
+            ${toString config.krebs.users.tv.uid})
               PS1='\[\e[1;32m\]\w\[\e[0m\] '
               ;;
             *)
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 5cb0c55b7..87cb37ef4 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -73,9 +73,8 @@ in {
     };
 
     users.users.${cfg.user.name} = {
-      inherit (cfg.user) home name;
+      inherit (cfg.user) home name uid;
       createHome = true;
-      uid = genid cfg.user.name;
     };
   };
 }
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index 4077da286..da108eb52 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/3modules/ejabberd/default.nix
@@ -60,9 +60,8 @@ in {
     };
 
     users.users.${cfg.user.name} = {
-      inherit (cfg.user) home name;
+      inherit (cfg.user) home name uid;
       createHome = true;
-      uid = genid cfg.user.name;
     };
   };
 }