1 files changed, 25 insertions, 16 deletions

diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index aff24e15..cf8e004d 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -1,41 +1,50 @@
 {
-  packageOverrides = pkgs: rec {
-    chromium-wrapper = pkgs.symlinkJoin {
-      name = ''${pkgs.chromium.name}-wrapped'';
-      paths = [ pkgs.chromium ];
-      buildInputs = [ pkgs.makeWrapper ];
+  packageOverrides = pkgs: with pkgs; {
+    chromium-wrapper = symlinkJoin {
+      name = ''${chromium.name}-wrapped'';
+      paths = [ chromium ];
+      buildInputs = [ makeWrapper ];
       postBuild = ''
         wrapProgram $out/bin/chromium \
           --add-flags --force-device-scale-factor=1.6
       '';
     };
-    chrome-wrapper = pkgs.symlinkJoin {
-      name = ''${pkgs.google-chrome.name}-wrapped'';
-      paths = [ pkgs.google-chrome ];
-      buildInputs = [ pkgs.makeWrapper ];
+    chrome-wrapper = symlinkJoin {
+      name = ''${google-chrome-dev.name}-wrapped'';
+      paths = [ google-chrome-dev ];
+      buildInputs = [ makeWrapper ];
       postBuild = ''
-        wrapProgram $out/bin/google-chrome-stable \
+        wrapProgram $out/bin/google-chrome-unstable \
           --add-flags --force-device-scale-factor=1.6
-        ln -s $out/bin/google-chrome-stable $out/bin/chrome
+        ln -s $out/bin/google-chrome-unstable $out/bin/chrome
 
-        rm $out/share/applications/google-chrome.desktop
-        substitute ${pkgs.google-chrome}/share/applications/google-chrome.desktop $out/share/applications/google-chrome.desktop --replace "${pkgs.google-chrome}" "$out"
+        rm $out/share/applications/google-chrome-unstable.desktop
+        substitute ${google-chrome-dev}/share/applications/google-chrome-unstable.desktop $out/share/applications/google-chrome-unstable.desktop --replace "${google-chrome-dev}" "$out"
       '';
     };
-    gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: {
+    gnupg = lib.overrideDerivation gnupg (oldAttrs: {
       postInstall = ''
         ln -s $out/bin/gpg2 $out/bin/gpg
       '';
     });
-    dunst-suspend = pkgs.writeScriptBin "dunst-suspend" ''
+    dunst-suspend = writeScriptBin "dunst-suspend" ''
       #!${pkgs.stdenv.shell}
 
-      export PATH=${pkgs.psmisc}/bin:$PATH
+      export PATH=${psmisc}/bin:$PATH
 
       killall -s USR1 -u "$(whoami)" -- dunst
       $@
       killall -s USR2 -u "$(whoami)" -- dunst
     '';
+    gajim = lib.overrideDerivation gajim (old: {
+      enableNotifications = true;
+    });
+    haskellPackages = haskellPackages.override {
+      overrides = self: super: with super; {
+        extended-reals = haskell.lib.doJailbreak extended-reals;
+        pandoc-crossref = haskell.lib.dontTest pandoc-crossref;
+      } // (import ../custom/thermoprint { inherit pkgs; });
+    };
   } // (import ../utils/nix/default.nix) {};
 
   allowUnfree = true;