diff options
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/2configs/baseX.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 87 | ||||
| -rw-r--r-- | lass/2configs/games.nix | 18 | ||||
| -rw-r--r-- | lass/2configs/nixpkgs.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/vim.nix | 4 |
5 files changed, 84 insertions, 28 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index fbab23500..cdb6d34ab 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -36,6 +36,7 @@ in { gitAndTools.qgit lm_sensors much + ncdu nmap pavucontrol powertop 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/games.nix b/lass/2configs/games.nix index 0eec97922..82b7eb2c9 100644 --- a/lass/2configs/games.nix +++ b/lass/2configs/games.nix @@ -2,10 +2,28 @@ let mainUser = config.users.extraUsers.mainUser; + doom = pkgs.writeDash "doom" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${pkgs.zandronum}/bin/zandronum \ + -file $DOOM_DIR/lib/brutalv20.pk3 \ + -file $DOOM_DIR/lib/RebotStarcraftMarines.pk3 \ + -fov 120 \ + "$@" + ''; + 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 "$@" + ''; in { environment.systemPackages = with pkgs; [ dwarf_fortress + doom1 + doom2 ]; users.extraUsers = { diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix index caca98746..48472f7a1 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 = "ee52e9809185bdf44452f2913e3f6ef839c15c4e"; + ref = "e360c7205f84be180d80b97f3980fb809a951486"; }; } diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index aac2b96d4..bfaae24c8 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -175,8 +175,8 @@ let "Syntastic config let g:syntastic_python_checkers=['flake8'] - nmap <esc>q :buffer - nmap <M-q> :buffer + nmap <esc>q :buffer + nmap <M-q> :buffer cnoremap <C-A> <Home> |