derped/nixos
1
0
Fork 0
Code Releases Activity

Added musnix stuff to Lilim.

Browse source
This commit is contained in:
Kevin Baensch 2019-05-08 20:18:52 +02:00
parent adadb70cfd
commit cfa7222f4d
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
machines/Lilim/configuration.nix
View file

@ -7,10 +7,7 @@
services = { services = {
gnome3.gnome-terminal-server.enable = true; gnome3.gnome-terminal-server.enable = true;
udev.extraRules = '' cron.enable = false;
SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_mode=uinput"
'';
}; };
environment.systemPackages = with pkgs; [ firmware_surface xdiskusage ]; environment.systemPackages = with pkgs; [ firmware_surface xdiskusage ];

24
machines/Lilim/hardware-configuration.nix
View file

@ -2,24 +2,40 @@
let let
localpkgs = import <nixpkgs-local> {}; localpkgs = import <nixpkgs-local> {};
musnix_channel = (fetchTarball "https://github.com/musnix/musnix/archive/master.tar.gz");
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
in { in {
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ]; imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
musnix_channel ];
musnix = {
enable = true;
alsaSeq.enable = true;
ffado.enable = true;
soundcardPciId = "00:14.0";
kernel.realtime = true;
kernel.packages = pkgs.linuxPackages_4_19_rt;
rtirq.enable = true;
};
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
cleanTmpDir = true; cleanTmpDir = true;
kernelPackages = pkgs.linuxPackages_4_19; # kernelPackages = pkgs.linuxPackages_4_19;
initrd.kernelModules = [ "hid-multitouch" ]; initrd.kernelModules = [ "hid-multitouch" ];
initrd.availableKernelModules = [ "hid-microsoft" "hid-multitouch" "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; initrd.availableKernelModules = [ "hid-microsoft" "hid-multitouch" "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
kernelModules = [ "kvm-intel" "hid-microsoft" "hid-multitouch" "uinput" ]; kernelModules = [ "kvm-intel" "hid-microsoft" "hid-multitouch" "uinput" ] ++ [ "snd-seq" "snd-rawmidi" ];
kernel.sysctl = { "fs.inotify.max_user_watches" = 524288; };
kernelParams = [ "threadirq" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
}; };
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/8c3a5a07-9ee1-4154-9f3f-6abc379073aa"; { device = "/dev/disk/by-uuid/8c3a5a07-9ee1-4154-9f3f-6abc379073aa";
fsType = "ext4"; fsType = "ext4";
options = [ "noatime" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
@ -59,7 +75,7 @@ in {
powerManagement = { powerManagement = {
enable = true; enable = true;
cpuFreqGovernor = "powersave"; # cpuFreqGovernor = "powersave";
}; };
services.upower.enable = true; services.upower.enable = true;