upgrade to NixOS 19.09

home/home.nix

@@ -13,7 +13,7 @@ let
     thunderbird
     calibre
     dino
-    unstable.zotero
+    zotero
     keepassxc
     ding
     aspell
@@ -33,22 +33,11 @@ let
     virtualbox
     pdfpc
     quaternion
-    unstable.nheko
+    nheko
     wire-desktop
     gpx-viewer
     gpxsee
-    (corebird.overrideAttrs (oldAttrs: {src = fetchFromGitHub {
-        owner = "IBBoard";
-        repo = "corebird";
-        rev = "bc758889a5ac304101001c36eafdb219a0acfda7";
-        sha256 = "1yiflxvswrybabqq5cd6x9i740560c23p58gvcn9b6riwhxzrlb9";
-        };}))
-#    (corebird.overrideAttrs (oldAttrs: {src = fetchFromGitHub {
-#        owner = "nextbird";
-#        repo = "nextbird";
-#        rev = "c5d1f4edc60634746a0c56d2430ec7933dd8c16e";
-#        sha256 = "0iwg6brwbbmapsh559my7zwhg91xb88w4kq3sqykc6cd3dvyr9xy";
-#        };}))
+    cawbird
     tootle
     subsurface
     (pkgs.pidgin-with-plugins.override {
@@ -56,11 +45,14 @@ let
 
     # for Hibiscus banking software
     jameica
+    #ToDo: which of these drivers is actually used?
+    geckodriver
+    chromedriver
     ];
 
   graphicsApps = [
     inkscape
-    unstable.darktable
+    darktable
     hugin
     luminanceHDR
     exiftool
@@ -75,10 +67,10 @@ let
   multimediaApps = [
     mpv
     vlc
-    #amarok-kf5
+    #amarok
     clementine
     youtube-dl
-    sonic-pi
+    #sonic-pi
     musescore
     audacity
     avidemux
@@ -119,8 +111,9 @@ let
     ];
 
   nixHelpers = [
-    nox
     lorri
+    nix-review
+    nixpkgs-fmt
     ];
 
   kdeTools = with kdeApplications; [
@@ -180,7 +173,7 @@ let
 
   latexApps = [
     texmaker
-    unstable.kile
+    kile
     biber
     # customize texlive installation
     (texlive.combine {
@@ -236,7 +229,7 @@ let
   ];
 
   games = [
-    unstable.superTuxKart
+    superTuxKart
     hedgewars
     steam-run-native
   ];

nixos/configuration.nix

@@ -16,6 +16,8 @@ in {
         url = "https://github.com/NixOS/nixos-hardware";
         rev = "a9033dcc5fc57b67bd30ec02a585c6054d14d67d";
       } + "/lenovo/thinkpad/t440s")
+      # home manager integration
+      <home-manager/nixos>
     ];
 
   # encrypted partitions
@@ -145,6 +147,7 @@ in {
     extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" ];
     shell = pkgs.zsh;
   };
+  #home-manager.users.spiollinux = import "${users.users.spiollinux.home}/nixconfigs/home/home.nix" { pkgs, ...};
 
   # wireshark noroot gropu
   users.groups.wireshark.gid = 500;