summaryrefslogtreecommitdiffstats
path: root/lass/1systems
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-07-07 23:02:41 +0200
committertv <tv@krebsco.de>2016-07-07 23:02:41 +0200
commitf18ababed59c21615d6659881a01597e18e706d3 (patch)
treee379f438eb190ed76d8d4d4c28ee1adbd8ce2bb7 /lass/1systems
parent0c72da81cc58dcb68ae079901fae464249e5cec3 (diff)
parent8b829fdfa1e90635b1681ec9f466fcdc5d6e8f7e (diff)
Merge remote-tracking branch 'prism/lassulus'
Diffstat (limited to 'lass/1systems')
-rw-r--r--lass/1systems/mors.nix11
-rw-r--r--lass/1systems/uriel.nix10
2 files changed, 18 insertions, 3 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index f26f0ed5f..d065d4dfa 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -25,7 +25,6 @@
../2configs/c-base.nix
../2configs/mail.nix
../2configs/krebs-pass.nix
- ../2configs/umts.nix
../2configs/repo-sync.nix
{
#risk of rain port
@@ -54,6 +53,16 @@
# package = pkgs.postgresql;
# };
#}
+ {
+ lass.umts = {
+ enable = true;
+ modem = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09";
+ initstrings = ''
+ Init1 = AT+CFUN=1
+ Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
+ '';
+ };
+ }
];
krebs.build.host = config.krebs.hosts.mors;
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 92996c181..83553f5ca 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -16,6 +16,12 @@ with builtins;
../2configs/bitlbee.nix
../2configs/weechat.nix
../2configs/skype.nix
+ {
+ lass.umts = {
+ enable = true;
+ modem = "/dev/serial/by-id/usb-HUAWEI_Technologies_HUAWEI_Mobile-if00-port0";
+ };
+ }
];
krebs.build.host = config.krebs.hosts.uriel;
@@ -33,8 +39,8 @@ with builtins;
#loader.grub.version = 2;
#loader.grub.device = "/dev/sda";
- loader.gummiboot.enable = true;
- loader.gummiboot.timeout = 5;
+ loader.systemd-boot.enable = true;
+ loader.timeout = 5;
initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];