diff --git a/features/wine.nix b/features/wine.nix
new file mode 100644
index 0000000..8995e02
--- /dev/null
+++ b/features/wine.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  environment = {
+    systemPackages = with pkgs; [
+      wineWow64Packages.full
+      winetricks
+    ];
+
+    sessionVariables = {
+      WINE = "${pkgs.wineWow64Packages.full}/bin/.wine";
+      WINEPREFIX = "$XDG_DATA_HOME/wine";
+    };
+  };
+}
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index 5b63f88..9ff56ee 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   lib,
   inputs,
@@ -17,6 +16,7 @@
     ../../features/sudo.nix
     ../../features/sops.nix
     ../../features/users.nix
+    ../../features/wine.nix
     ./nix-package-manager.nix
   ];
 
@@ -54,18 +54,6 @@
   services = {
     flatpak = {
       packages = [
-        {
-          appId = "org.nmap.Zenmap";
-          origin = "flathub";
-        }
-        {
-          appId = "com.github.dynobo.normcap";
-          origin = "flathub";
-        }
-        {
-          appId = "com.usebottles.bottles";
-          origin = "flathub";
-        }
         {
           appId = "io.github.ungoogled_software.ungoogled_chromium";
           origin = "flathub";
@@ -74,15 +62,9 @@
           appId = "org.gtk.Gtk3theme.Breeze";
           origin = "flathub";
         }
-        {
-          appId = "io.mpv.Mpv";
-          origin = "flathub";
-        }
       ];
     };
 
-    # Configures snapshots for home subvolume.
-    # Requires /home/.snapshots subvolume to function.
     snapper = {
       snapshotInterval = "hourly";
       cleanupInterval = "1d";
@@ -107,7 +89,6 @@
       };
     };
 
-    # Enable KMSCON DRM TTY.
     kmscon = {
       enable = true;
       config = {
@@ -117,8 +98,6 @@
       };
     };
 
-    # Configure pipewire. Disables 32Bit ALSA since it causes build errors
-    # and is largely vestigial.
     pipewire = {
       enable = true;
       pulse.enable = true;
@@ -197,6 +176,7 @@
         affinity-v3
         libreoffice-qt
         qimgv
+        mpv
         vorta
         distrobox
         rtk
diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix
index 5ae4f29..a9149c5 100644
--- a/hosts/shared/nixos-server.nix
+++ b/hosts/shared/nixos-server.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   ...
 }: