steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

steveej-laptop: new hardware!

Browse source 
* bootloader
  * use EFI
* hardware drivers
  * different kernele modules
* GPU driver problem related
  * switch to modesetting GPU driver
  * switch to sddm
* new FS UUIDs
This commit is contained in:
steveej 2017-01-18 16:07:47 +01:00
parent 11badcc29e
commit e633b8fcaf
2 changed files with 27 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

47
nixos-configuration/steveej-laptop/hw.nix
View file

@ -9,27 +9,28 @@
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
hardware.trackpoint.emulateWheel = true; hardware.trackpoint.emulateWheel = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { device = "/dev/disk/by-uuid/be9be32e-1fb0-45c3-9714-390ee2e6c184"; boot.loader.systemd-boot.enable = true;
fsType = "btrfs"; boot.loader.efi.canTouchEfiVariables = true;
options = [
"defaults" fileSystems."/boot" =
"compress=lzo" { device = "/dev/disk/by-uuid/8567-6D0C";
"discard" fsType = "vfat";
"subvol=nixos"
];
}; };
fileSystems."/home" = { device = "/dev/disk/by-uuid/be9be32e-1fb0-45c3-9714-390ee2e6c184";
fileSystems."/" = {
device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = [ "subvol=nixos" ];
"defaults" };
"compress=lzo"
"discard" fileSystems."/home" = {
"subvol=home" device = "/dev/disk/by-uuid/948e84dc-5c4f-4051-8a13-efb30155839f";
]; fsType = "btrfs";
options = [ "subvol=home" ];
}; };
fileSystems."/var/lib/rkt" = { fileSystems."/var/lib/rkt" = {
@ -42,13 +43,15 @@
swapDevices = [ ]; swapDevices = [ ];
# Define on which hard drive you want to install Grub. boot.loader.grub = {
boot.loader.grub.device = "/dev/sda"; device = "/dev/sda";
efiSupport = true;
};
boot.initrd.luks.devices = [ { boot.initrd.luks.devices = [ {
name = "luksSSD1"; name = "btrfsroot";
device = "/dev/disk/by-uuid/2274dc28-7a48-4355-bc27-2d73f7a2744e"; device = "/dev/disk/by-uuid/0e6b5751-0e6d-4de7-84c3-17fe525c4c72";
preLVM = false; preLVM = true;
allowDiscards = true; allowDiscards = true;
} }
]; ];

14
nixos-configuration/steveej-laptop/system.nix
View file

@ -113,7 +113,7 @@
libinput.enable = true; libinput.enable = true;
libinput.naturalScrolling = true; libinput.naturalScrolling = true;
videoDrivers = [ "qxl" "intel" ]; videoDrivers = [ "qxl" "modesetting" ];
enable = true; enable = true;
layout = "us"; layout = "us";
@ -126,17 +126,7 @@
}; };
displayManager = { displayManager = {
slim = { sddm.enable = true;
enable = true;
theme = pkgs.fetchFromGitHub {
owner = "steveej";
repo = "nixos-slim-theme";
rev = "eec04a624113db835f2b5960d305e242da9dbc2a";
sha256 = "146zmr5rzwxq5mz6b7108a3ksf3nvqxrr8bvi82jsw6xqji4i5f5";
};
autoLogin = true;
defaultUser = "steveej";
};
sessionCommands = '' sessionCommands = ''
xscreensaver -no-splash & xscreensaver -no-splash &
${pkgs.networkmanagerapplet}/bin/nm-applet & ${pkgs.networkmanagerapplet}/bin/nm-applet &