Compare commits

..

No commits in common. "d8a70620e46887fccdfb62730a5e62a71e221612" and "68683fba28c094ec19e283a2229df0faef9401a1" have entirely different histories.

3 changed files with 0 additions and 53 deletions

View File

@ -59,7 +59,6 @@
profile.workstation.enable = true;
common.remoteAccess.enable = true;
hardware.opengl.enable = true;
hardware.gps.enable = true;
packageSets = {
gaming.enable = true;
fun.enable = true;
@ -125,9 +124,6 @@
settings.reboot-for-bitlocker = true;
};
# GPS data from my phone
services.gpsd.devices = lib.mkIf config.nixfiles.hardware.gps.enable [ "tcp://pixel.magpie-moth.ts.net:6000" ];
# systemd power/suspend configuration
systemd.targets = lib.genAttrs ["suspend" "hybrid-sleep" "suspend-then-hibernate"] (_: {
enable = false;

View File

@ -6,6 +6,5 @@
./opengl.nix
./sound.nix
./binfmt.nix
./gps.nix
];
}

View File

@ -1,48 +0,0 @@
{ config, lib, pkgs, ... }:
let
cfg = config.nixfiles.hardware.gps;
in
{
options = {
nixfiles.hardware.gps = {
enable = lib.mkEnableOption "GPS configuration";
gpsdBridge = lib.mkOption {
description = "Whether to enable bridging of gpsd data to Geoclue2";
default = true;
example = false;
type = lib.types.bool;
};
};
};
config = lib.mkIf cfg.enable {
services.geoclue2 = {
enable = true;
};
environment.etc."geoclue/conf.d/00-nmea-socket.conf".text = lib.mkIf cfg.gpsdBridge ''
[network-nmea]
enable=true
nmea-socket=/run/gpsd-nmea/nmea.sock
'';
# this could probably be a systemd socket but i don't know how to make those
systemd.services.gpsd-nmea-bridge = lib.mkIf cfg.gpsdBridge {
path = with pkgs; [
gpsd
coreutils
socat
];
description = "gpsd to Geoclue2 GPS data bridge";
before = [ "geoclue.service" ];
wantedBy = [ "geoclue.service" "multi-user.target" ];
serviceConfig = {
RuntimeDirectory = "gpsd-nmea";
ExecStart = pkgs.writeShellScript "gpsd-nmea-bridge" "
exec socat -U UNIX-LISTEN:\${RUNTIME_DIRECTORY}/nmea.sock,fork,reuseaddr,mode=777 SYSTEM:'gpspipe -Br | stdbuf -oL tail -n+4'
";
};
};
services.gpsd.enable = lib.mkIf cfg.gpsdBridge true;
};
}