From cb3d1da6c94ce75e6b37dfa4d5b478feef5df272 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Thu, 5 Mar 2020 14:48:47 +0000
Subject: [PATCH] Support lorri with home-manager

Prefer starting lorri with home-manager.

Note: I could have removed the `systemctl --user start lorri.service` line
before switching to home-manager by calling `systemctl --user enable
lorri.service`. This would have made a symlink in
`~/.config/systemd/user/default.target.wants`.
---
 configs/shared/.config/nixpkgs/home.nix           |  2 ++
 configs/shared/.config/systemd/user/lorri.service | 12 ------------
 configs/shared/.config/systemd/user/lorri.socket  |  9 ---------
 configs/shared/.profile                           |  3 ---
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 configs/shared/.config/systemd/user/lorri.service
 delete mode 100644 configs/shared/.config/systemd/user/lorri.socket

diff --git a/configs/shared/.config/nixpkgs/home.nix b/configs/shared/.config/nixpkgs/home.nix
index f87b0dfb7..2c6266c7a 100644
--- a/configs/shared/.config/nixpkgs/home.nix
+++ b/configs/shared/.config/nixpkgs/home.nix
@@ -60,4 +60,6 @@
   ##############################################################################
   # Services
   ##############################################################################
+
+  services.lorri.enable = true;
 }
diff --git a/configs/shared/.config/systemd/user/lorri.service b/configs/shared/.config/systemd/user/lorri.service
deleted file mode 100644
index a72646813..000000000
--- a/configs/shared/.config/systemd/user/lorri.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-ConditionUser=!@system
-Description=Lorri build daemon
-After=lorri.socket
-Wants=lorri.socket
-
-[Service]
-ExecStart=%h/.nix-profile/bin/lorri daemon
-PrivateTmp=true
-ProtectSystem=strict
-Restart=on-failure
-WorkingDirectory=%h
\ No newline at end of file
diff --git a/configs/shared/.config/systemd/user/lorri.socket b/configs/shared/.config/systemd/user/lorri.socket
deleted file mode 100644
index b752fa0fa..000000000
--- a/configs/shared/.config/systemd/user/lorri.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Lorri build daemon
-
-[Socket]
-ListenStream=%t/lorri/daemon.socket
-RuntimeDirectory=lorri
-
-[Install]
-WantedBy=sockets.target
\ No newline at end of file
diff --git a/configs/shared/.profile b/configs/shared/.profile
index 32a0d13bf..b442aea27 100644
--- a/configs/shared/.profile
+++ b/configs/shared/.profile
@@ -44,9 +44,6 @@ eval "$(ssh-agent -s)"
 # TODO: Prefer `systemctl start docker.service`
 dockerd &
 
-# Start lorri
-systemctl --user start lorri.service
-
 # Set environment variables for Nix. Don't run this for systems running NixOS.
 # TODO: Learn why I can't use the variables from ~/briefcase/.envrc.
 case $(hostname) in