diff options
| author | tv <tv@krebsco.de> | 2023-05-16 19:32:49 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2023-05-16 19:32:49 +0200 |
| commit | 56cff01ac49351e4a80a6003e96393922026f0ad (patch) | |
| tree | 94c85c4e59028a3b41ff83c2fad05782bae551e0 /lass | |
| parent | e3c8492f30a2c73acfb43478d8ceb8c38d7fa777 (diff) | |
| parent | df09f8293f326235d417ec750edf05298ba468de (diff) | |
Merge remote-tracking branch 'orange/master'
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/aergia/config.nix | 4 | ||||
| -rw-r--r-- | lass/2configs/paste.nix | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/lass/1systems/aergia/config.nix b/lass/1systems/aergia/config.nix index 6992db4a5..d49040a7a 100644 --- a/lass/1systems/aergia/config.nix +++ b/lass/1systems/aergia/config.nix @@ -65,8 +65,4 @@ ]; boot.cleanTmpDir = true; - - # vbox - virtualisation.virtualbox.host.enable = true; - users.users.mainUser.extraGroups = [ "vboxusers" ]; } diff --git a/lass/2configs/paste.nix b/lass/2configs/paste.nix index cfd7f5576..87768a452 100644 --- a/lass/2configs/paste.nix +++ b/lass/2configs/paste.nix @@ -82,14 +82,9 @@ with import <stockholm/lib>; krebs.htgen.paste = { port = 9081; - script = toString [ - "PATH=${makeBinPath [ - pkgs.nix - pkgs.file - ]}:$PATH" - "STATEDIR=$HOME" - ". ${pkgs.htgen}/examples/paste" - ]; + script = /* sh */ '' + (. ${pkgs.htgen-paste}/bin/htgen-paste) + ''; }; systemd.services.paste-gc = { |