From bc83a31fecce6dc1431d4188cf67b71efbf8e432 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 7 Oct 2018 17:53:23 +0200
Subject: upgrade to 18.09

---
 marvin.nix                           | 2 +-
 modules/hardware/network-manager.nix | 2 +-
 modules/hardware/thinkpad.nix        | 1 -
 modules/user-interface.nix           | 5 +++--
 packages/emacs.nix                   | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/marvin.nix b/marvin.nix
index f047d88b..3227fd70 100644
--- a/marvin.nix
+++ b/marvin.nix
@@ -38,5 +38,5 @@
     domain = "alanpearce.eu";
   };
 
-  system.stateVersion = "17.09";
+  system.stateVersion = "18.09";
 }
diff --git a/modules/hardware/network-manager.nix b/modules/hardware/network-manager.nix
index 28b88382..04480a8c 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 15ec4df8..0d2a1eed 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 c13babaa..5793a124 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; [
diff --git a/packages/emacs.nix b/packages/emacs.nix
index 6d7dc744..450591b6 100644
--- a/packages/emacs.nix
+++ b/packages/emacs.nix
@@ -89,8 +89,8 @@ in
     js2-mode
     js2-refactor
     json-mode
-    kubernetes
-    kubernetes-evil
+    # kubernetes
+    # kubernetes-evil
     ledger-mode
     lsp-javascript-typescript
     lsp-mode
-- 
cgit 1.4.1