summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lass/2configs/browsers.nix2
-rw-r--r--lass/2configs/ciko.nix2
-rw-r--r--lass/2configs/websites/domsen.nix18
-rw-r--r--lass/3modules/xjail.nix2
-rw-r--r--lib/default.nix2
5 files changed, 13 insertions, 13 deletions
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 64fa6573a..425e0ee13 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -29,7 +29,7 @@ let
environment.systemPackages = [
config.lass.xjail-bins.${name}
(pkgs.writeDashBin "cx-${name}" ''
- DISPLAY=:${toString (genid_signed name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
+ DISPLAY=:${toString (genid_uint31 name)} ${pkgs.xclip}/bin/xclip -o | DISPLAY=:0 ${pkgs.xclip}/bin/xclip
'')
];
lass.browser.paths.${name} = {
diff --git a/lass/2configs/ciko.nix b/lass/2configs/ciko.nix
index 56c9a286c..b08cf9307 100644
--- a/lass/2configs/ciko.nix
+++ b/lass/2configs/ciko.nix
@@ -2,7 +2,7 @@
with import <stockholm/lib>;
{
users.users.ciko = {
- uid = genid_signed "ciko";
+ uid = genid_uint31 "ciko";
description = "acc for ciko";
home = "/home/ciko";
useDefaultShell = true;
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index d19f534fe..e1c1313ea 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -4,7 +4,7 @@ let
inherit (import <stockholm/lib>)
genid
- genid_signed
+ genid_uint31
;
inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
servePage
@@ -134,7 +134,7 @@ in {
};
users.users.domsen = {
- uid = genid_signed "domsen";
+ uid = genid_uint31 "domsen";
description = "maintenance acc for domsen";
home = "/home/domsen";
useDefaultShell = true;
@@ -143,49 +143,49 @@ in {
};
users.users.bruno = {
- uid = genid_signed "bruno";
+ uid = genid_uint31 "bruno";
home = "/home/bruno";
useDefaultShell = true;
createHome = true;
};
users.users.jla-trading = {
- uid = genid_signed "jla-trading";
+ uid = genid_uint31 "jla-trading";
home = "/home/jla-trading";
useDefaultShell = true;
createHome = true;
};
users.users.jms = {
- uid = genid_signed "jms";
+ uid = genid_uint31 "jms";
home = "/home/jms";
useDefaultShell = true;
createHome = true;
};
users.users.ms = {
- uid = genid_signed "ms";
+ uid = genid_uint31 "ms";
home = "/home/ms";
useDefaultShell = true;
createHome = true;
};
users.users.testuser = {
- uid = genid_signed "testuser";
+ uid = genid_uint31 "testuser";
home = "/home/testuser";
useDefaultShell = true;
createHome = true;
};
users.users.akayguen = {
- uid = genid_signed "akayguen";
+ uid = genid_uint31 "akayguen";
home = "/home/akayguen";
useDefaultShell = true;
createHome = true;
};
users.users.bui = {
- uid = genid_signed "bui";
+ uid = genid_uint31 "bui";
home = "/home/bui";
useDefaultShell = true;
createHome = true;
diff --git a/lass/3modules/xjail.nix b/lass/3modules/xjail.nix
index 8f5f05bc2..5b450ed42 100644
--- a/lass/3modules/xjail.nix
+++ b/lass/3modules/xjail.nix
@@ -23,7 +23,7 @@ with import <stockholm/lib>;
};
display = mkOption {
type = types.string;
- default = toString (genid_signed config._module.args.name);
+ default = toString (genid_uint31 config._module.args.name);
};
dpi = mkOption {
type = types.int;
diff --git a/lib/default.nix b/lib/default.nix
index e5e40975e..a40225c49 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -13,7 +13,7 @@ let
mod = x: y: x - y * (x / y);
genid = import ./genid.nix { inherit lib; };
- genid_signed = x: ((lib.genid x) + 16777216) / 2;
+ genid_uint31 = x: ((lib.genid x) + 16777216) / 2;
lpad = n: c: s:
if lib.stringLength s < n