diff options
author | makefu <github@syntax-fehler.de> | 2016-12-12 15:34:13 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-12-12 15:34:13 +0100 |
commit | bc2b56baaf67623bed232b321607da8c25bbdaec (patch) | |
tree | c3341b27ec10cc730d7ae7bd5f7f6627ee3ce037 /lass/2configs | |
parent | b1092b16a6be15f8121619e6d2eaf8d732b873ff (diff) | |
parent | a64a9668aa0639e78a6c677c17718731d8f2418c (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r-- | lass/2configs/baseX.nix | 9 | ||||
-rw-r--r-- | lass/2configs/buildbot-standalone.nix | 87 | ||||
-rw-r--r-- | lass/2configs/exim-smarthost.nix | 1 | ||||
-rw-r--r-- | lass/2configs/games.nix | 32 | ||||
-rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
-rw-r--r-- | lass/2configs/privoxy-retiolum.nix | 1 |
6 files changed, 102 insertions, 30 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index fbab23500..e98f382e3 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -7,11 +7,8 @@ in { ./xserver ./mpv.nix ./power-action.nix + ./pulse.nix ]; - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; users.extraUsers.mainUser.extraGroups = [ "audio" "video" ]; @@ -36,6 +33,7 @@ in { gitAndTools.qgit lm_sensors much + ncdu nmap pavucontrol powertop @@ -52,6 +50,9 @@ in { yt-next youtube-tools + + rxvt_unicode + termite #window manager stuff #haskellPackages.xmobar #haskellPackages.yeganesh diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index e7fbccb77..72cd66420 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -18,25 +18,34 @@ in { }; change_source.stockholm = '' stockholm_repo = '${stockholm-mirror-url}' - cs.append(changes.GitPoller( + cs.append( + changes.GitPoller( stockholm_repo, workdir='stockholm-poller', branches=True, project='stockholm', - pollinterval=120)) + pollinterval=120 + ) + ) ''; scheduler = { build-scheduler = '' # build all hosts - sched.append(schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch_re=".*"), - treeStableTimer=10, - name="build-all-branches", - builderNames=["build-all", "build-pkgs"])) + sched.append( + schedulers.SingleBranchScheduler( + change_filter=util.ChangeFilter(branch_re=".*"), + treeStableTimer=10, + name="build-all-branches", + builderNames=["build-hosts", "build-pkgs"] + ) + ) ''; }; builder_pre = '' # 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 env_lass = { @@ -57,45 +66,73 @@ in { # prepare nix-shell # 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: # SSL_CERT_FILE,LOGNAME,NIX_REMOTE - nixshell = ["nix-shell", - "-I", "stockholm=.", - "-I", "nixpkgs=/var/src/nixpkgs", - "-p" ] + deps + [ "--run" ] + nixshell = [ + "nix-shell", + "-I", "stockholm=.", + "-I", "nixpkgs=/var/src/nixpkgs", + "-p" + ] + deps + [ "--run" ] # prepare addShell function def addShell(factory,**kwargs): factory.addStep(steps.ShellCommand(**kwargs)) ''; builder = { - build-all = '' + build-hosts = '' f = util.BuildFactory() f.addStep(grab_repo) + for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf", "test-centos7" ]: + addShell(f,name="build-{}".format(i),env=env_shared, + 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 [ "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; \ + 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)]) + system={}".format(i) + ] + ) for i in [ "x", "wry", "vbob", "wbob", "shoney" ]: - addShell(f,name="build-{}".format(i),env=env_makefu, - command=nixshell + \ - ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \ + addShell(f,name="build-{}".format(i),env=env_makefu, + 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)]) + system={}".format(i) + ] + ) - bu.append(util.BuilderConfig(name="build-all", - workernames=workernames, - factory=f)) + bu.append( + util.BuilderConfig( + name="build-hosts", + workernames=workernames, + factory=f + ) + ) ''; diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 3bf78d9f4..d120dfcad 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -31,6 +31,7 @@ with import <stockholm/lib>; { from = "nebenan@lassul.us"; to = lass.mail; } { from = "feed@lassul.us"; to = lass.mail; } { from = "art@lassul.us"; to = lass.mail; } + { from = "irgendwas@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } diff --git a/lass/2configs/games.nix b/lass/2configs/games.nix index 0eec97922..e7c7de938 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -2,10 +2,42 @@ let 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 { environment.systemPackages = with pkgs; [ dwarf_fortress + doom1 + doom2 + vdoom1 + vdoom2 ]; users.extraUsers = { diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index be54d120a..fd331e90d 100644 --- a/lass/2configs/nixpkgs.nix +++ b/lass/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "ece0cea127f0a8799a6bd3b12c368193491f9058"; + ref = "76f346d61d537f5bbe4f365f9f659df7024602b4"; }; } diff --git a/lass/2configs/privoxy-retiolum.nix b/lass/2configs/privoxy-retiolum.nix index 9059bbac8..352a6d3d8 100644 --- a/lass/2configs/privoxy-retiolum.nix +++ b/lass/2configs/privoxy-retiolum.nix @@ -14,6 +14,7 @@ in { tables = { filter.INPUT.rules = [ { predicate = "-i retiolum -p tcp --dport 8118"; target = "ACCEPT"; } + { predicate = "-i dns0 -p tcp --dport 8118"; target = "ACCEPT"; } ]; }; }; |