fix services not being overwritten; fix synergy

bketelsen · Sep 3, 2020 · 2088dcf · 2088dcf
1 parent 89f8cf3
commit 2088dcf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/nix/home-manager/machines/linux-desktop.nix b/nix/home-manager/machines/linux-desktop.nix
@@ -16,7 +16,7 @@
     ./modules/communication
     ./modules/terminal
     ./modules/development
-    ./modules/desktop/gnome.nix
+    #./modules/desktop/synergy.nix
     ./modules/desktop/vscode.nix
     ./modules/web-browsers
     ./modules/emacs

diff --git a/nix/nixos/install.sh b/nix/nixos/install.sh
@@ -3,7 +3,7 @@
 set -e
 
 echo Removing Old Configs...
-sudo rm -rf /etc/nixos/{overlays,modules,packages}
+sudo rm -rf /etc/nixos/{overlays,modules,packages,services}
 
 echo Copying Modules...
 sudo cp -r ./modules /etc/nixos/

diff --git a/nix/nixos/services/synergy.nix b/nix/nixos/services/synergy.nix
@@ -1,27 +1,26 @@
 { pkgs, ... }:
 
 {
-  services.synergy = {
-    server.enable = true;	
-    server.autoStart = true;
-    server.address = "0.0.0.0";
-    server.screenName = "galactica";
-    server.configFile = pkgs.writeTextFile {
-      name = "synergy.conf";
-      text = ''
-        section: screens
-          	galactica:
-        	caprica:
-        end
-        section: links
-        	galactica:
-        		left = caprica
+
+  environment.etc."synergy-server.conf" = { text = ''
+	section: screens
+		galactica:
+		caprica:
+	end
+	section: links
 		caprica:
 			right = galactica
-        end
-      '';
+		galactica:
+			left = caprica
+	end
+  ''; };
+
+    services.synergy.server = {
+      enable = true;
+      autoStart = false;
+      screenName = "galactica";
+      address = "0.0.0.0";
     };
-  };
 
 }