6 files changed, 110 insertions, 11 deletions
diff --git a/nix-home-config/aji.nix b/nix-home-config/aji.nix
index af21dbd..6142064 100644
--- a/nix-home-config/aji.nix
+++ b/nix-home-config/aji.nix
@@ -3,6 +3,9 @@
 {
   imports = [
     ./my-env.nix
+    ./desktop.nix
+    ./synergy-server.nix
+    # ./synergy-client.nix
   ];
 
   home.stateVersion = "19.03";
diff --git a/nix-home-config/desktop.nix b/nix-home-config/desktop.nix
new file mode 100644
index 0000000..41dfe79
--- /dev/null
+++ b/nix-home-config/desktop.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    iw
+    wirelesstools
+    hledger
+    hledger-ui
+    ledger
+    signal-desktop
+    nix-index
+    ffmpeg
+    vlc
+    synergy
+    firefox-bin
+  ];
+}
diff --git a/nix-home-config/my-env.nix b/nix-home-config/my-env.nix
index 6a97cf5..93a1a43 100644
--- a/nix-home-config/my-env.nix
+++ b/nix-home-config/my-env.nix
@@ -3,28 +3,33 @@
 {
   programs.home-manager.enable = true;
   programs.neovim.enable = true;
+  services.lorri.enable = true;
 
   home.sessionVariables = {
     EDITOR = "nvim";
   };
 
+  home.file.".zshrc-nix-hook".text = ''
+    eval "$(direnv hook zsh)"
+  '';
+
   home.packages = with pkgs; [
+    direnv
     htop
-    iw
-    wirelesstools
-    R
-    rPackages.data_table
-    rPackages.ggplot2
-    rPackages.hms
-    rPackages.viridis
+    (rWrapper.override {
+      packages = with rPackages; [
+        data_table
+        ggplot2
+        hms
+        viridis
+        lubridate
+      ];
+    })
     emacs
     hledger
-    hledger-ui
     ledger
     bwm_ng
-    signal-desktop
     nix-index
-    ffmpeg
-    vlc
+    rustup
   ];
 }
diff --git a/nix-home-config/pincer.nix b/nix-home-config/pincer.nix
index af21dbd..34f2d9e 100644
--- a/nix-home-config/pincer.nix
+++ b/nix-home-config/pincer.nix
@@ -3,6 +3,8 @@
 {
   imports = [
     ./my-env.nix
+    ./desktop.nix
+    ./synergy-client.nix
   ];
 
   home.stateVersion = "19.03";
diff --git a/nix-home-config/synergy-client.nix b/nix-home-config/synergy-client.nix
new file mode 100644
index 0000000..7a07389
--- /dev/null
+++ b/nix-home-config/synergy-client.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+
+let
+  configFile = pkgs.writeText "synergy.conf" ''
+    section: screens
+      pincer:
+      aji:
+    end
+
+    section: links
+      pincer:
+        right = aji
+      aji:
+        left = pincer
+    end 
+  '';
+in
+{
+  systemd.user.services = {
+    synergyc = {
+      Unit = {
+        Description = "Synergy Client";
+        After = ["network.target" "graphical-session.target"];
+      };
+
+      Service = {
+        Type = "simple";
+        ExecStart = "${pkgs.synergy}/bin/synergyc -f localhost:24800";
+      };
+
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
+  };
+}
diff --git a/nix-home-config/synergy-server.nix b/nix-home-config/synergy-server.nix
new file mode 100644
index 0000000..c3f66ee
--- /dev/null
+++ b/nix-home-config/synergy-server.nix
@@ -0,0 +1,36 @@
+{ config, pkgs, ... }:
+
+let
+  configFile = pkgs.writeText "synergy.conf" ''
+    section: screens
+      pincer:
+      aji:
+    end
+
+    section: links
+      pincer:
+        right = aji
+      aji:
+        left = pincer
+    end 
+  '';
+in
+{
+  systemd.user.services = {
+    synergys = {
+      Unit = {
+        Description = "Synergy Server";
+        After = ["network.target" "graphical-session.target"];
+      };
+
+      Service = {
+        Type = "simple";
+        ExecStart = "${pkgs.synergy}/bin/synergys -f -c ${configFile}";
+      };
+
+      Install = {
+        WantedBy = ["default.target"];
+      };
+    };
+  };
+}