diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 75de1b8f..06e8665e 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -35,40 +35,6 @@ let
       libappindicator-gtk3
     ];
   });
-  git-sync = with pkgs; stdenv.mkDerivation rec {
-    name = "git-sync-${version}";
-    version = "20151024";
-
-    src = fetchFromGitHub {
-      owner = "simonthum";
-      repo = "git-sync";
-      rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
-      sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
-    };
-
-    buildInputs = [ makeWrapper ];
-
-    dontBuild = true;
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cp -a git-sync $out/bin/git-sync
-    '';
-
-    wrapperPath = with stdenv.lib; makeBinPath [
-      coreutils
-      git
-      gnugrep
-      gnused
-    ];
-
-    fixupPhase = ''
-      patchShebangs $out/bin
-
-      wrapProgram $out/bin/git-sync \
-        --prefix PATH : "${wrapperPath}"
-      '';
-  };
   pasystray-appindicator = with pkgs; pasystray.overrideAttrs (oldAttrs: rec {
     buildInputs = oldAttrs.buildInputs ++ [libappindicator-gtk3];
   });
@@ -165,7 +131,8 @@ in
     gnome3.gpaste
     kdeconnect
     libnotify
-    lxqt.lxqt-powermanagement
+    # XXX: renable this
+    # lxqt.lxqt-powermanagement
     networkmanagerapplet
     customizable-notify-osd
     pasystray-appindicator
@@ -191,16 +158,19 @@ in
     cabal-install
     cabal2nix
     ghc
-    stack2nix
     stack
 
+    # Scala
+    sbt
+    scala
+
     # Tools
     bazaar
     binutils
     dfeet
     gcc
     gdb
-    git-sync
+    gitAndTools.git-sync
     gitAndTools.git-fame
     gitAndTools.hub
     gitFull
@@ -209,6 +179,7 @@ in
     htop
     inotify-tools
     ispell
+    mercurial
     ncdu
     neofetch
     pass
@@ -327,5 +298,5 @@ in
     };
   };
 
-  system.stateVersion = "18.03";
+  system.nixos.stateVersion = "18.03";
 }