diff options
| author | tv <tv@krebsco.de> | 2015-06-14 19:22:37 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2015-06-14 19:22:37 +0200 |
| commit | e9970fc3bdaf204ce0999058017a471e1efcfaa9 (patch) | |
| tree | 6a36b91b0ed33ba90b4da32d1fa995789f923a8d /modules/mors/default.nix | |
| parent | 55e6974bdf76ca7a7e0df6a8e99c70ab01dda74e (diff) | |
| parent | 3eb5e2ace450035c0cdff424e68eed6906e997e1 (diff) | |
Merge remote-tracking branch 'mors/master' into mors-staging
Diffstat (limited to 'modules/mors/default.nix')
| -rw-r--r-- | modules/mors/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/mors/default.nix b/modules/mors/default.nix index 8768cd1..d9ddd28 100644 --- a/modules/mors/default.nix +++ b/modules/mors/default.nix @@ -24,10 +24,12 @@ ../lass/binary-caches.nix ../lass/ircd.nix ../../secrets/mors-pw.nix + ./repos.nix ]; + nixpkgs = { url = "https://github.com/Lassulus/nixpkgs"; - rev = "eba85883a07a9fc414d7860f8d6fee4d9f09b2ac"; + rev = "b74c8eeb73a75eb61148c190df4733474a99a205"; }; networking.hostName = "mors"; @@ -54,8 +56,6 @@ initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ]; #kernelModules = [ "kvm-intel" "msr" ]; kernelModules = [ "msr" ]; - extraModprobeConfig = '' - ''; }; fileSystems = { "/" = { @@ -145,7 +145,6 @@ ''; services.xserver = { - videoDriver = "intel"; vaapiDrivers = [ pkgs.vaapiIntel ]; deviceSection = '' |