3 files changed, 2 insertions, 14 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;