From 010daf75902c3dc9ea449cfc202fb8004e3d45e1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 18:31:42 +0100 Subject: machines/haenk: Override Mesa using LLVM 3.6 Since NixOS/nixpkgs@3e96b76, LLVM 3.7 is the default for all packages, including Mesa. Unfortunately, the NV44M GPU drivers do not seem to like this very much. Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index e56329e7..a2764cbe 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -53,7 +53,15 @@ auto-optimise-store = true ''; - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + packageOverrides = opkgs: { + # This is because the driver for the NV44M GPU doesn't like LLVM 3.7 + mesa_noglu = pkgs.mesa_noglu.override { + llvmPackages = pkgs.llvmPackages_36; + }; + }; + allowUnfree = true; + }; services.openssh.enable = true; services.tlp.enable = true; -- cgit 1.4.1 From f577343f35b77d65866695b47c758c0037499a82 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 18:37:53 +0100 Subject: machines/haenk: Enable PulseAudio everywhere Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index a2764cbe..01e3bd38 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -26,17 +26,21 @@ device = "/dev/disk/by-uuid/b5ea0ae8-20c6-43dd-ad97-6d8c783dac02"; }; - hardware.cpu.amd.updateMicrocode = true; + hardware = { + cpu.amd.updateMicrocode = true; - hardware.firmware = lib.singleton (pkgs.runCommand "ipw2x00-firmware" {} '' - mkdir -p "$out/lib/firmware" - cp "${pkgs.fetchgit rec { - name = "ipw2x00-20151227"; - url = "git://anonscm.debian.org/kernel/firmware-nonfree.git"; - rev = "e4147b94a856dfe7d4dac11b5da7d9e96b3c2e95"; - sha256 = "18kymqzhlppj520n6vkq5666qgryz3prym1pxn3sqv34yvav7agi"; - }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/" - ''); + firmware = lib.singleton (pkgs.runCommand "ipw2x00-firmware" {} '' + mkdir -p "$out/lib/firmware" + cp "${pkgs.fetchgit rec { + name = "ipw2x00-20151227"; + url = "git://anonscm.debian.org/kernel/firmware-nonfree.git"; + rev = "e4147b94a856dfe7d4dac11b5da7d9e96b3c2e95"; + sha256 = "18kymqzhlppj520n6vkq5666qgryz3prym1pxn3sqv34yvav7agi"; + }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/" + ''); + + pulseaudio = true; + }; i18n.consoleKeyMap = "de"; i18n.defaultLocale = "en_US.UTF-8"; @@ -54,6 +58,7 @@ ''; nixpkgs.config = { + pulseaudio = true; packageOverrides = opkgs: { # This is because the driver for the NV44M GPU doesn't like LLVM 3.7 mesa_noglu = pkgs.mesa_noglu.override { -- cgit 1.4.1 From 32ceae838c3a1654f3c08b94d9fe6c719d9284cf Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 18:38:52 +0100 Subject: machines/haenk: Enable pepper flash for Chromium Unfortunately there are still too many flash-only sites out there so that we could disable it for non-technical people. Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index 01e3bd38..feaa146d 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -59,6 +59,7 @@ nixpkgs.config = { pulseaudio = true; + chromium.enablePepperFlash = true; packageOverrides = opkgs: { # This is because the driver for the NV44M GPU doesn't like LLVM 3.7 mesa_noglu = pkgs.mesa_noglu.override { -- cgit 1.4.1 From e3c8c2d32fddb79001d1d3796bb3d084746cc761 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 18:47:45 +0100 Subject: machines/haenk: Fix evaluation Finger fart, I should have tested this with nix-instantiate. Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index feaa146d..837431d2 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -39,7 +39,7 @@ }}"/debian/config/ipw2x00/*.fw "$out/lib/firmware/" ''); - pulseaudio = true; + pulseaudio.enable = true; }; i18n.consoleKeyMap = "de"; -- cgit 1.4.1 From 80d8ed63258b78a4f84a4e41fbb1db031cc571e1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 18:48:48 +0100 Subject: machines/haenk: Sort nixpkgs.config attributes It's not alphabetically sorted, but so that it's a little bit easier to read. Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index 837431d2..2e9aa6ce 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -58,15 +58,16 @@ ''; nixpkgs.config = { + allowUnfree = true; pulseaudio = true; chromium.enablePepperFlash = true; + packageOverrides = opkgs: { # This is because the driver for the NV44M GPU doesn't like LLVM 3.7 - mesa_noglu = pkgs.mesa_noglu.override { - llvmPackages = pkgs.llvmPackages_36; + mesa_noglu = opkgs.mesa_noglu.override { + llvmPackages = opkgs.llvmPackages_36; }; }; - allowUnfree = true; }; services.openssh.enable = true; -- cgit 1.4.1 From 49c26991e8a957fcc91df27b601de9a2d6c661fd Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 19:16:23 +0100 Subject: machines/haenk: Add cdparanoia to systemPackages Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index 2e9aa6ce..661f9af0 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -12,9 +12,9 @@ }; environment.systemPackages = with pkgs; [ - chromium figlet gajim gimp htop inkscape kde5.oxygen-icons5 libreoffice mosh - mpv pciutils skype vim_configurable vlc vuizvui.greybird-xfce-theme - vuizvui.tomahawk wget youtubeDL + cdparanoia chromium figlet gajim gimp htop inkscape kde5.oxygen-icons5 + libreoffice mosh mpv pciutils skype vim_configurable vlc + vuizvui.greybird-xfce-theme vuizvui.tomahawk wget youtubeDL ]; fileSystems."/" = { -- cgit 1.4.1 From 5109e5d646ef90f38b3640f25cb1f693e9356d24 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 1 Jan 2016 19:17:21 +0100 Subject: machines/haenk: Switch to my version of Vim I'm probably the only one using Vim on this machine, so it makes sense to use a sane Vim configuration here. Signed-off-by: aszlig --- machines/aszlig/managed/haenk.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix index 661f9af0..75730ff4 100644 --- a/machines/aszlig/managed/haenk.nix +++ b/machines/aszlig/managed/haenk.nix @@ -13,8 +13,8 @@ environment.systemPackages = with pkgs; [ cdparanoia chromium figlet gajim gimp htop inkscape kde5.oxygen-icons5 - libreoffice mosh mpv pciutils skype vim_configurable vlc - vuizvui.greybird-xfce-theme vuizvui.tomahawk wget youtubeDL + libreoffice mosh mpv pciutils skype vlc vuizvui.greybird-xfce-theme + vuizvui.tomahawk wget youtubeDL ]; fileSystems."/" = { @@ -90,4 +90,6 @@ uid = 1000; extraGroups = [ "video" "wheel" ]; }; + + vuizvui.user.aszlig.programs.vim.enable = true; } -- cgit 1.4.1