Merge branch 'master' of prism:stockholm

2 files changed, 37 insertions, 8 deletions

diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix
new file mode 100644
index 000000000..7e29849b1
--- /dev/null
+++ b/makefu/2configs/hw/network-manager.nix
@@ -0,0 +1,37 @@
+{ pkgs, lib, ... }:
+{
+  users.users.makefu = {
+    extraGroups = [ "networkmanager" ];
+    packages = with pkgs;[
+      networkmanagerapplet
+      gnome3.gnome_keyring gnome3.dconf
+    ];
+  };
+  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.enable = true;
+
+  # TODO: put somewhere else
+  services.xserver.displayManager.sessionCommands = ''
+    ${pkgs.clipit}/bin/clipit &
+    ${pkgs.networkmanagerapplet}/bin/nm-applet &
+    '';
+
+# nixOSUnstable
+# networking.networkmanager.wifi = {
+#   powersave = true;
+#   scanRandMacAddress = true;
+# };
+}
diff --git a/makefu/2configs/hw/wwan.nix b/makefu/2configs/hw/wwan.nix
deleted file mode 100644
index 0eb0c97d7..000000000
--- a/makefu/2configs/hw/wwan.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-_:
-
-{
-  makefu.umts = {
-    enable = true;
-    modem-device = "/dev/serial/by-id/usb-Lenovo_H5321_gw_2D5A51BA0D3C3A90-if01";
-  };
-}