From 87bd443af3e7a1a1866883abe06a88b2c36b2810 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Mar 2019 00:05:12 +0100
Subject: [PATCH] steveej-t480s-work: upgrade to nixos 19.03

---
 nix/home-manager/configuration/graphical-fullblown.nix | 6 +++---
 nix/home-manager/programs/chromium.nix                 | 2 +-
 nix/home-manager/programs/neovim.nix                   | 6 ++++--
 nix/os/devices/steveej-t480s-work/versions.tmpl.nix    | 4 ++--
 nix/os/profiles/common/user.nix                        | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index b74f3b0..f3f13b1 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -152,7 +152,7 @@ in {
       # virtualbox
       vagrant
       rkt
-      python27Packages.docker_compose
+      # 2019-03-05: missing on 19.03 python27Packages.docker_compose
       # unstablepkgs.kubernetes
       unstablepkgs.minikube
       unstablepkgs.openshift
@@ -185,7 +185,7 @@ in {
       iperf
       bind
       socat
-      linssid
+      # 2019-03-05: broken on 19.03 linssid
       iptraf-ng
       ipmitool
 
@@ -324,7 +324,7 @@ in {
       bazel
 
       ## Android
-      androidsdk
+      # 2019-03-05: missing on 19.03 androidsdk
 
       ## Java
       # jre
diff --git a/nix/home-manager/programs/chromium.nix b/nix/home-manager/programs/chromium.nix
index 95f161f..0585746 100644
--- a/nix/home-manager/programs/chromium.nix
+++ b/nix/home-manager/programs/chromium.nix
@@ -9,7 +9,7 @@
 
   nixpkgs.config = {
     chromium = {
-      enablePepperPDF = true;
+      # 2019-03-05: missing on 19.03 enablePepperPDF = true;
       enablePepperFlash = false;
     };
   };
diff --git a/nix/home-manager/programs/neovim.nix b/nix/home-manager/programs/neovim.nix
index 1c250ae..3e599ec 100644
--- a/nix/home-manager/programs/neovim.nix
+++ b/nix/home-manager/programs/neovim.nix
@@ -93,6 +93,8 @@ in {
               "sha256" = "181siphb87yzln9433159ssa6vmm1h2dd0kqhlx7bgsi51gng4rv";
             };
           };
+
+          tlib = vimPlugins.tlib_vim;
         };
 
         pluginDictionaries = let 
@@ -126,7 +128,7 @@ in {
             "git-blame"
 
             # Nix
-            "vim-addon-nix"
+            "vim-addon-nix" "tlib"
             "vim-addon-vim2nix"
 
             # LaTeX
@@ -146,7 +148,7 @@ in {
             "vim-markdown-toc"
 
             # misc syntax support
-            "vim-bazel"
+            "vim-bazel" "maktaba"
           ];
         in [
           { names = default; }
diff --git a/nix/os/devices/steveej-t480s-work/versions.tmpl.nix b/nix/os/devices/steveej-t480s-work/versions.tmpl.nix
index af2236a..93b44b8 100644
--- a/nix/os/devices/steveej-t480s-work/versions.tmpl.nix
+++ b/nix/os/devices/steveej-t480s-work/versions.tmpl.nix
@@ -1,7 +1,7 @@
 {
   channelsNixosStable = {
-    ref = "nixos-18.09";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-18.09 | awk '{ print $1 }' | tr -d '\n' -%>";
+    ref = "nixos-19.03";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.03 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
   channelsNixosUnstable = {
     ref = "nixos-unstable";
diff --git a/nix/os/profiles/common/user.nix b/nix/os/profiles/common/user.nix
index 97294ee..673bc49 100644
--- a/nix/os/profiles/common/user.nix
+++ b/nix/os/profiles/common/user.nix
@@ -13,6 +13,6 @@ in {
     uid = 1000;
   };
 
-  security.pam.enableU2F = true;
+  security.pam.u2f.enable = true;
   security.pam.services.steveej.u2fAuth = true;
 }