diff --git a/home/programs/kodi.nix b/home/programs/kodi.nix
index b956d0c..a4afd14 100644
--- a/home/programs/kodi.nix
+++ b/home/programs/kodi.nix
@@ -1,5 +1,10 @@
-{pkgs, ...}: {
-  home.packages = [
+{
+  pkgs,
+  osConfig,
+  lib,
+  ...
+}: {
+  home.packages = lib.mkIf osConfig.niksos.desktop.apps [
     (pkgs.kodi-wayland.withPackages (exts: [exts.inputstream-adaptive exts.inputstreamhelper]))
   ];
 }
diff --git a/home/programs/nixcord.nix b/home/programs/nixcord.nix
index b64db78..9a72e27 100644
--- a/home/programs/nixcord.nix
+++ b/home/programs/nixcord.nix
@@ -1,6 +1,6 @@
 {osConfig, ...}: {
   programs.nixcord = {
-    enable = true;
+    enable = osConfig.niksos.desktop.apps;
     discord.enable = false;
     vesktop.enable = true;
     vesktopConfig = {
diff --git a/home/programs/other.nix b/home/programs/other.nix
index fd53b51..4c0b742 100644
--- a/home/programs/other.nix
+++ b/home/programs/other.nix
@@ -4,7 +4,7 @@
   osConfig,
   ...
 }: {
-  home.packages = [
+  home.packages = lib.mkIf osConfig.niksos.desktop.apps [
     pkgs.spotify
     pkgs.signal-desktop
   ];
diff --git a/home/shell/git.nix b/home/shell/git.nix
index 1c81438..83ae2a0 100644
--- a/home/shell/git.nix
+++ b/home/shell/git.nix
@@ -7,6 +7,6 @@
       extraConfig.push.autoSetupRemote = true;
       lfs.enable = true;
     };
-    git-credential-oauth.enable = true;
+    git-credential-oauth.enable = true; #FIXME: need to relogin for each push for some reason.
   };
 }
diff --git a/home/shell/other.nix b/home/shell/other.nix
index bee2c7d..cdc4e5a 100644
--- a/home/shell/other.nix
+++ b/home/shell/other.nix
@@ -7,13 +7,15 @@
 }: let
   inherit (lib) optionals;
   inherit (osConfig.niksos.hardware) bluetooth portable;
+  inherit (osConfig.niksos.desktop) apps;
 in {
   home.packages =
     [
       pkgs.ripgrep
+      pkgs.fzf
+
       pkgs.p7zip
       pkgs.dua
-      pkgs.ffmpeg
 
       pkgs.usbutils
       pkgs.pciutils
@@ -21,6 +23,12 @@ in {
       pkgs.aria2
       pkgs.file
     ]
+    ++ optionals apps [
+      # Kinda don't need to include these on more minimal installs.
+      pkgs.ffmpeg
+      pkgs.imagemagick
+      pkgs.ghostscript
+    ]
     ++ optionals bluetooth [
       pkgs.ear2ctl
     ]
diff --git a/home/shell/transfer.nix b/home/shell/transfer.nix
deleted file mode 100644
index 97eaaf5..0000000
--- a/home/shell/transfer.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  pkgs,
-  osConfig,
-  ...
-}: {
-  home.packages = [
-    (pkgs.writeShellScriptBin "transfer" ''
-      PASSWORD=$(sed 's/.*="\(.*\)"/\1/' ${osConfig.age.secrets.transferSh.path})
-
-
-      if [ -z "$PASSWORD" ]; then
-        echo "Error: Password not found."
-        return 1
-      fi
-
-      file_path="$1"
-      if [ -z "$file_path" ]; then
-        echo "Usage: transfer <file>"
-        return 1
-      fi
-
-      response=$(curl -sD - --user "jsw:$PASSWORD" --progress-bar --upload-file "$file_path" "https://share.jsw.tf/$(basename "$file_path")")
-
-      if [ $? -eq 0 ]; then
-          DELETE=$(echo "$response" | grep x-url-delete | sed "s/.*\///")
-          URL=$(echo "$response" | tail -n1)
-
-          echo "Delete code: $DELETE"
-          echo "URL: $URL"
-      else
-        echo "Upload failed."
-        return 1
-      fi
-      echo
-    '')
-  ];
-}