diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2017-07-25 11:27:41 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2017-07-25 11:27:41 +0200 |
commit | c02ed22a0851a3844576f5c92fae19734d23b1f2 (patch) | |
tree | 8e5a16eae437af8007c61df30121b052de73e0e0 | |
parent | 4abe22b41b7f39c5983b96cc923da0df320e04ff (diff) | |
download | nixos-c02ed22a0851a3844576f5c92fae19734d23b1f2.tar nixos-c02ed22a0851a3844576f5c92fae19734d23b1f2.tar.gz nixos-c02ed22a0851a3844576f5c92fae19734d23b1f2.tar.bz2 nixos-c02ed22a0851a3844576f5c92fae19734d23b1f2.tar.xz nixos-c02ed22a0851a3844576f5c92fae19734d23b1f2.zip |
gkleen@hel
-rw-r--r-- | users/gkleen@hel.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/users/gkleen@hel.nix b/users/gkleen@hel.nix index 13607a9f..8dd563d7 100644 --- a/users/gkleen@hel.nix +++ b/users/gkleen@hel.nix | |||
@@ -1,5 +1,11 @@ | |||
1 | { | 1 | { |
2 | packageOverrides = pkgs: with pkgs; { | 2 | packageOverrides = pkgs: with pkgs; { |
3 | zathura = lib.overrideDerivation zathura (oldAttrs: { | ||
4 | postInstall = '' | ||
5 | warpProgram $out/bin/zathura \ | ||
6 | --set GDK_SCALE 1 | ||
7 | ''; | ||
8 | }); | ||
3 | chromium-wrapper = symlinkJoin { | 9 | chromium-wrapper = symlinkJoin { |
4 | name = ''${chromium.name}-wrapped''; | 10 | name = ''${chromium.name}-wrapped''; |
5 | paths = [ chromium ]; | 11 | paths = [ chromium ]; |
@@ -32,30 +38,35 @@ | |||
32 | 38 | ||
33 | export PATH=${psmisc}/bin:$PATH | 39 | export PATH=${psmisc}/bin:$PATH |
34 | 40 | ||
41 | trap "killall -s USR2 -u $(whoami) -- dunst" EXIT | ||
42 | |||
35 | killall -s USR1 -u "$(whoami)" -- dunst | 43 | killall -s USR1 -u "$(whoami)" -- dunst |
36 | $@ | 44 | $@ |
37 | killall -s USR2 -u "$(whoami)" -- dunst | ||
38 | ''; | 45 | ''; |
39 | gajim = lib.overrideDerivation gajim (old: { | 46 | gajim = lib.overrideDerivation gajim (old: { |
40 | enableNotifications = true; | 47 | enableNotifications = true; |
41 | extraPythonPackages = (p: [ p.pygments ]); | ||
42 | }); | 48 | }); |
43 | haskellPackages = haskellPackages.override { | 49 | haskellPackages = haskellPackages.override { |
44 | overrides = self: super: with super; { | 50 | overrides = self: super: with super; { |
45 | extended-reals = haskell.lib.doJailbreak extended-reals; | 51 | extended-reals = haskell.lib.doJailbreak extended-reals; |
46 | pandoc-crossref = haskell.lib.dontTest pandoc-crossref; | 52 | pandoc-crossref = haskell.lib.dontTest pandoc-crossref; |
53 | yesod-bin = haskell.lib.appendPatch yesod-bin ../patches/yesod-bin.patch; | ||
47 | } // (import ../custom/thermoprint { inherit pkgs; }); | 54 | } // (import ../custom/thermoprint { inherit pkgs; }); |
48 | }; | 55 | }; |
56 | firefox-unwrapped = firefox-unwrapped.override { | ||
57 | enableOfficialBranding = true; | ||
58 | }; | ||
59 | mpv = mpv.override { | ||
60 | vaapiSupport = true; | ||
61 | }; | ||
49 | } // (import ../utils/nix/default.nix) {}; | 62 | } // (import ../utils/nix/default.nix) {}; |
50 | 63 | ||
64 | pulseaudio = true; | ||
65 | |||
51 | allowUnfree = true; | 66 | allowUnfree = true; |
52 | 67 | ||
53 | chromium = { | 68 | chromium = { |
54 | enableWideVine = true; | 69 | enableWideVine = true; |
55 | hiDPI = true; | 70 | hiDPI = true; |
56 | }; | 71 | }; |
57 | |||
58 | mpv = { | ||
59 | vaapiSupport = true; | ||
60 | }; | ||
61 | } | 72 | } |