Skip to content

Commit

Permalink
Merge pull request #222 from tricktron/lorri
Browse files Browse the repository at this point in the history
Adds Lorri module
  • Loading branch information
LnL7 authored Sep 12, 2020
2 parents 28079f6 + 1dbe3b7 commit 62c14a1
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 0 deletions.
1 change: 1 addition & 0 deletions modules/module-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
./services/emacs.nix
./services/khd
./services/kwm
./services/lorri.nix
./services/mail/offlineimap.nix
./services/mopidy.nix
./services/nix-daemon.nix
Expand Down
46 changes: 46 additions & 0 deletions modules/services/lorri.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{ config, lib, pkgs, ... }:

with lib;

let
cfg = config.services.lorri;
in
{
options = {
services.lorri = {
enable = mkOption {
type = types.bool;
default = false;
description = "Whether to enable the lorri service.";
};

logFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/tmp/lorri.log";
description = ''
The logfile to use for the lorri service. Alternatively
<command>sudo launchctl debug system/org.nixos.lorri --stderr</command>
can be used to stream the logs to a shell after restarting the service with
<command>sudo launchctl kickstart -k system/org.nixos.lorri</command>.
'';
};
};
};

config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.lorri ];
launchd.user.agents.lorri = {
command = with pkgs; "${lorri}/bin/lorri daemon";
path = with pkgs; [ nix ];
serviceConfig = {
KeepAlive = true;
RunAtLoad = true;
ProcessType = "Background";
StandardOutPath = cfg.logFile;
StandardErrorPath = cfg.logFile;
EnvironmentVariables = { NIX_PATH = "nixpkgs=" + toString pkgs.path; };
};
};
};
}
1 change: 1 addition & 0 deletions release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ let
tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
tests.services-activate-system-changed-label-prefix = makeTest ./tests/services-activate-system-changed-label-prefix.nix;
tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
tests.services-lorri = makeTest ./tests/services-lorri.nix;
tests.services-nix-daemon = makeTest ./tests/services-nix-daemon.nix;
tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix;
tests.services-dnsmasq = makeTest ./tests/services-dnsmasq.nix;
Expand Down
35 changes: 35 additions & 0 deletions tests/services-lorri.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ config, pkgs, ... }:

let
lorri = pkgs.runCommand "lorri-0.0.0" {} "mkdir $out";
plistPath = "${config.out}/user/Library/LaunchAgents/org.nixos.lorri.plist";
actual = pkgs.runCommand "convert-plist-to-json" { buildInputs = [ pkgs.xcbuild ]; }
"plutil -convert json -o $out ${plistPath}";
actualJson = builtins.fromJSON (builtins.readFile "${actual.out}");
expectedJson = builtins.fromJSON ''
{
"EnvironmentVariables": {
"NIX_PATH": "${"nixpkgs="+ toString pkgs.path}",
"PATH": "${builtins.unsafeDiscardStringContext pkgs.nix}/bin"
},
"KeepAlive": true,
"Label": "org.nixos.lorri",
"ProcessType": "Background",
"ProgramArguments": [
"/bin/sh",
"-c",
"exec ${builtins.unsafeDiscardStringContext pkgs.lorri}/bin/lorri daemon"
],
"RunAtLoad": true
}
'';
testResult = toString (actualJson == expectedJson);
in
{
services.lorri.enable = true;
test = ''
${pkgs.xcbuild}/bin/plutil -lint ${plistPath}
[ ${testResult} ];
'';
}

0 comments on commit 62c14a1

Please sign in to comment.