switch to lorri from nixpkgs

home/home.nix

@@ -5,7 +5,6 @@ with pkgs;
 let
   unstable = import <nixos-unstable> {};
   mybrowser = firefox;
-  lorri = import (fetchTarball { url = "https://github.com/target/lorri/archive/rolling-release.tar.gz"; }) {};
   pypi2nix = import (
     pkgs.fetchgit {
       url = "https://github.com/nix-community/pypi2nix";
@@ -43,7 +42,7 @@ let
     wire-desktop
     gpx-viewer
     gpxsee
-    cawbird
+    unstable.cawbird
     tootle
     subsurface
     (
@@ -85,7 +84,7 @@ let
     musescore
     audacity
     avidemux
-    linphone
+    #linphone
     picard
     soundkonverter
   ];
@@ -317,48 +316,6 @@ in
     terminal = "screen-256color";
   };
 
-  # lorri daemon service
+  services.lorri.enable = true;
-  systemd.user = with lib; {
-    services.lorri = {
-      Unit = {
-        Description = "Lorri build daemon";
-        Documentation = "https://github.com/target/lorri";
-        ConditionUser = "!@system";
-        Requires = "lorri.socket";
-        After = "lorri.socket";
-        RefuseManualStart = true;
-      };
-
-      Service = {
-        ExecStart = "${lorri}/bin/lorri daemon";
-        PrivateTmp = true;
-        ProtectSystem = "strict";
-        WorkingDirectory = "%h";
-        Restart = "on-failure";
-        Environment =
-          let
-            path = with pkgs; makeSearchPath "bin" [ nix gnutar git mercurial ];
-          in
-            concatStringsSep " " [
-              "PATH=${path}"
-              "RUST_BACKTRACE=1"
-            ];
-      };
-    };
-
-    sockets.lorri = {
-      Unit = {
-        Description = "Socket for lorri build daemon";
-      };
-
-      Socket = {
-        ListenStream = "%t/lorri/daemon.socket";
-      };
-
-      Install = {
-        WantedBy = [ "sockets.target" ];
-      };
-    };
-  };
 
 }