2 files changed, 41 insertions, 25 deletions
diff --git a/hosts/phobos/default.nix b/hosts/phobos/default.nix
index cbefcba..9871b91 100644
--- a/hosts/phobos/default.nix
+++ b/hosts/phobos/default.nix
@@ -13,13 +13,16 @@
   boot.loader.grub.device = "/dev/sdb"; # or "nodev" for efi only
 
   # Pick only one of the below networking options.
-  networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
-  networking.wireless.networks = secrets.wifi;
-  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+  networking = {
+    wireless = {
+      enable = true; # Enables wireless support via wpa_supplicant.
+      networks = secrets.wifi;
+    };
+    # networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+    # Configure network proxy if necessary
+    # proxy.default = "http://user:password@proxy:port/";
+    # proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+  };
 
   environment.systemPackages = with pkgs;
     [
diff --git a/hosts/phobos/hardware.nix b/hosts/phobos/hardware.nix
index 6194c2d..84e9b8b 100644
--- a/hosts/phobos/hardware.nix
+++ b/hosts/phobos/hardware.nix
@@ -5,12 +5,16 @@ in
 {
   imports = [ ];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm_intel" ];
-  boot.extraModulePackages = [ ];
-  boot.kernelParams = [ "net.ifnames=0" "biosdevname=0" "iomem=relaxed" ];
+  boot = {
+    initrd = {
+      availableKernelModules =
+        [ "xhci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm_intel" ];
+    extraModulePackages = [ ];
+    kernelParams = [ "net.ifnames=0" "biosdevname=0" "iomem=relaxed" ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/2a0ba6f5-a4ec-4614-9bd2-11b4a66d5d82";
@@ -21,20 +25,29 @@ in
 
   powerManagement.cpuFreqGovernor = powerMode;
 
-  services.xserver.videoDrivers = [ "intel" ];
-  #  hardware.nvidia.modesetting.enable = true;
-  hardware.opengl.enable = true;
-  hardware.opengl.driSupport = true;
   #services.xserver.videoDrivers = [ "nvidia" ];
+  services.xserver = {
+    videoDrivers = [ "intel" ];
+    # Enable touchpad support (enabled default in most desktopManager).
+    libinput.enable = true;
+  };
+
+  hardware = {
+    opengl = {
+      enable = true;
+      driSupport = true;
+    };
 
-  /* hardware.nvidia.prime = {
-    sync.enable = true;
+    # nvidia.modesetting.enable = true;
+    /*nvidia.prime = {
+      sync.enable = true;
 
-    # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
-    nvidiaBusId = "PCI:1:0:0";
+      # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
+      nvidiaBusId = "PCI:1:0:0";
+
+      # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
+      intelBusId = "PCI:0:2:0";
+      };*/
+  };
 
-    # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
-    intelBusId = "PCI:0:2:0";
-    };
-  */
 }