8 files changed, 10 insertions, 28 deletions

diff --git a/usecases/desktop/graphical/mpv.nix b/usecases/desktop/graphical/mpv.nix
index 381b893..219c86c 100644
--- a/usecases/desktop/graphical/mpv.nix
+++ b/usecases/desktop/graphical/mpv.nix
@@ -9,8 +9,7 @@ inputs:
       hwdec = "auto";
       profile = "gpu-hq";
     };
-    # TODO: for 21.05
-    #defaultProfiles = [ "gpu-hq" ];
+    defaultProfiles = [ "gpu-hq" ];
     scripts = with pkgs.mpvScripts; [ mpris sponsorblock ];
   };
 }
diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix
index ab04de3..ab5d997 100644
--- a/usecases/desktop/graphical/sway.nix
+++ b/usecases/desktop/graphical/sway.nix
@@ -171,8 +171,6 @@ in
       };
     };
 
-    # TODO: 21.05
-    /*
     services.wlsunset = {
       enable = true;
       latitude = "48.864716";
@@ -184,7 +182,6 @@ in
       };
       systemdTarget = "sway-session.target";
     };
-    */
 
     # TODO: upstream a PR to beautify this
     xdg.configFile."swaylock/config".text = with globalConfig.theme.colors; ''
@@ -254,8 +251,7 @@ in
 
   environment.systemPackages = with pkgs; [ qt5.qtwayland ];
 
-  # TODO: in 21.05
-  #programs.xwayland.enable = true;
+  programs.xwayland.enable = true;
   security.pam.services.swaylock = { };
 
   xdg.portal.extraPortals = with pkgs; [
diff --git a/usecases/desktop/pipewire.nix b/usecases/desktop/pipewire.nix
index e742ba9..cd327ee 100644
--- a/usecases/desktop/pipewire.nix
+++ b/usecases/desktop/pipewire.nix
@@ -3,13 +3,6 @@ inputs:
 { pkgs, ... }:
 
 {
-  imports = [
-    (inputs.nixpkgs-unstable.outPath + "/nixos/modules/services/desktops/pipewire/pipewire.nix")
-    (inputs.nixpkgs-unstable.outPath + "/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix")
-  ];
-
-  disabledModules = [ "services/desktops/pipewire.nix" ];
-
   services.pipewire = {
     enable = true;
     package = pkgs.unstable.pipewire;
diff --git a/usecases/server/hydra-server.nix b/usecases/server/hydra-server.nix
index 3a1d62e..db09a6e 100644
--- a/usecases/server/hydra-server.nix
+++ b/usecases/server/hydra-server.nix
@@ -15,9 +15,8 @@ inputs:
   config = {
     services.hydra = {
       enable = true;
-      # TODO: for NixOS 21.05
-      #hydraURL = "https://hydra.${config.networking.fqdn}";
-      #notificationSender = "hydra@${config.networking.fqdn}";
+      hydraURL = "https://hydra.${config.networking.fqdn}";
+      notificationSender = "hydra@${config.networking.fqdn}";
       buildMachinesFiles = [ ];
       # Don't build *everything* from source
       useSubstitutes = true;
diff --git a/usecases/server/jellyfin.nix b/usecases/server/jellyfin.nix
index 0e0a0e4..6f62c34 100644
--- a/usecases/server/jellyfin.nix
+++ b/usecases/server/jellyfin.nix
@@ -3,7 +3,6 @@ inputs:
 { config, lib, pkgs, ... }:
 
 {
-  # TODO: for NixOS 21.05
   imports = [
     (inputs.nixpkgs-unstable.outPath + "/nixos/modules/services/misc/jellyfin.nix")
   ];
diff --git a/usecases/server/monitoring-server.nix b/usecases/server/monitoring-server.nix
index 823f4f9..c39b145 100644
--- a/usecases/server/monitoring-server.nix
+++ b/usecases/server/monitoring-server.nix
@@ -12,9 +12,7 @@ inputs:
 
     listenAddress = "127.0.0.1";
 
-    # TODO: for NixOS 21.05
-    extraFlags = [ "--storage.tsdb.retention=15w" ];
-    #retentionTime = "15w";
+    retentionTime = "15w";
 
     scrapeConfigs = [
       {
diff --git a/usecases/server/radicale.nix b/usecases/server/radicale.nix
index a998643..b20bff8 100644
--- a/usecases/server/radicale.nix
+++ b/usecases/server/radicale.nix
@@ -3,13 +3,12 @@ inputs:
 { config, ... }:
 
 {
-  # TODO: use RFC42 settings for NixOS 21.05
   services.radicale = {
     enable = true;
-    config = ''
-      [server]
-      hosts = ${config.topology.mainVpn.currentNodeIP}:5232
-    '';
+    settings = {
+      # Bind address on VPN interface only
+      server.hosts = "[${config.topology.mainVpn.currentNodeIP}]:5232";
+    };
   };
 
   networking.firewall.interfaces.${config.topology.mainVpn.interfaceName}.allowedTCPPorts = [
diff --git a/usecases/server/taskserver.nix b/usecases/server/taskserver.nix
index e459e5c..614828c 100644
--- a/usecases/server/taskserver.nix
+++ b/usecases/server/taskserver.nix
@@ -5,8 +5,7 @@ inputs:
 {
   services.taskserver = {
     enable = true;
-    # TODO: for NixOS 21.05
-    #fqdn = "tasks.${config.networking.fqdn}";
+    fqdn = "tasks.${config.networking.fqdn}";
     listenHost = config.topology.mainVpn.currentNodeIP;
 
     organisations.default.users = [ "minijackson" ];