diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix
index 0622b66..91b0fd8 100644
--- a/hosts/valefar/default.nix
+++ b/hosts/valefar/default.nix
@@ -30,4 +30,8 @@
   
   boot.supportedFilesystems = [ "zfs" ];
   boot.kernelModules = [ "nct6775" "coretemp" ];
+
+  environment.systemPackages = with pkgs; [
+    lm_sensors
+  ];
 }
diff --git a/hosts/valefar/hardware.nix b/hosts/valefar/hardware.nix
index 09b41db..8b1780e 100644
--- a/hosts/valefar/hardware.nix
+++ b/hosts/valefar/hardware.nix
@@ -13,7 +13,7 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = { 
+  fileSystems."/" = {
     device = "/dev/disk/by-uuid/17b399da-2210-4493-9ae3-c65b20b992a0";
     fsType = "ext4";
   };
@@ -36,6 +36,24 @@
 
   swapDevices = [ ];
 
+  # Fan Control
+  hardware.fancontrol = {
+    enable = true;
+    config = ''
+INTERVAL=10
+DEVPATH=hwmon1=devices/platform/nct6775.2592 hwmon2=devices/platform/coretemp.0
+DEVNAME=hwmon1=nct6795 hwmon2=coretemp
+FCTEMPS=hwmon1/pwm2=hwmon2/temp1_input hwmon1/pwm3=hwmon2/temp1_input
+FCFANS=hwmon1/pwm2=hwmon1/fan2_input hwmon1/pwm3=hwmon1/fan3_input
+MINTEMP=hwmon1/pwm2=20 hwmon1/pwm3=20
+MAXTEMP=hwmon1/pwm2=65 hwmon1/pwm3=60
+MINSTART=hwmon1/pwm2=38 hwmon1/pwm3=75
+MINSTOP=hwmon1/pwm2=28 hwmon1/pwm3=75
+MINPWM=hwmon1/pwm2=28 hwmon1/pwm3=75
+MAXPWM=hwmon1/pwm2=150 hwmon1/pwm3=105
+    '';
+  };
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/modules/common/system.nix b/modules/common/system.nix
index 08ae056..5277d09 100644
--- a/modules/common/system.nix
+++ b/modules/common/system.nix
@@ -31,16 +31,6 @@
     dnsovertls  = "true";
   };
 
-  systemd.services.fancontrol = {
-    enable = true;
-    description = "Fan speed control";
-    serviceConfig = {
-      ExecStart = "${pkgs.lm_sensors}/bin/fancontrol";
-      Restart = "always";
-    };
-    wantedBy = [ "multi-user.target" ];
-  };
-
   environment.variables.EDITOR = "neovim";
 
   time.timeZone     = "America/New_York";