diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 18:30:42 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-03-18 18:30:42 +0100 |
commit | 012fc8e4f399af06ab013ba136fe1d2cffb913f1 (patch) | |
tree | 30067e9c9420fea0a9150234a01bd43208a9d18c /modules/user/aszlig/profiles/base.nix | |
parent | 95a16e591e9e26158ebf1604e5cb2c82dfcf2856 (diff) |
Refactor overrides into my base profile.
Just moving the overrides into the base profile isn't enough here, as we wouldn't be able to refer to packages anymore, because the global nixpkgs.config override is now gone. Instead, we're now putting pkgs.vuizvui.* into the NixOS module system by a new profiles/common.nix, which is used unconditionally for all machines. Of course, the result of this is that we now need to change all references to vuizvui-related packages, which also is a good thing, because we will no longer shadow existing packages from upstream nixpkgs. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user/aszlig/profiles/base.nix')
-rw-r--r-- | modules/user/aszlig/profiles/base.nix | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index 4083150c..8ccc77d2 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -58,7 +58,36 @@ in { xz ]; - nixpkgs.config = import ../../../../nixpkgs/config.nix; + nixpkgs.config = { + pulseaudio = true; + chromium.enablePepperFlash = true; + firefox.jre = true; + + # Needed for CPU microcode + allowUnfree = true; + + allowBroken = true; + + packageOverrides = pkgs: { + miro = pkgs.miro.override { + enableBonjour = true; + }; + netrw = pkgs.netrw.override { + checksumType = "mhash"; + }; + pulseaudio = pkgs.pulseaudio.override { + useSystemd = true; + }; + uqm = pkgs.uqm.override { + use3DOVideos = true; + useRemixPacks = true; + }; + w3m = pkgs.w3m.override { + graphicsSupport = true; + }; + }; + }; + system.fsPackages = with pkgs; [ sshfsFuse ]; time.timeZone = "Europe/Berlin"; }; |