diff --git a/hosts/wynne/default.nix b/hosts/wynne/default.nix
index f8be441..e6f3b1a 100644
--- a/hosts/wynne/default.nix
+++ b/hosts/wynne/default.nix
@@ -1,5 +1,27 @@
-_: {
-  imports = [ ./hardware ./programs ./services ./network.nix ./security.nix ];
+{ lib, ... }: {
+  imports = [
+    ./hardware
+    ./programs
+    ./services
+    ./network.nix
+    ./security.nix
+  ];
+
+  documentation = {
+    enable = lib.mkDefault false;
+    doc.enable = lib.mkDefault false;
+    info.enable = lib.mkDefault false;
+    man.enable = lib.mkDefault false;
+    nixos.enable = lib.mkDefault false;
+  };
+
+  xdg = {
+    autostart.enable = lib.mkDefault false;
+    icons.enable = lib.mkDefault false;
+    mime.enable = lib.mkDefault false;
+    sounds.enable = lib.mkDefault false;
+  };
+
   i18n = {
     defaultLocale = "en_US.UTF-8";
     extraLocaleSettings = {
diff --git a/hosts/wynne/programs/default.nix b/hosts/wynne/programs/default.nix
index 00dca37..06e0843 100644
--- a/hosts/wynne/programs/default.nix
+++ b/hosts/wynne/programs/default.nix
@@ -1,17 +1,17 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   imports = [
     ./neovim.nix
     ./starship.nix
     ./zsh.nix
   ];
 
-  programs.git.enable = true;
+  programs = {
+    command-not-found.enable = lib.mkDefault false;
+    git.enable = true;
+  };
 
   environment.systemPackages = with pkgs; [
     sops
     age
-    libraspberrypi
-    raspberrypi-eeprom
   ];
-
 }