From 775bc3a9f488c4be1dd761ba69f53e972487c7e3 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Sun, 29 Jan 2023 14:35:38 +0100
Subject: [PATCH] Update Lilim config.

---
 machines/Lilim/hardware-configuration.nix | 14 +++++++++++---
 machines/Lilim/options.nix                | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/machines/Lilim/hardware-configuration.nix b/machines/Lilim/hardware-configuration.nix
index 937e075..5403b87 100644
--- a/machines/Lilim/hardware-configuration.nix
+++ b/machines/Lilim/hardware-configuration.nix
@@ -18,7 +18,12 @@ in {
 
     kernelPackages = pkgs.linuxPackages_latest;
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
-    kernelModules = [ "i915" "kvm-intel" "uinput" ];
+    kernelModules = [ "acpi_call" "i915" "kvm-intel" "uinput" ];
+    # 5_10 breaks my touchpad/mouse buttons
+    # https://bbs.archlinux.org/viewtopic.php?id=254885
+    # maybe modprobe hid_rmi or i2c_i801
+    # blacklistedKernelModules = [ "i2c_i801" ];
+    extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; #pkgs.gitpkgs.linuxPackages_latest.hid-nintendo ];
     kernelParams = [ "intel_iommu=on" ];
     extraModprobeConfig = ''
       options i915 enable_fbc=1 enable_guc=3
@@ -43,7 +48,7 @@ in {
   hardware = {
     firmware = with pkgs; [ firmwareLinuxNonfree ];
     cpu.intel.updateMicrocode = true;
-    enableAllFirmware = true;
+    enableAllFirmware = false;
     ksm.enable = true;
     opengl = {
       driSupport = true;
@@ -72,7 +77,10 @@ in {
     enable = true;
     cpuFreqGovernor = "powersave";
   };
-  services.upower.enable = true;
+  services = {
+    upower.enable = true;
+    xserver.videoDrivers = [ "intel" ];
+  };
 
   time.timeZone = "Europe/Berlin";
 }
diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix
index 258748d..10950c2 100644
--- a/machines/Lilim/options.nix
+++ b/machines/Lilim/options.nix
@@ -9,7 +9,8 @@ with lib;
   config.machine = {
     allowUnfree = true;
     hostName = "Lilim";
-    administrators = [ { name = "derped"; id = 1337; } ];
+    useNetworkd = true;
+    administrators = [ { name = "derped"; id = 1337; } { name = "testy"; id = 1338; } ];
     conffiles = [
       "etcfiles"
       "etcvars"
@@ -20,21 +21,23 @@ with lib;
       "base"
       "cpp"
       "dict"
+      "nodejs"
+      "latex"
       "emacs"
       "emacs::company"
+      "emacs::direnv"
       "emacs::doom-modeline"
       "emacs::doom-themes"
       "emacs::elpy"
-      "emacs::fcitx"
       "emacs::flycheck"
       "emacs::flyspell"
       "emacs::latex"
       "emacs::lsp"
       "emacs::magit"
       "emacs::mu4e"
+      "emacs::elfeed"
       "emacs::nix-mode"
       "emacs::org"
-      "emacs::rust"
       "emacs::transmission"
       "emacs::web-mode"
       "emacs::yasnippet"
@@ -42,16 +45,17 @@ with lib;
       "haskell"
       "mail_utils"
       "python3"
-      "rustpkgs"
       "xpkgs"
-      # "emacs::lsp"
-      # "emacs::powerline"
-      # "emacs::solarized-theme"
     ];
     services = [
+      "bind"
       "desktop"
       "udev"
       "cups"
+      "mullvad"
+      "mariaDB"
+      "nspawn"
+      "docker"
     ];
     firewall = {
       enable = true;