1 files changed, 49 insertions, 10 deletions

diff --git a/hel.nix b/hel.nix
index 64f1e60e..6d618203 100644
--- a/hel.nix
+++ b/hel.nix
@@ -19,19 +19,23 @@
 
   networking = {
     hostName = "hel";
-    wireless = {
-      enable = true;
-      userControlled = {
-        enable = true;
-        group = "network";
-      };
-    };
+    # wireless = {
+    #   enable = true;
+    #   userControlled = {
+    #     enable = true;
+    #     group = "network";
+    #   };
+    # };
 
     firewall = {
       enable = true;
       allowedTCPPorts = [ 22 # ssh
                         ];
     };
+
+    networkmanager = {
+      enable = true;
+    };
   };
 
   powerManagement.enable = true;
@@ -50,8 +54,20 @@
     shadow
     (callPackage ./custom/thinklight.nix { thinklight = "kbd_backlight"; })
     (callPackage ./utils/nix/rebuild-system.nix {})
+    libmbim libqmi
   ];
 
+  nixpkgs.config.packageOverrides = pkgs: rec {
+    libmbim = pkgs.stdenv.lib.overrideDerivation pkgs.libmbim (attrs: {
+      patches = [ ./patches/attachment-0003.patch ./patches/attachment.patch ];
+      buildInputs = attrs.buildInputs ++ [ pkgs.automake114x pkgs.autoconf ];
+    });
+    libqmi = pkgs.stdenv.lib.overrideDerivation pkgs.libqmi (attrs: {
+      patches = [ ./patches/attachment-0004.patch ./patches/attachment-0005.patch ];
+      buildInputs = attrs.buildInputs ++ [ pkgs.automake pkgs.autoconf ];
+    });
+  };
+
   services = {
     logind.extraConfig = ''
       HandleLidSwitch=suspend
@@ -107,8 +123,8 @@
       nodeName = "hel";
       remoteNodes = ["isaac" "ymir"]; # legacy name for odin
       sshUser = {
-        openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgtDHA7oDIaRwggGGznNaKZF68rFTziqefSCn1t9ZKe uucp@odin''
-                                        ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
+        openssh.authorizedKeys.keys = [ ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFH1QWdgoC03nzW5GBuCl2pqASHeIXIYtE9IInHdaKcO uucp@ymir''
+                                        ''no-port-forwarding,no-X11-forwarding,no-agent-forwarding,command="/var/setuid-wrappers/uucico" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJhACtnt9+3j2ev4QVA2QBlPtblPnu7yol2njgfMlHtC uucp@odin''
                                       ];
       };
       sshConfig = ''
@@ -119,8 +135,28 @@
           Hostname ymir.niflheim.yggdrasil
           IdentityFile ~/.ssh/ymir
       '';
-      commandPath = [];
+      commandPath = [ "${pkgs.callPackage ./hel/recv-media.nix {}}/bin" ];
       defaultCommands = [];
+      commands = {
+        "isaac" = ["recv-media"];
+      };
+    };
+    
+    postfix = {
+      enable = true;
+      enableSmtp = false;
+      setSendmail = true;
+      networksStyle = "host";
+      hostname = "hel.midgard.yggdrasil";
+      destination = [];
+      relayHost = "uucp:ymir";
+      recipientDelimiter = "+";
+      transport = ''
+        * uucp:ymir
+      '';
+      extraMasterConf = ''
+        uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/var/setuid-wrappers/uux -z -a$sender - $nexthop!rmail ($recipient)
+      '';
     };
   };
 
@@ -134,6 +170,9 @@
       media = {
         members = [ "gkleen" "uucp" ];
       };
+      networkmanager = {
+        members = [ "gkleen" ];
+      };
     };
   };