update to NixOS 21.05

home/home.nix

@@ -8,15 +8,13 @@ let
   nur = import <NUR> { inherit pkgs; };
   myNur = nur.repos.schmittlauch;
   mybrowser = firefox;
-  newkde = import ~/src/newkdepkgs { };
 
   desktopApps = [
     mybrowser
     falkon
     thunderbird
     calibre
-    mupdf
-    unstable.dino
+    dino
     zotero
     keepassxc
     ding
@@ -31,7 +29,7 @@ let
     alacritty
     libreoffice-fresh
     backintime-common
-    unstable.anki-bin
+    anki-bin
     signal-desktop
     (tor-browser-bundle-bin.override { mediaSupport = true; pulseaudioSupport = true; })
     pdfpc
@@ -39,8 +37,7 @@ let
     nheko
     gpx-viewer
     gpxsee
-    unstable.cawbird
-    olifant
+    cawbird
     subsurface
     yate
     # split and merge PDFs in a GUI
@@ -68,7 +65,7 @@ let
   ]
   ++ (
     with gimpPlugins; [
-      resynthesizer2
+      resynthesizer
       fourier
       lqrPlugin
     ]
@@ -119,18 +116,17 @@ let
     reptyr # re-bind running program to other tty
     xclip
     unzip
-    myNur.lolcommits # from overlay
+    myNur.lolcommits # from NUR
   ];
 
   nixHelpers = [
     lorri
     nix-review
     nixpkgs-fmt
-    pypi2nix
   ];
 
-  kdeTools = with kdeApplications; [
-    newkde.okular
+  kdeTools = with plasma5Packages; with kdeGear; [
+    okular
     gwenview
     yakuake
     kmail
@@ -159,8 +155,8 @@ let
     with kdeFrameworks; [
       networkmanager-qt
       kcrash
-      plasma5.breeze-gtk
-      libsForQt5.phonon-backend-vlc
+      breeze-gtk
+      phonon-backend-vlc
       #(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
     ]
   );
@@ -227,10 +223,7 @@ let
     jedi
     flake8
     mypy
-  ]
-  ++ (
-    with python2Packages; [ ]
-  );
+  ];
 
 
   fonts = [
@@ -249,7 +242,6 @@ let
   games = [
     superTuxKart
     #hedgewars
-    steam-run-native
   ];
 
 in

nixos/configuration.nix

@@ -14,8 +14,6 @@ in
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./packages.nix
-      # home manager integration
-      <home-manager/nixos>
     ];
 
   services.davfs2.enable = true;
@@ -24,7 +22,7 @@ in
   #boot.kernelPackages = pkgs.linuxPackages_latest;
 
   # use old kernel because 5.4 and 5.5 might be buggy with intel graphics
-  boot.kernelPackages = pkgs.linuxPackages_4_19;
+  #boot.kernelPackages = pkgs.linuxPackages_4_19;
 
   services.fstrim.enable = true;
   services.btrfs.autoScrub =
@@ -128,7 +126,7 @@ in
   # Bluetooth
   hardware.bluetooth = {
     enable = true;
-    config.General.Disable = "Headset"; # disable headset profile
+    settings.General.Disable = "Headset"; # disable headset profile
   };
   hardware.pulseaudio.package = pkgs.pulseaudioFull;
 
@@ -160,7 +158,6 @@ in
     extraGroups = [ "vboxusers" "wheel" "networkmanager" "scanner" "lp" "wireshark" "dialout" "cdrom" "input" "adbusers" ];
     shell = pkgs.zsh;
   };
-  #home-manager.users.spiollinux = import "${users.users.spiollinux.home}/nixconfigs/home/home.nix" { pkgs, ...};
 
   # enable virtualbox support
   virtualisation.virtualbox.host = {
@@ -188,7 +185,7 @@ in
 
 
   fonts = {
-    enableFontDir = true;
+    fontDir.enable = true;
     fontconfig.enable = true;
     fontconfig.includeUserConf = true;
   };

nixos/hardware-configuration.nix

@@ -11,7 +11,7 @@ in
       (
         builtins.fetchGit {
           url = "https://github.com/NixOS/nixos-hardware";
-          rev = "62a1812f3c20b7119013650f926806fecd956574";
+          rev = "d38958a6aa5bdbf3239f26a04689f3d9ae7da0c0";
         } + "/lenovo/thinkpad/t440s"
       )
     ];

nixos/packages.nix

@@ -40,9 +40,9 @@
     networkmanager-openconnect
     networkmanager-vpnc
     networkmanager-openvpn
-    kdeApplications.akonadi-mime # for KOrganizer
+    plasma5Packages.kdeGear.akonadi-mime # for KOrganizer
     ]
-  ++ (with plasma5; with kdeApplications; [
+  ++ (with plasma5Packages; with kdeGear; [
     #akonadi
     #akonadi-calendar
     #akonadi-contacts