summaryrefslogtreecommitdiffstats
path: root/lass/1systems/mors
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
committermakefu <github@syntax-fehler.de>2017-09-04 09:05:06 +0200
commit729549d15464e57e41fd143450c36274cedc84fa (patch)
treec28cfa3576c601f7f665cebc7721ef3a08311792 /lass/1systems/mors
parent848acb85ccecbe25987bf6da45a96fc4eaaa74e9 (diff)
parentfcf59a00e2ab675cb171cbe4f21b8df73836d144 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems/mors')
-rw-r--r--lass/1systems/mors/config.nix27
1 files changed, 8 insertions, 19 deletions
diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 2cb6a7519..4d2f8b0f8 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
imports = [
<stockholm/lass>
<stockholm/lass/2configs/hw/x220.nix>
- <stockholm/lass/2configs/boot/coreboot.nix>
+ <stockholm/lass/2configs/boot/stock-x220.nix>
<stockholm/lass/2configs/mouse.nix>
<stockholm/lass/2configs/retiolum.nix>
@@ -24,10 +24,11 @@ with import <stockholm/lib>;
<stockholm/lass/2configs/fetchWallpaper.nix>
<stockholm/lass/2configs/mail.nix>
<stockholm/lass/2configs/repo-sync.nix>
- <stockholm/lass/2configs/ircd.nix>
+ <stockholm/krebs/2configs/ircd.nix>
<stockholm/lass/2configs/logf.nix>
<stockholm/lass/2configs/syncthing.nix>
<stockholm/lass/2configs/otp-ssh.nix>
+ <stockholm/lass/2configs/c-base.nix>
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [
@@ -35,20 +36,6 @@ with import <stockholm/lib>;
];
}
{
- services.elasticsearch = {
- enable = true;
- };
- }
- {
- #zalando project
- services.postgresql = {
- enable = true;
- package = pkgs.postgresql;
- };
- virtualisation.docker.enable = true;
- #users.users.mainUser.extraGroups = [ "docker" ];
- }
- {
lass.umts = {
enable = true;
modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_C12AD95CB7B78F90-if09";
@@ -91,6 +78,9 @@ with import <stockholm/lib>;
client.enable = true;
};
}
+ {
+ services.mongodb.enable = true;
+ }
];
krebs.build.host = config.krebs.hosts.mors;
@@ -104,8 +94,8 @@ with import <stockholm/lib>;
};
services.udev.extraRules = ''
- SUBSYSTEM=="net", ATTR{address}=="08:11:96:0a:5d:6c", NAME="wl0"
- SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:71:cb:35", NAME="et0"
+ SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0"
+ SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0"
'';
#TODO activationScripts seem broken, fix them!
@@ -139,7 +129,6 @@ with import <stockholm/lib>;
urban
mk_sql_pair
remmina
- thunderbird
iodine