Merge remote-tracking branch 'lass/master'
This commit is contained in:
commit
bc2b56baaf
|
@ -155,14 +155,13 @@ let
|
||||||
to = concatMapStringsSep "," (getAttr "mail") (toList to);
|
to = concatMapStringsSep "," (getAttr "mail") (toList to);
|
||||||
};
|
};
|
||||||
in mapAttrsToList format (with config.krebs.users; let
|
in mapAttrsToList format (with config.krebs.users; let
|
||||||
eloop-ml = spam-ml ++ [ ciko Mic92 ];
|
eloop-ml = spam-ml ++ [ ciko ];
|
||||||
spam-ml = [
|
spam-ml = [
|
||||||
lass
|
lass
|
||||||
makefu
|
makefu
|
||||||
tv
|
tv
|
||||||
];
|
];
|
||||||
ciko.mail = "wieczorek.stefan@gmail.com";
|
ciko.mail = "wieczorek.stefan@gmail.com";
|
||||||
Mic92.mail = "joerg@higgsboson.tk";
|
|
||||||
in {
|
in {
|
||||||
"anmeldung@eloop.org" = eloop-ml;
|
"anmeldung@eloop.org" = eloop-ml;
|
||||||
"cfp@eloop.org" = eloop-ml;
|
"cfp@eloop.org" = eloop-ml;
|
||||||
|
|
|
@ -15,10 +15,6 @@ python3Packages.buildPythonPackage rec {
|
||||||
requests2
|
requests2
|
||||||
];
|
];
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A tool for monitoring webpages for updates";
|
description = "A tool for monitoring webpages for updates";
|
||||||
homepage = https://thp.io/2008/urlwatch/;
|
homepage = https://thp.io/2008/urlwatch/;
|
||||||
|
|
|
@ -13,7 +13,6 @@ with import <stockholm/lib>;
|
||||||
../2configs/browsers.nix
|
../2configs/browsers.nix
|
||||||
../2configs/games.nix
|
../2configs/games.nix
|
||||||
../2configs/pass.nix
|
../2configs/pass.nix
|
||||||
../2configs/virtualbox.nix
|
|
||||||
../2configs/elster.nix
|
../2configs/elster.nix
|
||||||
../2configs/steam.nix
|
../2configs/steam.nix
|
||||||
../2configs/wine.nix
|
../2configs/wine.nix
|
||||||
|
@ -79,6 +78,9 @@ with import <stockholm/lib>;
|
||||||
{
|
{
|
||||||
services.redis.enable = true;
|
services.redis.enable = true;
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
virtualisation.libvirtd.enable = true;
|
||||||
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs.build.host = config.krebs.hosts.mors;
|
krebs.build.host = config.krebs.hosts.mors;
|
||||||
|
|
|
@ -7,11 +7,8 @@ in {
|
||||||
./xserver
|
./xserver
|
||||||
./mpv.nix
|
./mpv.nix
|
||||||
./power-action.nix
|
./power-action.nix
|
||||||
|
./pulse.nix
|
||||||
];
|
];
|
||||||
hardware.pulseaudio = {
|
|
||||||
enable = true;
|
|
||||||
systemWide = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];
|
users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];
|
||||||
|
|
||||||
|
@ -36,6 +33,7 @@ in {
|
||||||
gitAndTools.qgit
|
gitAndTools.qgit
|
||||||
lm_sensors
|
lm_sensors
|
||||||
much
|
much
|
||||||
|
ncdu
|
||||||
nmap
|
nmap
|
||||||
pavucontrol
|
pavucontrol
|
||||||
powertop
|
powertop
|
||||||
|
@ -52,6 +50,9 @@ in {
|
||||||
yt-next
|
yt-next
|
||||||
|
|
||||||
youtube-tools
|
youtube-tools
|
||||||
|
|
||||||
|
rxvt_unicode
|
||||||
|
termite
|
||||||
#window manager stuff
|
#window manager stuff
|
||||||
#haskellPackages.xmobar
|
#haskellPackages.xmobar
|
||||||
#haskellPackages.yeganesh
|
#haskellPackages.yeganesh
|
||||||
|
|
|
@ -18,25 +18,34 @@ in {
|
||||||
};
|
};
|
||||||
change_source.stockholm = ''
|
change_source.stockholm = ''
|
||||||
stockholm_repo = '${stockholm-mirror-url}'
|
stockholm_repo = '${stockholm-mirror-url}'
|
||||||
cs.append(changes.GitPoller(
|
cs.append(
|
||||||
|
changes.GitPoller(
|
||||||
stockholm_repo,
|
stockholm_repo,
|
||||||
workdir='stockholm-poller', branches=True,
|
workdir='stockholm-poller', branches=True,
|
||||||
project='stockholm',
|
project='stockholm',
|
||||||
pollinterval=120))
|
pollinterval=120
|
||||||
|
)
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
scheduler = {
|
scheduler = {
|
||||||
build-scheduler = ''
|
build-scheduler = ''
|
||||||
# build all hosts
|
# build all hosts
|
||||||
sched.append(schedulers.SingleBranchScheduler(
|
sched.append(
|
||||||
change_filter=util.ChangeFilter(branch_re=".*"),
|
schedulers.SingleBranchScheduler(
|
||||||
treeStableTimer=10,
|
change_filter=util.ChangeFilter(branch_re=".*"),
|
||||||
name="build-all-branches",
|
treeStableTimer=10,
|
||||||
builderNames=["build-all", "build-pkgs"]))
|
name="build-all-branches",
|
||||||
|
builderNames=["build-hosts", "build-pkgs"]
|
||||||
|
)
|
||||||
|
)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
builder_pre = ''
|
builder_pre = ''
|
||||||
# prepare grab_repo step for stockholm
|
# prepare grab_repo step for stockholm
|
||||||
grab_repo = steps.Git(repourl=stockholm_repo, mode='full')
|
grab_repo = steps.Git(
|
||||||
|
repourl=stockholm_repo,
|
||||||
|
mode='full'
|
||||||
|
)
|
||||||
|
|
||||||
# TODO: get nixpkgs/stockholm paths from krebs
|
# TODO: get nixpkgs/stockholm paths from krebs
|
||||||
env_lass = {
|
env_lass = {
|
||||||
|
@ -57,45 +66,73 @@ in {
|
||||||
|
|
||||||
# prepare nix-shell
|
# prepare nix-shell
|
||||||
# the dependencies which are used by the test script
|
# the dependencies which are used by the test script
|
||||||
deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate", "openssh" ]
|
deps = [
|
||||||
|
"gnumake",
|
||||||
|
"jq",
|
||||||
|
"nix",
|
||||||
|
"(import <stockholm>).pkgs.populate",
|
||||||
|
"openssh"
|
||||||
|
]
|
||||||
# TODO: --pure , prepare ENV in nix-shell command:
|
# TODO: --pure , prepare ENV in nix-shell command:
|
||||||
# SSL_CERT_FILE,LOGNAME,NIX_REMOTE
|
# SSL_CERT_FILE,LOGNAME,NIX_REMOTE
|
||||||
nixshell = ["nix-shell",
|
nixshell = [
|
||||||
"-I", "stockholm=.",
|
"nix-shell",
|
||||||
"-I", "nixpkgs=/var/src/nixpkgs",
|
"-I", "stockholm=.",
|
||||||
"-p" ] + deps + [ "--run" ]
|
"-I", "nixpkgs=/var/src/nixpkgs",
|
||||||
|
"-p"
|
||||||
|
] + deps + [ "--run" ]
|
||||||
|
|
||||||
# prepare addShell function
|
# prepare addShell function
|
||||||
def addShell(factory,**kwargs):
|
def addShell(factory,**kwargs):
|
||||||
factory.addStep(steps.ShellCommand(**kwargs))
|
factory.addStep(steps.ShellCommand(**kwargs))
|
||||||
'';
|
'';
|
||||||
builder = {
|
builder = {
|
||||||
build-all = ''
|
build-hosts = ''
|
||||||
f = util.BuildFactory()
|
f = util.BuildFactory()
|
||||||
f.addStep(grab_repo)
|
f.addStep(grab_repo)
|
||||||
for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
|
for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]:
|
||||||
addShell(f,name="build-{}".format(i),env=env_lass,
|
addShell(f,name="build-{}".format(i),env=env_shared,
|
||||||
command=nixshell + \
|
command=nixshell + \
|
||||||
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
||||||
make \
|
make \
|
||||||
test \
|
test \
|
||||||
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
||||||
method=build \
|
method=build \
|
||||||
system={}".format(i)])
|
system={}".format(i)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
|
||||||
|
addShell(f,name="build-{}".format(i),env=env_lass,
|
||||||
|
command=nixshell + \
|
||||||
|
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
||||||
|
make \
|
||||||
|
test \
|
||||||
|
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
||||||
|
method=build \
|
||||||
|
system={}".format(i)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
|
for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
|
||||||
addShell(f,name="build-{}".format(i),env=env_makefu,
|
addShell(f,name="build-{}".format(i),env=env_makefu,
|
||||||
command=nixshell + \
|
command=nixshell + \
|
||||||
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
|
||||||
make \
|
make \
|
||||||
test \
|
test \
|
||||||
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
|
||||||
method=build \
|
method=build \
|
||||||
system={}".format(i)])
|
system={}".format(i)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="build-all",
|
bu.append(
|
||||||
workernames=workernames,
|
util.BuilderConfig(
|
||||||
factory=f))
|
name="build-hosts",
|
||||||
|
workernames=workernames,
|
||||||
|
factory=f
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ with import <stockholm/lib>;
|
||||||
{ from = "nebenan@lassul.us"; to = lass.mail; }
|
{ from = "nebenan@lassul.us"; to = lass.mail; }
|
||||||
{ from = "feed@lassul.us"; to = lass.mail; }
|
{ from = "feed@lassul.us"; to = lass.mail; }
|
||||||
{ from = "art@lassul.us"; to = lass.mail; }
|
{ from = "art@lassul.us"; to = lass.mail; }
|
||||||
|
{ from = "irgendwas@lassul.us"; to = lass.mail; }
|
||||||
];
|
];
|
||||||
system-aliases = [
|
system-aliases = [
|
||||||
{ from = "mailer-daemon"; to = "postmaster"; }
|
{ from = "mailer-daemon"; to = "postmaster"; }
|
||||||
|
|
|
@ -2,10 +2,42 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
mainUser = config.users.extraUsers.mainUser;
|
mainUser = config.users.extraUsers.mainUser;
|
||||||
|
vdoom = pkgs.writeDash "vdoom" ''
|
||||||
|
${pkgs.zandronum-bin}/bin/zandronum \
|
||||||
|
-fov 120 \
|
||||||
|
"$@"
|
||||||
|
'';
|
||||||
|
doom = pkgs.writeDash "doom" ''
|
||||||
|
DOOM_DIR=''${DOOM_DIR:-~/doom/}
|
||||||
|
${vdoom} \
|
||||||
|
-file $DOOM_DIR/lib/brutalv20.pk3 \
|
||||||
|
-file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \
|
||||||
|
"$@"
|
||||||
|
'';
|
||||||
|
doom1 = pkgs.writeDashBin "doom1" ''
|
||||||
|
DOOM_DIR=''${DOOM_DIR:-~/doom/}
|
||||||
|
${doom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
|
||||||
|
'';
|
||||||
|
doom2 = pkgs.writeDashBin "doom2" ''
|
||||||
|
DOOM_DIR=''${DOOM_DIR:-~/doom/}
|
||||||
|
${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
|
||||||
|
'';
|
||||||
|
vdoom1 = pkgs.writeDashBin "vdoom1" ''
|
||||||
|
DOOM_DIR=''${DOOM_DIR:-~/doom/}
|
||||||
|
${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@"
|
||||||
|
'';
|
||||||
|
vdoom2 = pkgs.writeDashBin "vdoom2" ''
|
||||||
|
DOOM_DIR=''${DOOM_DIR:-~/doom/}
|
||||||
|
${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@"
|
||||||
|
'';
|
||||||
|
|
||||||
in {
|
in {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
dwarf_fortress
|
dwarf_fortress
|
||||||
|
doom1
|
||||||
|
doom2
|
||||||
|
vdoom1
|
||||||
|
vdoom2
|
||||||
];
|
];
|
||||||
|
|
||||||
users.extraUsers = {
|
users.extraUsers = {
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
{
|
{
|
||||||
krebs.build.source.nixpkgs.git = {
|
krebs.build.source.nixpkgs.git = {
|
||||||
url = https://github.com/nixos/nixpkgs;
|
url = https://github.com/nixos/nixpkgs;
|
||||||
ref = "ece0cea127f0a8799a6bd3b12c368193491f9058";
|
ref = "76f346d61d537f5bbe4f365f9f659df7024602b4";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ in {
|
||||||
tables = {
|
tables = {
|
||||||
filter.INPUT.rules = [
|
filter.INPUT.rules = [
|
||||||
{ predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; }
|
{ predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; }
|
||||||
|
{ predicate = "-i dns0 -p tcp --dport 8118"; target = "ACCEPT"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user