Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genid_signed -> genid_uint31

Browse Source
This commit is contained in:
lassulus 2018-08-09 14:38:06 +02:00
parent f00277e3ec
commit f9d96d13de
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lass/2configs/browsers.nix
View File

@ -29,7 +29,7 @@ let
environment.systemPackages = [ environment.systemPackages = [
config.lass.xjail-bins.${name} config.lass.xjail-bins.${name}
(pkgs.writeDashBin "cx-${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} = { lass.browser.paths.${name} = {

2
lass/2configs/ciko.nix
View File

@ -2,7 +2,7 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
users.users.ciko = { users.users.ciko = {
uid = genid_signed "ciko"; uid = genid_uint31 "ciko";
description = "acc for ciko"; description = "acc for ciko";
home = "/home/ciko"; home = "/home/ciko";
useDefaultShell = true; useDefaultShell = true;

18
lass/2configs/websites/domsen.nix
View File

@ -4,7 +4,7 @@ let
inherit (import <stockholm/lib>) inherit (import <stockholm/lib>)
genid genid
genid_signed genid_uint31
; ;
inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;}) inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
servePage servePage
@ -134,7 +134,7 @@ in {
}; };
users.users.domsen = { users.users.domsen = {
uid = genid_signed "domsen"; uid = genid_uint31 "domsen";
description = "maintenance acc for domsen"; description = "maintenance acc for domsen";
home = "/home/domsen"; home = "/home/domsen";
useDefaultShell = true; useDefaultShell = true;
@ -143,49 +143,49 @@ in {
}; };
users.users.bruno = { users.users.bruno = {
uid = genid_signed "bruno"; uid = genid_uint31 "bruno";
home = "/home/bruno"; home = "/home/bruno";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.jla-trading = { users.users.jla-trading = {
uid = genid_signed "jla-trading"; uid = genid_uint31 "jla-trading";
home = "/home/jla-trading"; home = "/home/jla-trading";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.jms = { users.users.jms = {
uid = genid_signed "jms"; uid = genid_uint31 "jms";
home = "/home/jms"; home = "/home/jms";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.ms = { users.users.ms = {
uid = genid_signed "ms"; uid = genid_uint31 "ms";
home = "/home/ms"; home = "/home/ms";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.testuser = { users.users.testuser = {
uid = genid_signed "testuser"; uid = genid_uint31 "testuser";
home = "/home/testuser"; home = "/home/testuser";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.akayguen = { users.users.akayguen = {
uid = genid_signed "akayguen"; uid = genid_uint31 "akayguen";
home = "/home/akayguen"; home = "/home/akayguen";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;
}; };
users.users.bui = { users.users.bui = {
uid = genid_signed "bui"; uid = genid_uint31 "bui";
home = "/home/bui"; home = "/home/bui";
useDefaultShell = true; useDefaultShell = true;
createHome = true; createHome = true;

2
lass/3modules/xjail.nix
View File

@ -23,7 +23,7 @@ with import <stockholm/lib>;
}; };
display = mkOption { display = mkOption {
type = types.string; type = types.string;
default = toString (genid_signed config._module.args.name); default = toString (genid_uint31 config._module.args.name);
}; };
dpi = mkOption { dpi = mkOption {
type = types.int; type = types.int;

2
lib/default.nix
View File

@ -13,7 +13,7 @@ let
mod = x: y: x - y * (x / y); mod = x: y: x - y * (x / y);
genid = import ./genid.nix { inherit lib; }; 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: lpad = n: c: s:
if lib.stringLength s < n if lib.stringLength s < n