From cfa7222f4d73c52e5c90ac75eb3e8d4c0ff06a06 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Wed, 8 May 2019 20:18:52 +0200
Subject: [PATCH] Added musnix stuff to Lilim.

---
 machines/Lilim/configuration.nix          |  5 +----
 machines/Lilim/hardware-configuration.nix | 24 +++++++++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/machines/Lilim/configuration.nix b/machines/Lilim/configuration.nix
index f9d61c1..601c9e0 100644
--- a/machines/Lilim/configuration.nix
+++ b/machines/Lilim/configuration.nix
@@ -7,10 +7,7 @@
 
   services = {
     gnome3.gnome-terminal-server.enable = true;
-    udev.extraRules = ''
-      SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
-      KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_mode=uinput"
-    '';
+    cron.enable = false;
   };
 
   environment.systemPackages = with pkgs; [ firmware_surface xdiskusage ];
diff --git a/machines/Lilim/hardware-configuration.nix b/machines/Lilim/hardware-configuration.nix
index a9e507b..20a8f08 100644
--- a/machines/Lilim/hardware-configuration.nix
+++ b/machines/Lilim/hardware-configuration.nix
@@ -2,24 +2,40 @@
 
 let
  localpkgs = import <nixpkgs-local> {};
+ musnix_channel = (fetchTarball "https://github.com/musnix/musnix/archive/master.tar.gz");
 # vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
 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 = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
     cleanTmpDir = true;
-    kernelPackages = pkgs.linuxPackages_4_19;
+#    kernelPackages = pkgs.linuxPackages_4_19;
+
     initrd.kernelModules = [ "hid-multitouch" ];
     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 = [ ];
   };
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/8c3a5a07-9ee1-4154-9f3f-6abc379073aa";
       fsType = "ext4";
+      options = [ "noatime" ];
     };
 
   fileSystems."/boot" =
@@ -59,7 +75,7 @@ in {
 
   powerManagement = {
     enable = true;
-    cpuFreqGovernor = "powersave";
+    # cpuFreqGovernor = "powersave";
   };
   services.upower.enable = true;