4 files changed, 2 insertions, 24 deletions
diff --git a/configs/shared/.config/nixpkgs/home.nix b/configs/shared/.config/nixpkgs/home.nix
index f87b0dfb7cfb..2c6266c7a239 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 a72646813a66..000000000000
--- 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 b752fa0fa5d6..000000000000
--- 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 32a0d13bf434..b442aea27936 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