From 1f00fccff1dad5ccf5b4d9e89368581b99a0ca62 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 30 Oct 2017 13:28:58 +0100
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hel.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/hel.nix b/hel.nix
index 35df46cb..4904b510 100644
--- a/hel.nix
+++ b/hel.nix
@@ -39,6 +39,12 @@
 
   systemd.services.ModemManager.enable = true;
 
+  services.gpsd = {
+    enable = true;
+    device = "/dev/serial/by-path/pci-0000:00:14.0-usb-0:2:1.2-port0";
+    readonly = false;
+  };
+
   powerManagement.enable = true;
 
   i18n = {
@@ -238,19 +244,6 @@
       '';
     };
 
-    udev.extraRules = ''
-      # Disallow ModemManager from touching Sierra Wireless EM7455 tty ports
-      SUBSYSTEM=="tty", \
-      ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", \
-        ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"
-    '';
-
-    services.gpsd = {
-      enable = true;
-      device = "/dev/serial/by-path/pci-0000:00:14.0-usb-0:2:1.2-port0";
-      readonly = false;
-    };
-
     printing = {
       enable = true;
       drivers = with pkgs; [ samsung-unified-linux-driver ];
@@ -479,6 +472,9 @@
   services.udev.extraRules = with pkgs; ''
     SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="0", RUN+="${systemd}/bin/systemctl --no-block stop ac-plugged.service"
     SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="${systemd}/bin/systemctl --no-block start ac-plugged.service"
+
+    # Disallow ModemManager from touching Sierra Wireless EM7455 tty ports
+    SUBSYSTEM=="tty", ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"
   '';
 }
 
-- 
cgit v1.2.3