nix: bump template and t480s-work to nixos 20.03

Notable changes:
* add extraConfig for gpg-agent to define the path to the pinentry-program
* removed X11 session directory activation script

nix/home-manager/configuration/graphical-fullblown.nix

@@ -346,6 +346,8 @@ in {
       unstablepkgs.swagger-codegen
 
       # Misc Desktop Tools
+      # TODO: this may be required if brightness control isn't working
+      # brightnessctl
       ltunify
       # solaar # TODO: conflicts with solar over udev rules
       dex

nix/home-manager/profiles/qtile-desktop.nix

@@ -259,7 +259,8 @@ in {
 
   services = {
     gnome-keyring.enable = true;
-    blueman-applet.enable = true;
+    # TODO: this has been broken for a while, removing for now.
+    # blueman-applet.enable = true;
     screen-locker = {
       enable = true;
       inactiveInterval = 7;
@@ -273,6 +274,7 @@ in {
       enableScDaemon = true;
       enableSshSupport = true;
       grabKeyboardAndMouse = true;
+      extraConfig = "pinentry-program ${pkgs.pinentry-gtk2}/bin/pinentry";
     };
     flameshot.enable = true;
   };

nix/os/devices/steveej-t480s-work/hw.nix

@@ -31,6 +31,4 @@ in
     options kvm-intel enable_apicv=1
     options kvm-intel ept=1
   '';
-
-  hardware.brightnessctl.enable = false;
 }

nix/os/profiles/common/system.nix

@@ -30,9 +30,9 @@
   '';
 
   # Fonts, I18N, Date ...
-  fonts = {
+  fonts.fonts = [
-    enableCoreFonts = true;
+    pkgs.corefonts
-  };
+  ];
 
   i18n = {
     consoleFont = "lat9w-16";
@@ -52,12 +52,15 @@
     ln -sfT ${pkgs.bash}/bin/bash /bin/.bash
     mv -Tf /bin/.bash /bin/bash
   '';
-  system.activationScripts.etcX11sessinos = ''
+
-    echo "setting up /etc/X11/sessions..."
+  # TODO: find out if this workaround is still required from nixos 20.03 onwards
-    mkdir -p /etc/X11
+  # system.activationScripts.etcX11sessinos = ''
-    ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions
+  #   echo "setting up /etc/X11/sessions..."
-    mv -Tf /etc/X11/.sessions /etc/X11/sessions
+  #   mkdir -p /etc/X11
-  '';
+  #   ln -sfT ${config.services.xserver.displayManager.session.desktops} /etc/X11/.sessions
+  #   mv -Tf /etc/X11/.sessions /etc/X11/sessions
+  # '';
+
   system.activationScripts.lib64 = ''
     echo "setting up /lib64..."
     mkdir -p /lib64

nix/pkgs/default.nix

@@ -64,7 +64,6 @@ in rec {
     });
 
   duplicacy = pkgs.callPackage ../pkgs/duplicacy {};
-  just = pkgs.callPackage ../pkgs/just.nix {};
   mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
   staruml = pkgs.callPackage ../pkgs/staruml.nix { inherit (pkgs.gnome2) GConf; libgcrypt = pkgs.libgcrypt_1_5; };
 }

nix/variables/versions.tmpl.nix

@@ -1,7 +1,7 @@
 {
   channelsNixosStable = {
-    ref = "nixos-19.09";
+    ref = "nixos-20.03";
-    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-19.09 | awk '{ print $1 }' | tr -d '\n' -%>";
+    rev = "<% git ls-remote https://github.com/nixos/nixpkgs-channels nixos-20.03 | awk '{ print $1 }' | tr -d '\n' -%>";
   };
   channelsNixosUnstable = {
     ref = "nixos-unstable";