about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-10-20 18:50:26 +0200
committeraszlig <aszlig@redmoonstudios.org>2013-10-20 18:50:26 +0200
commit956ad0a275e7d2f5813e23b8c7ec5cb0bdce9161 (patch)
tree9145dfc7f4f67185dbaf21e44ef932e69804e26a /machines
parent66516858b6dd6e4063ed65f91734b68b8e89da70 (diff)
Use synergy module instead of sessionCommands.
Haven't noticed that we already have a service module for synergy, so
let's use it instead of just executing the client/server on X session
initialization.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/dnyarri.nix7
-rw-r--r--machines/mmrnmhrm.nix8
2 files changed, 6 insertions, 9 deletions
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index 254ba557..a2f5001a 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -125,13 +125,12 @@ with import ../lib;
   # should there be another user accessing the audio devices.
   users.extraUsers.aszlig.extraGroups = [ "audio" ];
 
+  services.synergy.client.enable = true;
+  services.synergy.client.serverAddress = "mmrnmhrm";
+
   services.xserver = {
     videoDrivers = [ "ati" ];
 
     xrandrHeads = [ "HDMI-0" "DVI-0" ];
-
-    displayManager.sessionCommands = ''
-      ${pkgs.synergy}/bin/synergyc mmrnmhrm
-    '';
   };
 }
diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix
index f52a3a25..f8412c0a 100644
--- a/machines/mmrnmhrm.nix
+++ b/machines/mmrnmhrm.nix
@@ -41,13 +41,11 @@ with import ../lib;
     label = "swap";
   };
 
+  services.synergy.server.enable = true;
+  services.synergy.server.configFile = ../cfgfiles/synergy.conf;
+
   services.xserver = {
     videoDrivers = [ "nouveau" ];
-
     xrandrHeads = [ "DVI-I-2" "DVI-I-1" ];
-
-    displayManager.sessionCommands = ''
-      ${pkgs.synergy}/bin/synergys -c "${../cfgfiles/synergy.conf}"
-    '';
   };
 }