From 29d9a4ef16f1cb7bbcd40de07ff7609977d108fc Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Sun, 8 Mar 2020 02:10:28 +0100
Subject: [PATCH] upgrade to NixOS 20.03

---
 home/home.nix           |  7 +++----
 nixos/configuration.nix | 12 ++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index eac995a..2da9022 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -41,11 +41,11 @@ let
     pdfpc
     quaternion
     nheko
-    (unstable.spectral)
+    unstable.spectral
     wire-desktop
     gpx-viewer
     gpxsee
-    unstable.cawbird
+    cawbird
     tootle
     subsurface
     (
@@ -248,7 +248,6 @@ let
     ubuntu_font_family
     twemoji-color-font
     opensans-ttf
-    (iosevka.override { design = [ "slab" "term" ]; set = "serif"; })
     (iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; })
     # TODO: vollkorn
     # TODO: humor-sans
@@ -298,7 +297,7 @@ in
     {
       enable = true;
       enableSshSupport = true;
-      #pinentryFlavor = "qt";
+      pinentryFlavor = "qt";
     };
 
   programs.ssh =
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index ea7159b..21f5eb0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -18,7 +18,7 @@ in
       (
         builtins.fetchGit {
           url = "https://github.com/NixOS/nixos-hardware";
-          rev = "c0182a06982f82a47356c91d78d80d2af29bd7f1";
+          rev = "62a1812f3c20b7119013650f926806fecd956574";
         } + "/lenovo/thinkpad/t440s"
       )
       # home manager integration
@@ -44,7 +44,7 @@ in
   services.davfs2.enable = true;
 
   # try newer kernels
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  #boot.kernelPackages = pkgs.linuxPackages_latest;
 
   services.fstrim.enable = true;
   services.btrfs.autoScrub =
@@ -82,10 +82,14 @@ in
   networking.hostName = "thinknix";
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
+  # configure console
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de";
+  };
+
   # Select internationalisation properties.
   i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "de";
     defaultLocale = "de_DE.UTF-8";
   };