Merge remote-tracking branch 'gum/master'
This commit is contained in:
commit
635543efe2
|
@ -5,7 +5,7 @@ with import <stockholm/lib>;
|
||||||
{
|
{
|
||||||
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {
|
hosts = mapAttrs (_: setAttr "owner" config.krebs.users.makefu) {
|
||||||
cake = rec {
|
cake = rec {
|
||||||
cores = 1;
|
cores = 4;
|
||||||
ci = false;
|
ci = false;
|
||||||
nets = {
|
nets = {
|
||||||
retiolum = {
|
retiolum = {
|
||||||
|
|
|
@ -83,7 +83,7 @@ in {
|
||||||
# <stockholm/makefu/2configs/logging/client.nix>
|
# <stockholm/makefu/2configs/logging/client.nix>
|
||||||
|
|
||||||
# Temporary:
|
# Temporary:
|
||||||
<stockholm/makefu/2configs/temp/rst-issue.nix>
|
# <stockholm/makefu/2configs/temp/rst-issue.nix>
|
||||||
|
|
||||||
];
|
];
|
||||||
makefu.dl-dir = "/var/download";
|
makefu.dl-dir = "/var/download";
|
||||||
|
|
|
@ -18,7 +18,7 @@ in {
|
||||||
|
|
||||||
# Security
|
# Security
|
||||||
<stockholm/makefu/2configs/sshd-totp.nix>
|
<stockholm/makefu/2configs/sshd-totp.nix>
|
||||||
<stockholm/makefu/2configs/stats/client.nix>
|
# <stockholm/makefu/2configs/stats/client.nix>
|
||||||
|
|
||||||
# Tools
|
# Tools
|
||||||
<stockholm/makefu/2configs/tools/core.nix>
|
<stockholm/makefu/2configs/tools/core.nix>
|
||||||
|
|
|
@ -82,7 +82,7 @@ in {
|
||||||
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
|
# docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
|
||||||
|
|
||||||
# Temporary:
|
# Temporary:
|
||||||
<stockholm/makefu/2configs/temp/rst-issue.nix>
|
# <stockholm/makefu/2configs/temp/rst-issue.nix>
|
||||||
];
|
];
|
||||||
makefu.full-populate = true;
|
makefu.full-populate = true;
|
||||||
makefu.server.primary-itf = primaryInterface;
|
makefu.server.primary-itf = primaryInterface;
|
||||||
|
|
|
@ -24,9 +24,12 @@ in {
|
||||||
# <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
|
# <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
|
||||||
# <stockholm/makefu/2configs/audio/realtime-audio.nix>
|
# <stockholm/makefu/2configs/audio/realtime-audio.nix>
|
||||||
# <stockholm/makefu/2configs/vncserver.nix>
|
# <stockholm/makefu/2configs/vncserver.nix>
|
||||||
<stockholm/makefu/2configs/temp/rst-issue.nix>
|
|
||||||
# Services
|
# Services
|
||||||
<stockholm/makefu/2configs/remote-build/slave.nix>
|
<stockholm/makefu/2configs/remote-build/slave.nix>
|
||||||
|
|
||||||
|
# temporary
|
||||||
|
# <stockholm/makefu/2configs/temp/rst-issue.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
krebs = {
|
krebs = {
|
||||||
|
|
|
@ -23,8 +23,6 @@ with import <stockholm/lib>;
|
||||||
# <stockholm/makefu/2configs/deployment/wiki-irc-bot>
|
# <stockholm/makefu/2configs/deployment/wiki-irc-bot>
|
||||||
|
|
||||||
# <stockholm/makefu/2configs/torrent.nix>
|
# <stockholm/makefu/2configs/torrent.nix>
|
||||||
# <stockholm/makefu/2configs/lanparty/lancache.nix>
|
|
||||||
# <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
|
|
||||||
# <stockholm/makefu/2configs/deployment/dirctator.nix>
|
# <stockholm/makefu/2configs/deployment/dirctator.nix>
|
||||||
# <stockholm/makefu/2configs/vncserver.nix>
|
# <stockholm/makefu/2configs/vncserver.nix>
|
||||||
# <stockholm/makefu/2configs/deployment/led-fader>
|
# <stockholm/makefu/2configs/deployment/led-fader>
|
||||||
|
@ -64,7 +62,7 @@ with import <stockholm/lib>;
|
||||||
<stockholm/makefu/2configs/hw/rtl8812au.nix>
|
<stockholm/makefu/2configs/hw/rtl8812au.nix>
|
||||||
<stockholm/makefu/2configs/hw/exfat-nofuse.nix>
|
<stockholm/makefu/2configs/hw/exfat-nofuse.nix>
|
||||||
<stockholm/makefu/2configs/hw/wwan.nix>
|
<stockholm/makefu/2configs/hw/wwan.nix>
|
||||||
<stockholm/makefu/2configs/hw/stk1160.nix>
|
# <stockholm/makefu/2configs/hw/stk1160.nix>
|
||||||
# <stockholm/makefu/2configs/rad1o.nix>
|
# <stockholm/makefu/2configs/rad1o.nix>
|
||||||
|
|
||||||
# Filesystem
|
# Filesystem
|
||||||
|
@ -75,6 +73,11 @@ with import <stockholm/lib>;
|
||||||
{
|
{
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
}
|
}
|
||||||
|
# temporary
|
||||||
|
# <stockholm/makefu/2configs/lanparty/lancache.nix>
|
||||||
|
# <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
|
||||||
|
# <stockholm/makefu/2configs/lanparty/samba.nix>
|
||||||
|
# <stockholm/makefu/2configs/lanparty/mumble-server.nix>
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -84,7 +87,6 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.passwdqc-utils ];
|
|
||||||
|
|
||||||
|
|
||||||
# configure pulseAudio to provide a HDMI sink as well
|
# configure pulseAudio to provide a HDMI sink as well
|
||||||
|
@ -102,4 +104,7 @@ with import <stockholm/lib>;
|
||||||
'';
|
'';
|
||||||
# hard dependency because otherwise the device will not be unlocked
|
# hard dependency because otherwise the device will not be unlocked
|
||||||
boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
|
boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
|
||||||
|
|
||||||
|
nix.package = pkgs.nixUnstable;
|
||||||
|
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
# TODO: un-pin linuxPackages somehow
|
|
||||||
boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages;
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
|
||||||
linux_4_9 = pkgs.linux_4_9.override {
|
|
||||||
extraConfig = ''
|
|
||||||
MEDIA_ANALOG_TV_SUPPORT y
|
|
||||||
VIDEO_STK1160_COMMON m
|
|
||||||
VIDEO_STK1160_AC97 y
|
|
||||||
VIDEO_STK1160 m
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -14,6 +14,7 @@
|
||||||
file
|
file
|
||||||
lsof
|
lsof
|
||||||
which
|
which
|
||||||
|
binutils
|
||||||
|
|
||||||
# fs
|
# fs
|
||||||
cifs-utils
|
cifs-utils
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
users.users.makefu.packages = with pkgs;[
|
users.users.makefu.packages = with pkgs;[
|
||||||
python35Packages.virtualenv
|
python3Packages.virtualenv
|
||||||
|
python3Packages.pyserial
|
||||||
# embedded
|
# embedded
|
||||||
gi
|
gi
|
||||||
flashrom
|
flashrom
|
||||||
|
|
|
@ -6,5 +6,6 @@
|
||||||
];
|
];
|
||||||
users.users.makefu.packages = with pkgs; [
|
users.users.makefu.packages = with pkgs; [
|
||||||
games-user-env
|
games-user-env
|
||||||
|
wine
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,12 +11,8 @@ let
|
||||||
then "buildbot"
|
then "buildbot"
|
||||||
else "makefu";
|
else "makefu";
|
||||||
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
_file = <stockholm> + "/makefu/1systems/${name}/source.nix";
|
||||||
ref = "e3d14bb"; # unstable @ 2017-11-02
|
ref = "0c0d314"; # unstable @ 2017-11-14
|
||||||
# + ruby stuff: 2f0b17e4be9 55a952be5b5
|
# + do_sqlite3 ruby: 55a952be5b5
|
||||||
# + jsbeautifier: c60bee3
|
|
||||||
# + mitmproxy fix: a0f7cedfae31
|
|
||||||
# + synergy fix: 5e6c76bc1
|
|
||||||
# + snapraid fix: e3d14bb1
|
|
||||||
|
|
||||||
in
|
in
|
||||||
evalSource (toString _file) [
|
evalSource (toString _file) [
|
||||||
|
|
Loading…
Reference in New Issue
Block a user