diff --git a/modules/home/tools/eza/default.nix b/modules/home/tools/eza/default.nix
new file mode 100644
index 0000000..dcc871c
--- /dev/null
+++ b/modules/home/tools/eza/default.nix
@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  namespace,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.${namespace}.tools.eza;
+in {
+  options.${namespace}.tools.eza = {
+    enable = mkEnableOption "eza";
+  };
+
+  config = mkIf cfg.enable {
+    programs.eza = {
+      enable = true;
+      icons = true;
+      git = true;
+    };
+  };
+}
diff --git a/modules/nixos/suites/desktop/default.nix b/modules/nixos/suites/desktop/default.nix
index 2c8143a..1a8cead 100644
--- a/modules/nixos/suites/desktop/default.nix
+++ b/modules/nixos/suites/desktop/default.nix
@@ -1,14 +1,13 @@
 {
-  options,
   config,
   lib,
-  pkgs,
   ...
-}:
-with lib; let
+}: let
+  inherit (lib) mkEnableOption mkIf;
+
   cfg = config.aa.suites.desktop;
 in {
-  options.aa.suites.desktop = with lib.types; {
+  options.aa.suites.desktop = {
     enable = mkEnableOption "common desktop configuration";
   };
 
diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix
index 7dfac5c..e83c1d3 100644
--- a/modules/nixos/suites/development/default.nix
+++ b/modules/nixos/suites/development/default.nix
@@ -14,9 +14,7 @@ in {
   config = mkIf cfg.enable {
     aa = {
       tools = {
-        eza.enable = true;
         gpg.enable = true;
-        zsh.enable = true;
       };
 
       apps = {
diff --git a/modules/nixos/tools/eza/default.nix b/modules/nixos/tools/eza/default.nix
deleted file mode 100644
index 26a8b7d..0000000
--- a/modules/nixos/tools/eza/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.aa.tools.eza;
-in {
-  options.aa.tools.eza = with types; {
-    enable = mkEnableOption "eza";
-  };
-
-  config = mkIf cfg.enable {
-    aa.home.extraOptions = {
-      programs.eza = {
-        enable = true;
-        icons = true;
-        git = true;
-      };
-    };
-  };
-}
diff --git a/systems/x86_64-do/proxy/default.nix b/systems/x86_64-do/proxy/default.nix
index 080479c..af8be39 100644
--- a/systems/x86_64-do/proxy/default.nix
+++ b/systems/x86_64-do/proxy/default.nix
@@ -26,8 +26,6 @@
         configureClientRouting = true;
       };
     };
-
-    tools.zsh.enable = true;
   };
 
   # Workaround for broken digital ocean image builds
diff --git a/systems/x86_64-vm/virt/default.nix b/systems/x86_64-vm/virt/default.nix
index 42d01a4..12863ab 100644
--- a/systems/x86_64-vm/virt/default.nix
+++ b/systems/x86_64-vm/virt/default.nix
@@ -18,10 +18,7 @@ with lib; {
     nix.enable = true;
 
     suites.desktop.enable = true;
-    tools.zsh.enable = true;
-    tools.eza.enable = true;
     apps.neovim.enable = true;
-    apps.tmux.enable = true;
   };
 
   users.users.virt = {