thinkpad: common.nix -> default.nix + fixup after intel.nix drop

This commit is contained in:
Yegor Timoshenko 2017-12-24 01:13:08 +00:00
parent 0c17d72838
commit 67cd7af6be
No known key found for this signature in database
GPG key ID: C34BF9DCC9DF8210
6 changed files with 9 additions and 2 deletions

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../. ];
boot = { boot = {
kernelParams = [ kernelParams = [
"drm.debug=0" "drm.debug=0"

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../. ];
boot = { boot = {
extraModprobeConfig = '' extraModprobeConfig = ''
options bbswitch use_acpi_to_detect_card_state=1 options bbswitch use_acpi_to_detect_card_state=1

View file

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
../.
../lib/kernel-version.nix ../lib/kernel-version.nix
]; ];

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
imports = [ ../common.nix ]; imports = [ ../. ];
boot = { boot = {
# wireless # wireless

View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ ../intel.nix ]; imports = [ ../. ];
# hard disk protection if the laptop falls # hard disk protection if the laptop falls
services.hdapsd.enable = true; services.hdapsd.enable = true;
@ -11,4 +11,6 @@
#security.pam.services.login.fprintAuth = true; #security.pam.services.login.fprintAuth = true;
#security.pam.services.xscreensaver.fprintAuth = true; #security.pam.services.xscreensaver.fprintAuth = true;
# similarly for other PAM providers # similarly for other PAM providers
services.xserver.videoDrivers = [ "intel" ];
} }