Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma: replace path to 2configs, init source.nix

Browse Source
This commit is contained in:
makefu 2017-07-15 19:01:02 +02:00
parent fa38155eec
commit 7704f80890
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
35 changed files with 273 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
makefu/1systems/darth/config.nix
View File

@ -10,15 +10,15 @@ let
allDisks = [ rootDisk ]; # auxDisk allDisks = [ rootDisk ]; # auxDisk
in { in {
imports = [ imports = [
../. <stockholm/makefu>
../2configs/fs/single-partition-ext4.nix <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
../2configs/zsh-user.nix <stockholm/makefu/2configs/zsh-user.nix>
../2configs/smart-monitor.nix <stockholm/makefu/2configs/smart-monitor.nix>
../2configs/exim-retiolum.nix <stockholm/makefu/2configs/exim-retiolum.nix>
../2configs/virtualization.nix <stockholm/makefu/2configs/virtualization.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/temp-share-samba.nix <stockholm/makefu/2configs/temp-share-samba.nix>
]; ];
services.samba.shares = { services.samba.shares = {
isos = { isos = {

3
makefu/1systems/darth/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="darth";
}

8
makefu/1systems/drop/config.nix
View File

@ -5,10 +5,10 @@ let
prefixLength = 18; prefixLength = 18;
in { in {
imports = [ imports = [
../. <stockholm/makefu>
../2configs/hw/CAC.nix <stockholm/makefu/2configs/hw/CAC.nix>
../2configs/save-diskspace.nix <stockholm/makefu/2configs/save-diskspace.nix>
../2configs/torrent.nix <stockholm/makefu/2configs/torrent.nix>
]; ];
krebs = { krebs = {
enable = true; enable = true;

3
makefu/1systems/drop/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="drop";
}

18
makefu/1systems/fileleech/config.nix
View File

@ -22,16 +22,16 @@ let
disks = [ { name = "luksroot"; device = rootPartition; } ] ++ dataDisks; disks = [ { name = "luksroot"; device = rootPartition; } ] ++ dataDisks;
in { in {
imports = [ imports = [
../. <stockholm/makefu>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/disable_v6.nix <stockholm/makefu/2configs/disable_v6.nix>
# ../2configs/torrent.nix # <stockholm/makefu/2configs/torrent.nix>
../2configs/fs/sda-crypto-root.nix <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
#../2configs/elchos/irc-token.nix #<stockholm/makefu/2configs/elchos/irc-token.nix>
../2configs/elchos/log.nix <stockholm/makefu/2configs/elchos/log.nix>
../2configs/elchos/search.nix <stockholm/makefu/2configs/elchos/search.nix>
../2configs/elchos/stats.nix <stockholm/makefu/2configs/elchos/stats.nix>
]; ];
systemd.services.grafana.serviceConfig.LimitNOFILE=10032; systemd.services.grafana.serviceConfig.LimitNOFILE=10032;

3
makefu/1systems/fileleech/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="fileleech";
}

16
makefu/1systems/filepimp/config.nix
View File

@ -20,11 +20,11 @@ let
in { in {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
../2configs/fs/single-partition-ext4.nix <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
../2configs/smart-monitor.nix <stockholm/makefu/2configs/smart-monitor.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/filepimp-share.nix <stockholm/makefu/2configs/filepimp-share.nix>
]; ];
krebs.build.host = config.krebs.hosts.filepimp; krebs.build.host = config.krebs.hosts.filepimp;
@ -73,9 +73,9 @@ in {
xfsmount = name: dev: xfsmount = name: dev:
{ "/media/${name}" = { device = dev; fsType = "xfs"; }; }; { "/media/${name}" = { device = dev; fsType = "xfs"; }; };
in in
# (xfsmount "j0" (part1 jDisk0)) // # (xfsmount "j0" (part1 jDisk0)) <stockholm/makefu>
(xfsmount "j1" (part1 jDisk1)) // (xfsmount "j1" (part1 jDisk1)) <stockholm/makefu>
(xfsmount "j2" (part1 jDisk2)) // (xfsmount "j2" (part1 jDisk2)) <stockholm/makefu>
(xfsmount "par0" (part1 jDisk3)) (xfsmount "par0" (part1 jDisk3))
; ;

3
makefu/1systems/filepimp/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="filepimp";
}

72
makefu/1systems/gum/config.nix
View File

@ -13,47 +13,47 @@ let
main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0"; main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0";
in { in {
imports = [ imports = [
../. <stockholm/makefu>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/headless.nix <stockholm/makefu/2configs/headless.nix>
../2configs/fs/single-partition-ext4.nix <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
# ../2configs/smart-monitor.nix # <stockholm/makefu/2configs/smart-monitor.nix>
../2configs/git/cgit-retiolum.nix <stockholm/makefu/2configs/git/cgit-retiolum.nix>
../2configs/backup.nix <stockholm/makefu/2configs/backup.nix>
# ../2configs/mattermost-docker.nix # <stockholm/makefu/2configs/mattermost-docker.nix>
# ../2configs/disable_v6.nix # <stockholm/makefu/2configs/disable_v6.nix>
../2configs/exim-retiolum.nix <stockholm/makefu/2configs/exim-retiolum.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/urlwatch <stockholm/makefu/2configs/urlwatch>
# Security # Security
../2configs/sshd-totp.nix <stockholm/makefu/2configs/sshd-totp.nix>
# Tools # Tools
../2configs/tools/core.nix <stockholm/makefu/2configs/tools/core.nix>
../2configs/tools/dev.nix <stockholm/makefu/2configs/tools/dev.nix>
../2configs/tools/sec.nix <stockholm/makefu/2configs/tools/sec.nix>
# services # services
../2configs/share/gum.nix <stockholm/makefu/2configs/share/gum.nix>
../2configs/sabnzbd.nix <stockholm/makefu/2configs/sabnzbd.nix>
../2configs/torrent.nix <stockholm/makefu/2configs/torrent.nix>
../2configs/iodined.nix <stockholm/makefu/2configs/iodined.nix>
## Web ## Web
../2configs/nginx/share-download.nix <stockholm/makefu/2configs/nginx/share-download.nix>
../2configs/nginx/euer.test.nix <stockholm/makefu/2configs/nginx/euer.test.nix>
../2configs/nginx/euer.wiki.nix <stockholm/makefu/2configs/nginx/euer.wiki.nix>
../2configs/nginx/euer.blog.nix <stockholm/makefu/2configs/nginx/euer.blog.nix>
../2configs/nginx/public_html.nix <stockholm/makefu/2configs/nginx/public_html.nix>
../2configs/nginx/update.connector.one.nix <stockholm/makefu/2configs/nginx/update.connector.one.nix>
../2configs/deployment/mycube.connector.one.nix <stockholm/makefu/2configs/deployment/mycube.connector.one.nix>
../2configs/deployment/graphs.nix <stockholm/makefu/2configs/deployment/graphs.nix>
../2configs/deployment/owncloud.nix <stockholm/makefu/2configs/deployment/owncloud.nix>
../2configs/deployment/wiki-irc-bot <stockholm/makefu/2configs/deployment/wiki-irc-bot>
../2configs/deployment/boot-euer.nix <stockholm/makefu/2configs/deployment/boot-euer.nix>
../2configs/deployment/hound <stockholm/makefu/2configs/deployment/hound>
{ {
services.taskserver.enable = true; services.taskserver.enable = true;
services.taskserver.fqdn = config.krebs.build.host.name; services.taskserver.fqdn = config.krebs.build.host.name;
@ -64,12 +64,12 @@ in {
ip6tables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT ip6tables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT
''; '';
} }
# ../2configs/ipfs.nix # <stockholm/makefu/2configs/ipfs.nix>
../2configs/syncthing.nix <stockholm/makefu/2configs/syncthing.nix>
# ../2configs/opentracker.nix # <stockholm/makefu/2configs/opentracker.nix>
../2configs/stats/client.nix <stockholm/makefu/2configs/stats/client.nix>
# ../2configs/logging/client.nix # <stockholm/makefu/2configs/logging/client.nix>
]; ];
makefu.dl-dir = "/var/download"; makefu.dl-dir = "/var/download";

3
makefu/1systems/gum/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="gum";
}

4
makefu/1systems/iso/config.nix
View File

@ -3,10 +3,10 @@
with import <stockholm/lib>; with import <stockholm/lib>;
{ {
imports = [ imports = [
../. <stockholm/makefu>
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix> <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
<nixpkgs/nixos/modules/installer/cd-dvd/channel.nix> <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
../2configs/tools/core.nix <stockholm/makefu/2configs/tools/core.nix>
]; ];
# TODO: NIX_PATH and nix.nixPath are being set by default.nix right now # TODO: NIX_PATH and nix.nixPath are being set by default.nix right now
# cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos # cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos

3
makefu/1systems/iso/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="iso";
}

44
makefu/1systems/omo/config.nix
View File

@ -39,35 +39,35 @@ let
in { in {
imports = imports =
[ [
../. <stockholm/makefu>
# TODO: unlock home partition via ssh # TODO: unlock home partition via ssh
../2configs/fs/sda-crypto-root.nix <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
../2configs/zsh-user.nix <stockholm/makefu/2configs/zsh-user.nix>
../2configs/backup.nix <stockholm/makefu/2configs/backup.nix>
../2configs/exim-retiolum.nix <stockholm/makefu/2configs/exim-retiolum.nix>
../2configs/smart-monitor.nix <stockholm/makefu/2configs/smart-monitor.nix>
../2configs/mail-client.nix <stockholm/makefu/2configs/mail-client.nix>
# ../2configs/disable_v6.nix # <stockholm/makefu/2configs/disable_v6.nix>
#../2configs/graphite-standalone.nix #<stockholm/makefu/2configs/graphite-standalone.nix>
#../2configs/share-user-sftp.nix #<stockholm/makefu/2configs/share-user-sftp.nix>
../2configs/share/omo.nix <stockholm/makefu/2configs/share/omo.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
# Logging # Logging
../2configs/stats/server.nix #influx + grafana <stockholm/makefu/2configs/stats/server.nix #influx + grafana>
../2configs/stats/client.nix <stockholm/makefu/2configs/stats/client.nix>
../2configs/stats/external/aralast.nix # logs to influx <stockholm/makefu/2configs/stats/external/aralast.nix # logs to influx>
# services # services
../2configs/syncthing.nix <stockholm/makefu/2configs/syncthing.nix>
../2configs/mqtt.nix <stockholm/makefu/2configs/mqtt.nix>
# ../2configs/logging/central-logging-client.nix # <stockholm/makefu/2configs/logging/central-logging-client.nix>
# ../2configs/torrent.nix # <stockholm/makefu/2configs/torrent.nix>
# ../2configs/elchos/search.nix # <stockholm/makefu/2configs/elchos/search.nix>
# ../2configs/elchos/log.nix # <stockholm/makefu/2configs/elchos/log.nix>
# ../2configs/elchos/irc-token.nix # <stockholm/makefu/2configs/elchos/irc-token.nix>
## as long as pyload is not in nixpkgs: ## as long as pyload is not in nixpkgs:
# 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

3
makefu/1systems/omo/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="omo";
}

8
makefu/1systems/pnp/config.nix
View File

@ -6,16 +6,16 @@
{ {
imports = imports =
[ [
../. <stockholm/makefu>
../2configs/headless.nix <stockholm/makefu/2configs/headless.nix>
../../krebs/3modules/Reaktor.nix ../../krebs/3modules/Reaktor.nix
# these will be overwritten by qemu-vm.nix but will be used if the system # these will be overwritten by qemu-vm.nix but will be used if the system
# is directly deployed # is directly deployed
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/fs/vm-single-partition.nix <stockholm/makefu/2configs/fs/vm-single-partition.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
# config.system.build.vm # config.system.build.vm
(toString <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>) (toString <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>)

3
makefu/1systems/pnp/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="pnp";
}

6
makefu/1systems/repunit/config.nix
View File

@ -7,10 +7,10 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
<nixpkgs/nixos/modules/profiles/qemu-guest.nix> <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/git/cgit-retiolum.nix <stockholm/makefu/2configs/git/cgit-retiolum.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
]; ];
krebs.build.host = config.krebs.hosts.repunit; krebs.build.host = config.krebs.hosts.repunit;

3
makefu/1systems/repunit/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="repunit";
}

6
makefu/1systems/sdev/config.nix
View File

@ -4,14 +4,14 @@
makefu.awesome.modkey = "Mod1"; makefu.awesome.modkey = "Mod1";
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
../2configs/main-laptop.nix #< base-gui <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
# <secrets/extra-hosts.nix> # <secrets/extra-hosts.nix>
# environment # environment
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
]; ];
# workaround for https://github.com/NixOS/nixpkgs/issues/16641 # workaround for https://github.com/NixOS/nixpkgs/issues/16641

3
makefu/1systems/sdev/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="sdev";
}

12
makefu/1systems/shoney/config.nix
View File

@ -9,12 +9,12 @@ let
gw = "64.137.234.1"; gw = "64.137.234.1";
in { in {
imports = [ imports = [
../. <stockholm/makefu>
../2configs/save-diskspace.nix <stockholm/makefu/2configs/save-diskspace.nix>
../2configs/hw/CAC.nix <stockholm/makefu/2configs/hw/CAC.nix>
../2configs/fs/CAC-CentOS-7-64bit.nix <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/torrent.nix <stockholm/makefu/2configs/torrent.nix>
]; ];

3
makefu/1systems/shoney/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="shoney";
}

16
makefu/1systems/studio/config.nix
View File

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
../. <stockholm/makefu>
../2configs/vncserver.nix <stockholm/makefu/2configs/vncserver.nix>
../2configs/vim.nix <stockholm/makefu/2configs/vim.nix>
../2configs/disable_v6.nix <stockholm/makefu/2configs/disable_v6.nix>
../2configs/audio/jack-on-pulse.nix <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
../2configs/audio/realtime-audio.nix <stockholm/makefu/2configs/audio/realtime-audio.nix>
../2configs/gui/studio.nix <stockholm/makefu/2configs/gui/studio.nix>
../2configs/binary-cache/lass.nix <stockholm/makefu/2configs/binary-cache/lass.nix>
]; ];
makefu.gui.user = "user"; # we use an extra user makefu.gui.user = "user"; # we use an extra user

3
makefu/1systems/studio/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="studio";
}

18
makefu/1systems/tsp/config.nix
View File

@ -6,18 +6,18 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
../2configs/gui/base.nix <stockholm/makefu/2configs/gui/base.nix>
../2configs/fs/sda-crypto-root.nix <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
# hardware specifics are in here # hardware specifics are in here
../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix <stockholm/makefu/2configs/hw/tp-x200.nix #< imports tp-x2x0.nix>
../2configs/disable_v6.nix <stockholm/makefu/2configs/disable_v6.nix>
../2configs/rad1o.nix <stockholm/makefu/2configs/rad1o.nix>
../2configs/zsh-user.nix <stockholm/makefu/2configs/zsh-user.nix>
../2configs/exim-retiolum.nix <stockholm/makefu/2configs/exim-retiolum.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
]; ];
# not working in vm # not working in vm
krebs.build.host = config.krebs.hosts.tsp; krebs.build.host = config.krebs.hosts.tsp;

3
makefu/1systems/tsp/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="tsp";
}

22
makefu/1systems/vbob/config.nix
View File

@ -4,24 +4,24 @@
makefu.awesome.modkey = "Mod1"; makefu.awesome.modkey = "Mod1";
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
../2configs/main-laptop.nix #< base-gui <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
../2configs/sshd-totp.nix <stockholm/makefu/2configs/sshd-totp.nix>
# Tools # Tools
../2configs/tools/core.nix <stockholm/makefu/2configs/tools/core.nix>
../2configs/tools/core-gui.nix <stockholm/makefu/2configs/tools/core-gui.nix>
../2configs/tools/dev.nix <stockholm/makefu/2configs/tools/dev.nix>
../2configs/tools/extra-gui.nix <stockholm/makefu/2configs/tools/extra-gui.nix>
../2configs/tools/sec.nix <stockholm/makefu/2configs/tools/sec.nix>
# environment # environment
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/audio/jack-on-pulse.nix <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
../2configs/audio/realtime-audio.nix <stockholm/makefu/2configs/audio/realtime-audio.nix>
]; ];
networking.extraHosts = import (toString <secrets/extra-hosts.nix>); networking.extraHosts = import (toString <secrets/extra-hosts.nix>);

3
makefu/1systems/vbob/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="vbob";
}

32
makefu/1systems/wbob/config.nix
View File

@ -7,23 +7,23 @@ in {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
../. <stockholm/makefu>
../2configs/zsh-user.nix <stockholm/makefu/2configs/zsh-user.nix>
../2configs/tools/core.nix <stockholm/makefu/2configs/tools/core.nix>
../2configs/tools/core-gui.nix <stockholm/makefu/2configs/tools/core-gui.nix>
../2configs/tools/extra-gui.nix <stockholm/makefu/2configs/tools/extra-gui.nix>
../2configs/tools/media.nix <stockholm/makefu/2configs/tools/media.nix>
../2configs/virtualization.nix <stockholm/makefu/2configs/virtualization.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
../2configs/mqtt.nix <stockholm/makefu/2configs/mqtt.nix>
../2configs/deployment/led-fader.nix <stockholm/makefu/2configs/deployment/led-fader.nix>
# ../2configs/gui/wbob-kiosk.nix # <stockholm/makefu/2configs/gui/wbob-kiosk.nix>
../2configs/stats/client.nix <stockholm/makefu/2configs/stats/client.nix>
../2configs/gui/studio.nix <stockholm/makefu/2configs/gui/studio.nix>
../2configs/audio/jack-on-pulse.nix <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
../2configs/audio/realtime-audio.nix <stockholm/makefu/2configs/audio/realtime-audio.nix>
../2configs/vncserver.nix <stockholm/makefu/2configs/vncserver.nix>
]; ];
krebs = { krebs = {

3
makefu/1systems/wbob/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="wbob";
}

24
makefu/1systems/wry/config.nix
View File

@ -7,26 +7,26 @@ let
internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr; internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
in { in {
imports = [ imports = [
../. <stockholm/makefu>
# TODO: copy this config or move to krebs # TODO: copy this config or move to krebs
../2configs/hw/CAC.nix <stockholm/makefu/2configs/hw/CAC.nix>
../2configs/fs/CAC-CentOS-7-64bit.nix <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
../2configs/save-diskspace.nix <stockholm/makefu/2configs/save-diskspace.nix>
# ../2configs/bepasty-dual.nix # <stockholm/makefu/2configs/bepasty-dual.nix>
../2configs/iodined.nix <stockholm/makefu/2configs/iodined.nix>
../2configs/backup.nix <stockholm/makefu/2configs/backup.nix>
# other nginx # other nginx
# ../2configs/nginx/euer.test.nix # <stockholm/makefu/2configs/nginx/euer.test.nix>
# collectd # collectd
../2configs/stats/client.nix <stockholm/makefu/2configs/stats/client.nix>
../2configs/logging/client.nix <stockholm/makefu/2configs/logging/client.nix>
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
# ../2configs/torrent.nix # <stockholm/makefu/2configs/torrent.nix>
]; ];
krebs.build.host = config.krebs.hosts.wry; krebs.build.host = config.krebs.hosts.wry;

3
makefu/1systems/wry/source.nix Normal file
View File

@ -0,0 +1,3 @@
import <stockholm/makefu/source.nix> {
name="wry";
}

70
makefu/1systems/x/config.nix
View File

@ -7,61 +7,61 @@ with import <stockholm/lib>;
{ {
imports = imports =
[ # base [ # base
../. <stockholm/makefu>
../2configs/main-laptop.nix <stockholm/makefu/2configs/main-laptop.nix>
../2configs/extra-fonts.nix <stockholm/makefu/2configs/extra-fonts.nix>
../2configs/tools/all.nix <stockholm/makefu/2configs/tools/all.nix>
../2configs/laptop-backup.nix <stockholm/makefu/2configs/laptop-backup.nix>
../2configs/dnscrypt.nix <stockholm/makefu/2configs/dnscrypt.nix>
../2configs/avahi.nix <stockholm/makefu/2configs/avahi.nix>
# Debugging # Debugging
# ../2configs/disable_v6.nix # <stockholm/makefu/2configs/disable_v6.nix>
# Testing # Testing
# ../2configs/lanparty/lancache.nix # <stockholm/makefu/2configs/lanparty/lancache.nix>
# ../2configs/lanparty/lancache-dns.nix # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
# ../2configs/deployment/dirctator.nix # <stockholm/makefu/2configs/deployment/dirctator.nix>
# ../2configs/vncserver.nix # <stockholm/makefu/2configs/vncserver.nix>
# ../2configs/deployment/led-fader # <stockholm/makefu/2configs/deployment/led-fader>
# ../2configs/deployment/hound # <stockholm/makefu/2configs/deployment/hound>
# development # development
../2configs/sources <stockholm/makefu/2configs/sources>
# Krebs # Krebs
../2configs/tinc/retiolum.nix <stockholm/makefu/2configs/tinc/retiolum.nix>
# applications # applications
../2configs/exim-retiolum.nix <stockholm/makefu/2configs/exim-retiolum.nix>
../2configs/mail-client.nix <stockholm/makefu/2configs/mail-client.nix>
../2configs/printer.nix <stockholm/makefu/2configs/printer.nix>
../2configs/task-client.nix <stockholm/makefu/2configs/task-client.nix>
# Virtualization # Virtualization
../2configs/virtualization.nix <stockholm/makefu/2configs/virtualization.nix>
../2configs/docker.nix <stockholm/makefu/2configs/docker.nix>
../2configs/virtualization-virtualbox.nix <stockholm/makefu/2configs/virtualization-virtualbox.nix>
# Services # Services
../2configs/git/brain-retiolum.nix <stockholm/makefu/2configs/git/brain-retiolum.nix>
../2configs/tor.nix <stockholm/makefu/2configs/tor.nix>
../2configs/steam.nix <stockholm/makefu/2configs/steam.nix>
# ../2configs/buildbot-standalone.nix # <stockholm/makefu/2configs/buildbot-standalone.nix>
# Hardware # Hardware
../2configs/hw/tp-x230.nix <stockholm/makefu/2configs/hw/tp-x230.nix>
../2configs/hw/rtl8812au.nix <stockholm/makefu/2configs/hw/rtl8812au.nix>
../2configs/hw/exfat-nofuse.nix <stockholm/makefu/2configs/hw/exfat-nofuse.nix>
../2configs/hw/wwan.nix <stockholm/makefu/2configs/hw/wwan.nix>
# ../2configs/hw/stk1160.nix # <stockholm/makefu/2configs/hw/stk1160.nix>
# ../2configs/rad1o.nix # <stockholm/makefu/2configs/rad1o.nix>
# Filesystem # Filesystem
../2configs/fs/sda-crypto-root-home.nix <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
# Security # Security
../2configs/sshd-totp.nix <stockholm/makefu/2configs/sshd-totp.nix>
]; ];

4
makefu/1systems/x/source.nix Normal file
View File

@ -0,0 +1,4 @@
import <stockholm/makefu/source.nix> {
name="x";
full = true;
}

41
makefu/source.nix
View File

@ -1,29 +1,38 @@
with import <stockholm/lib>; with import <stockholm/lib>;
host@{ name, secure ? false, override ? {} }: let host@{ name, secure ? false, override ? {}, full ? false }: let
builder = if getEnv "dummy_secrets" == "true" builder = if getEnv "dummy_secrets" == "true"
then "buildbot" then "buildbot"
else "tv"; else "makefu";
_file = <stockholm> + "/tv/1systems/${name}/source.nix"; _file = <stockholm> + "/makefu/1systems/${name}/source.nix";
ref = "06734d1"; # unstable @ 2017-07-03 + graceful requests2 (a772c3aa)
in in
evalSource (toString _file) [ evalSource (toString _file) [
{ {
nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; nixos-config.symlink = "stockholm/makefu/1systems/${name}/config.nix";
nixpkgs.git = { # always perform a full populate when buildbot
# nixos-17.03 nixpkgs = if full || (builder == "buildbot" ) then {
ref = mkDefault "94941cb0455bfc50b1bf63186cfad7136d629f78"; git = {
url = https://github.com/NixOS/nixpkgs; url = https://github.com/makefu/nixpkgs;
}; inherit ref;
};
} else {
# TODO use http, once it is implemented
# right now it is simply extracted revision folder
## prepare so we do not have to wait for rsync:
## cd /var/src; curl https://github.com/nixos/nixpkgs/tarball/125ffff -L | tar zx && mv NixOS-nixpkgs-125ffff nixpkgs
file = "/home/makefu/store/${ref}";
};
secrets.file = getAttr builder { secrets.file = getAttr builder {
buildbot = toString <stockholm/tv/dummy_secrets>; buildbot = toString <stockholm/makefu/6tests/data/secrets>;
tv = "/home/tv/secrets/${name}"; makefu = "/home/makefu/secrets/${name}";
}; };
stockholm.file = toString <stockholm>; stockholm.file = toString <stockholm>;
} }
(mkIf (builder == "tv") { (mkIf (builder == "makefu") {
secrets-common.file = "/home/tv/secrets/common"; secrets-common.file = "/home/makefu/secrets/common";
})
(mkIf (builder == "tv" && secure) {
secrets-master.file = "/home/tv/secrets/master";
}) })
override override
] ]