summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-06 19:16:42 +0200
committertv <tv@krebsco.de>2016-10-08 09:30:51 +0200
commit58c854c657b0bcbfc7e34b743cdba18675221e32 (patch)
treeb524d733f2caabd287ea8a28190651da7c610aa8 /tv
parentd3f2444f91162b7dd22c92c8093795736aa11a11 (diff)
tv nixpkgs: 2568ee3 -> 45b2a6d
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/xu.nix4
-rw-r--r--tv/2configs/default.nix7
-rw-r--r--tv/2configs/hw/x220.nix5
-rw-r--r--tv/2configs/man.nix10
-rw-r--r--tv/2configs/vim.nix2
5 files changed, 15 insertions, 13 deletions
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 642593fc4..119399ac2 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -24,7 +24,7 @@ with config.krebs.lib;
# stockholm
gnumake
hashPassword
- haskellPackages.lentil
+ #haskellPackages.lentil
parallel
(pkgs.writeBashBin "im" ''
export PATH=${makeSearchPath "bin" (with pkgs; [
@@ -60,7 +60,7 @@ with config.krebs.lib;
pass
q
qrencode
- texLive
+ #texLive
tmux
#ack
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index db1bfe5a2..7d454e2b7 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with config.krebs.lib;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "2568ee3d73bdebd6bab6739adf8a900f3429c8e6";
+ ref = "45b2a6d88299bb5671e36a4239ec0097bc149fb3";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
@@ -37,6 +37,7 @@ with config.krebs.lib;
# stockholm dependencies
environment.systemPackages = with pkgs; [
git
+ populate
];
}
{
@@ -63,13 +64,13 @@ with config.krebs.lib;
{
# TODO check if both are required:
- nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ];
+ nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ];
nix.requireSignedBinaryCaches = true;
nix.binaryCaches = ["https://cache.nixos.org"];
- nix.useChroot = true;
+ nix.useSandbox = true;
}
{
nixpkgs.config.allowUnfree = false;
diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix
index c5a3485a2..6cc295dc5 100644
--- a/tv/2configs/hw/x220.nix
+++ b/tv/2configs/hw/x220.nix
@@ -5,7 +5,7 @@
../smartd.nix
];
- boot.loader.gummiboot.enable = true;
+ boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.wireless.enable = true;
@@ -13,6 +13,8 @@
# Required for Centrino.
hardware.enableAllFirmware = true;
+ hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
+
hardware.trackpoint = {
enable = true;
sensitivity = 220;
@@ -41,6 +43,5 @@
services.xserver = {
videoDriver = "intel";
- vaapiDrivers = [ pkgs.vaapiIntel pkgs.vaapiVdpau ];
};
}
diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix
index a84e60b73..6534e2c0e 100644
--- a/tv/2configs/man.nix
+++ b/tv/2configs/man.nix
@@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }:
{
- environment.etc."man.conf".source = pkgs.runCommand "man.conf" {} ''
- ${pkgs.gnused}/bin/sed <${pkgs.man}/lib/man.conf >$out '
- s:^NROFF\t.*:& -Wbreak:
- '
- '';
+ #environment.etc."man.conf".source = pkgs.runCommand "man.conf" {} ''
+ # ${pkgs.gnused}/bin/sed <${pkgs.man}/lib/man.conf >$out '
+ # s:^NROFF\t.*:& -Wbreak:
+ # '
+ #'';
environment.systemPackages = with pkgs; [
manpages
posix_man_pages
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 86c5d05d6..16f540488 100644
--- a/tv/2configs/vim.nix
+++ b/tv/2configs/vim.nix
@@ -21,7 +21,7 @@ let
src = pkgs.fetchgit {
url = https://github.com/vito-c/jq.vim;
rev = "99d55a300047946a82ecdd7617323a751199ad2d";
- sha256 = "00mmwg4swwmllknzzx07af080lcy7y5i6341rc6c08i2vka48nv9";
+ sha256 = "09c94nah47wx0cr556w61h6pfznxld18pfblc3nv51ivbw7cjqyx";
};
})
(pkgs.vimUtils.buildVimPlugin {