diff --git a/flake.nix b/flake.nix
index d1f7576..c752719 100644
--- a/flake.nix
+++ b/flake.nix
@@ -126,11 +126,7 @@
 
       outputs-builder = channels: {
         formatter = channels.nixpkgs.nixfmt-tree;
-        apps.default = {
-          type = "app";
-          program = "${channels.nixpkgs.home-manager}/bin/home-manager";
-          inherit (channels.nixpkgs.home-manager) meta;
-        };
+        defaultApp = lib.flake-utils-plus.mkApp { drv = channels.nixpkgs.home-manager; };
       };
 
     };
diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 391c8b7..7a89b9c 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -131,6 +131,7 @@ in
         freerdp
         file
         firefox
+        freerdp
         gh
         gimp
         git
@@ -151,6 +152,7 @@ in
         kbfs
         libu2f-host
         mosh
+        mosh
         nixpkgs-fmt
         opensc
         pasystray