diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix
--- a/nixos/ryu/configuration.nix
+++ b/nixos/ryu/configuration.nix
@@ -4,12 +4,9 @@ lib,
   ...
 }: {
   imports = [
-    # Include the results of the hardware scan.
     ./ryu.nix
     ./services
     ./programs
-    ./apps
-    # ./vms
   ];
 
   sops = {
@@ -19,39 +16,10 @@ age.keyFile = "/home/servius/.config/sops/age/keys.txt";
   };
 
   programs = {
-    appimage = {
-      enable = true;
-      binfmt = true;
-    };
-    localsend = {
-      enable = true;
-      openFirewall = true;
-    };
-    obs-studio = {
-      enable = true;
-      enableVirtualCamera = true;
-      plugins = [
-        pkgs.obs-studio-plugins.wlrobs
-        pkgs.obs-studio-plugins.droidcam-obs
-      ];
-    };
-    _1password.enable = true;
-    _1password-gui = {
-      enable = true;
-      polkitPolicyOwners = ["servius"];
-    };
-    adb.enable = true;
     hyprland = {
       enable = true;
       # withUWSM = true;
       xwayland.enable = true;
-    };
-    yubikey-touch-detector.enable = true;
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-      remotePlay.openFirewall = true;
-      dedicatedServer.openFirewall = true;
     };
     nix-ld = {
       enable = true;
diff --git a/nixos/ryu/programs/1password.nix b/nixos/ryu/programs/1password.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/1password.nix
@@ -0,0 +1,9 @@
+{...}: {
+  programs = {
+    _1password.enable = true;
+    _1password-gui = {
+      enable = true;
+      polkitPolicyOwners = ["servius"];
+    };
+  };
+}
diff --git a/nixos/ryu/programs/adb.nix b/nixos/ryu/programs/adb.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/adb.nix
@@ -0,0 +1,3 @@
+{...}: {
+  programs.adb.enable = true;
+}
diff --git a/nixos/ryu/programs/appimage.nix b/nixos/ryu/programs/appimage.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/appimage.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.appimage = {
+    enable = true;
+    binfmt = true;
+  };
+}
diff --git a/nixos/ryu/programs/default.nix b/nixos/ryu/programs/default.nix
--- a/nixos/ryu/programs/default.nix
+++ b/nixos/ryu/programs/default.nix
@@ -4,6 +4,11 @@ lib,
   ...
 }: {
   imports = [
-    # ./nh.nix
+    ./adb.nix
+    ./steam.nix
+    ./1password.nix
+    ./localsend.nix
+    ./appimage.nix
+    ./obs-studio.nix
   ];
 }
diff --git a/nixos/ryu/programs/localsend.nix b/nixos/ryu/programs/localsend.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/localsend.nix
@@ -0,0 +1,6 @@
+{...}: {
+  programs.localsend = {
+    enable = true;
+    openFirewall = true;
+  };
+}
diff --git a/nixos/ryu/programs/obs-studio.nix b/nixos/ryu/programs/obs-studio.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/obs-studio.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs = {
+    obs-studio = {
+      enable = true;
+      enableVirtualCamera = true;
+      plugins = [
+        pkgs.obs-studio-plugins.wlrobs
+        pkgs.obs-studio-plugins.droidcam-obs
+      ];
+    };
+  };
+}
diff --git a/nixos/ryu/programs/steam.nix b/nixos/ryu/programs/steam.nix
new file mode 100644
--- /dev/null
+++ b/nixos/ryu/programs/steam.nix
@@ -0,0 +1,8 @@
+{...}: {
+  programs.steam = {
+    enable = true;
+    gamescopeSession.enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+}