summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-10-30 13:26:59 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-10-30 13:26:59 +0100
commitbd53caf1ac5e1caf035d2773836e6eef7fbd5fb1 (patch)
treefff4f87fd403a7059ea9441e725afa9a11c54277
parent554328a659dc9e086c31ace766aaac1b961e8a68 (diff)
downloadnixos-bd53caf1ac5e1caf035d2773836e6eef7fbd5fb1.tar
nixos-bd53caf1ac5e1caf035d2773836e6eef7fbd5fb1.tar.gz
nixos-bd53caf1ac5e1caf035d2773836e6eef7fbd5fb1.tar.bz2
nixos-bd53caf1ac5e1caf035d2773836e6eef7fbd5fb1.tar.xz
nixos-bd53caf1ac5e1caf035d2773836e6eef7fbd5fb1.zip
GPS on hel?
-rw-r--r--hel.nix66
1 files changed, 12 insertions, 54 deletions
diff --git a/hel.nix b/hel.nix
index 4a3b6606..35df46cb 100644
--- a/hel.nix
+++ b/hel.nix
@@ -92,29 +92,6 @@
92 }); 92 });
93 }; 93 };
94 94
95 # nixpkgs.config.packageOverrides = pkgs: rec {
96 # libqmi = pkgs.stdenv.lib.overrideDerivation pkgs.libqmi (old: {
97 # src = pkgs.fetchgit {
98 # url = "git://anongit.freedesktop.org/libqmi";
99 # rev = "7a426340c9238f743b4641096ea86b89dd503041";
100 # sha256 = "1lnr049hjakp864kq2lql04nfraaxgfh88rjayc7a7x993s75fzs";
101 # };
102
103 # buildInputs = old.buildInputs ++ (with pkgs; [ libmbim automake114x ]);
104 # });
105 # libmbim = pkgs.stdenv.lib.overrideDerivation pkgs.libmbim (old: {
106 # src = pkgs.fetchgit {
107 # url = "git://anongit.freedesktop.org/libmbim/libmbim";
108 # rev = "c5ed53cfabc0d7ba20dea1047db718f2ca0a6d80";
109 # sha256 = "07fy120703rwpf7p0d8fdbrswx9jn1ln8wnnn7zkwwjq9mgr6ppp";
110 # };
111
112 # buildInputs = old.buildInputs ++ (with pkgs; [ autoconf automake gnome.gtkdoc libtool pkgconfig ]);
113
114 # preConfigure = "./autogen.sh";
115 # });
116 # };
117
118 nixpkgs.config.allowUnfree = true; 95 nixpkgs.config.allowUnfree = true;
119 96
120 services = { 97 services = {
@@ -261,37 +238,18 @@
261 ''; 238 '';
262 }; 239 };
263 240
264 # udev.extraRules = '' 241 udev.extraRules = ''
265 # ACTION!="add|change", GOTO="mbim_to_qmi_rules_end" 242 # Disallow ModemManager from touching Sierra Wireless EM7455 tty ports
266 # SUBSYSTEM!="usb|drivers", GOTO="mbim_to_qmi_rules_end" 243 SUBSYSTEM=="tty", \
267 244 ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", \
268 # # load qmi_wwan module 245 ENV{ID_MM_DEVICE_MANUAL_SCAN_ONLY}="1"
269 # SUBSYSTEM=="usb", \ 246 '';
270 # ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", \ 247
271 # RUN+="/sbin/modprobe -b qmi_wwan" 248 services.gpsd = {
272 249 enable = true;
273 # # force Sierra Wireless EM7455 to configuration #1 250 device = "/dev/serial/by-path/pci-0000:00:14.0-usb-0:2:1.2-port0";
274 # SUBSYSTEM=="usb", \ 251 readonly = false;
275 # ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", \ 252 };
276 # ATTR{bConfigurationValue}="1"
277
278 # # add the new id in the qmi_wwan driver
279 # SUBSYSTEM=="drivers", \
280 # ENV{DEVPATH}=="/bus/usb/drivers/qmi_wwan", \
281 # ATTR{new_id}="1199 9079"
282
283 # # load qcserial module
284 # SUBSYSTEM=="usb", \
285 # ATTR{idVendor}=="1199", ATTR{idProduct}=="9079", \
286 # RUN+="/sbin/modprobe -b qcserial"
287
288 # # add the new id in the qcserial driver
289 # SUBSYSTEM=="drivers", \
290 # ENV{DEVPATH}=="/bus/usb-serial/drivers/qcserial", \
291 # ATTR{new_id}="1199 9079"
292
293 # LABEL="mbim_to_qmi_rules_end"
294 # '';
295 253
296 printing = { 254 printing = {
297 enable = true; 255 enable = true;