Merge branch 'master' of git:nixos

1 files changed, 23 insertions, 1 deletions

diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix
index 28548a84..aff24e15 100644
--- a/users/gkleen@hel.nix
+++ b/users/gkleen@hel.nix
@@ -1,7 +1,7 @@
 {
   packageOverrides = pkgs: rec {
     chromium-wrapper = pkgs.symlinkJoin {
-      name = "chromium-wrapper";
+      name = ''${pkgs.chromium.name}-wrapped'';
       paths = [ pkgs.chromium ];
       buildInputs = [ pkgs.makeWrapper ];
       postBuild = ''
@@ -9,11 +9,33 @@
           --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 ];
+      postBuild = ''
+        wrapProgram $out/bin/google-chrome-stable \
+          --add-flags --force-device-scale-factor=1.6
+        ln -s $out/bin/google-chrome-stable $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"
+      '';
+    };
     gnupg = pkgs.lib.overrideDerivation pkgs.gnupg (oldAttrs: {
       postInstall = ''
         ln -s $out/bin/gpg2 $out/bin/gpg
       '';
     });
+    dunst-suspend = pkgs.writeScriptBin "dunst-suspend" ''
+      #!${pkgs.stdenv.shell}
+
+      export PATH=${pkgs.psmisc}/bin:$PATH
+
+      killall -s USR1 -u "$(whoami)" -- dunst
+      $@
+      killall -s USR2 -u "$(whoami)" -- dunst
+    '';
   } // (import ../utils/nix/default.nix) {};
 
   allowUnfree = true;