4 files changed, 35 insertions, 18 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index b3340cb31..1185be9d4 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -114,7 +114,7 @@ in {
     xkbOptions = "caps:escape";
     libinput.enable = true;
     displayManager.lightdm.enable = true;
-    windowManager.default = "xmonad";
+    displayManager.defaultSession = "none+xmonad";
     windowManager.session = [{
       name = "xmonad";
       start = ''
diff --git a/lass/2configs/network-manager.nix b/lass/2configs/network-manager.nix
index 75b9bd1fd..b41cc7ac8 100644
--- a/lass/2configs/network-manager.nix
+++ b/lass/2configs/network-manager.nix
@@ -2,18 +2,6 @@
 {
   networking.wireless.enable = lib.mkForce false;
 
-  systemd.services.modemmanager = {
-    description = "ModemManager";
-    after = [ "network-manager.service" ];
-    bindsTo = [ "network-manager.service" ];
-    wantedBy = [ "network-manager.service" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.modemmanager}/bin/ModemManager";
-      PrivateTmp = true;
-      Restart = "always";
-      RestartSec = "5";
-    };
-  };
   networking.networkmanager = {
     ethernet.macAddress = "random";
     wifi.macAddress = "random";
diff --git a/lass/2configs/ppp.nix b/lass/2configs/ppp.nix
new file mode 100644
index 000000000..9cc7568a5
--- /dev/null
+++ b/lass/2configs/ppp.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }: {
+
+  # usage: pppd call default
+
+  environment.etc."ppp/peers/default".text = ''
+    /dev/ttyACM2
+    921600
+    crtscts
+    defaultroute
+    holdoff 10
+    lock
+    maxfail 0
+    noauth
+    nodetach
+    noipdefault
+    passive
+    persist
+    usepeerdns
+    connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "default.chat" ''
+      ABORT "BUSY"
+      ABORT "NO CARRIER"
+      REPORT CONNECT
+      "" "ATDT*99#"
+      CONNECT
+    ''}"
+  '';
+
+  environment.systemPackages = [
+    pkgs.ppp
+  ];
+
+}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 901fecfb2..baeac213b 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -13,6 +13,8 @@ in {
   ];
 
   security.acme = {
+    email = "acme@lassul.us";
+    acceptTerms = true;
     certs."lassul.us" = {
       allowKeysForGroup = true;
       group = "lasscert";
@@ -72,11 +74,6 @@ in {
   security.acme.certs."cgit.lassul.us" = {
     email = "lassulus@lassul.us";
     webroot = "/var/lib/acme/acme-challenge";
-    plugins = [
-      "account_key.json"
-      "fullchain.pem"
-      "key.pem"
-    ];
     group = "nginx";
     user = "nginx";
   };