summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
authorAlan Pearce2018-10-07 17:53:23 +0200
committerAlan Pearce2018-10-07 17:53:23 +0200
commitbc83a31fecce6dc1431d4188cf67b71efbf8e432 (patch)
tree3b0e9c8424981de652e7f701a5980a604e9bc73c /modules
parentaa81e95467a7d131a335e149b951f2a8ef66dfd5 (diff)
downloadnixos-configuration-bc83a31fecce6dc1431d4188cf67b71efbf8e432.tar.lz
nixos-configuration-bc83a31fecce6dc1431d4188cf67b71efbf8e432.tar.zst
nixos-configuration-bc83a31fecce6dc1431d4188cf67b71efbf8e432.zip
upgrade to 18.09
Diffstat (limited to 'modules')
-rw-r--r--modules/hardware/network-manager.nix2
-rw-r--r--modules/hardware/thinkpad.nix1
-rw-r--r--modules/user-interface.nix5
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/hardware/network-manager.nix b/modules/hardware/network-manager.nix
index 28b8838..04480a8 100644
--- a/modules/hardware/network-manager.nix
+++ b/modules/hardware/network-manager.nix
@@ -2,7 +2,7 @@
 
 { networking.networkmanager = {
     enable = true;
-    useDnsmasq = false;
+    dns = "unbound";
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix
index 15ec4df..0d2a1ee 100644
--- a/modules/hardware/thinkpad.nix
+++ b/modules/hardware/thinkpad.nix
@@ -13,7 +13,6 @@
 
   services.thinkfan = {
     enable = true;
-    sensor = "/sys/class/thermal/thermal_zone0/temp";
   };
 
   services.tlp = {
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index c13baba..5793a12 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -2,11 +2,12 @@
 
 let
   emacsPackage = import ../packages/emacs.nix {
-    pkgs = pkgs.unstable;
+    inherit pkgs;
+    # pkgs = pkgs.unstable;
   };
 in
 { programs.browserpass.enable = true;
-  programs.info.enable = true;
+  documentation.info.enable = true;
   nixpkgs.config.firefox.enableOfficialBranding = true;
 
   environment.systemPackages = with pkgs; [