From 5e1ad35657c05f409a29ddc7a29501fc611111b0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 8 Dec 2015 12:29:46 +0100
Subject: services/vlock: Only include socket when enabled.

Just stumbled over this... even systems that do not define
vuizvui.user.aszlig.services.vlock.enable accidentally got the socket
file, which now is no longer the case.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/services/vlock/default.nix | 44 ++++++++++++++------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'modules/user')

diff --git a/modules/user/aszlig/services/vlock/default.nix b/modules/user/aszlig/services/vlock/default.nix
index 5eb5e83d..b7bb051b 100644
--- a/modules/user/aszlig/services/vlock/default.nix
+++ b/modules/user/aszlig/services/vlock/default.nix
@@ -30,26 +30,28 @@ in {
     enable = lib.mkEnableOption "console lock";
   };
 
-  config.systemd.sockets.vlock = {
-    description = "Console Lock Socket";
-    wantedBy = [ "sockets.target" ];
-    socketConfig.ListenStream = "/run/console-lock.sock";
-    socketConfig.Accept = true;
-  };
-
-  config.systemd.services."vlock@" = lib.mkIf cfg.enable {
-    description = "Lock All Consoles";
-    serviceConfig.Type = "oneshot";
-
-    #environment.USER = "%i"; XXX
-    environment.USER = "aszlig";
-
-    script = ''
-      retval=0
-      oldvt="$("${pkgs.kbd}/bin/fgconsole")"
-      "${vlock}/bin/vlock" -asn || retval=$?
-      if [ $retval -ne 0 ]; then "${pkgs.kbd}/bin/chvt" "$oldvt"; fi
-      exit $retval
-    '';
+  config = lib.mkIf cfg.enable {
+    systemd.sockets.vlock = {
+      description = "Console Lock Socket";
+      wantedBy = [ "sockets.target" ];
+      socketConfig.ListenStream = "/run/console-lock.sock";
+      socketConfig.Accept = true;
+    };
+
+    config.systemd.services."vlock@" = {
+      description = "Lock All Consoles";
+      serviceConfig.Type = "oneshot";
+
+      #environment.USER = "%i"; XXX
+      environment.USER = "aszlig";
+
+      script = ''
+        retval=0
+        oldvt="$("${pkgs.kbd}/bin/fgconsole")"
+        "${vlock}/bin/vlock" -asn || retval=$?
+        if [ $retval -ne 0 ]; then "${pkgs.kbd}/bin/chvt" "$oldvt"; fi
+        exit $retval
+      '';
+    };
   };
 }
-- 
cgit 1.4.1