diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix
index 89fbd3d..1f108a8 100644
--- a/hosts/FredOS-Macbook.nix
+++ b/hosts/FredOS-Macbook.nix
@@ -1,36 +1,32 @@
 # hosts/FredOS-Macbook.nix
 { config, pkgs, lib, ... }:
 {
-  imports = lib.optionals (config.networking.hostName == "FredOS-Macbook") [
-    ../settings/gnome.nix
+config = lib.mkIf (config.networking.hostName == "FredOS-Macbook") {
+  environment.systemPackages = with pkgs; [
+    # Package names here
   ];
   
-  config = lib.mkIf (config.networking.hostName == "FredOS-Macbook") {
-    environment.systemPackages = with pkgs; [
-      # Package names here
-    ];
-    
-    # Bootloader
-    boot = {
-      loader = {
-        systemd-boot.enable = true;
-        efi.canTouchEfiVariables = true;
-      };
-      
-      # Enable Broadcom WL for Macbook
-      extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-      
-      blacklistedKernelModules = [
-        "b43"
-        "bcma"
-        "ssb"
-      ];
+  # Bootloader
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
     };
     
-    hardware.enableRedistributableFirmware = true;
+    # Enable Broadcom WL for Macbook
+    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
     
-    nixpkgs.config.permittedInsecurePackages = [
-      "broadcom-sta-6.30.223.271-59-6.17.9"
+    blacklistedKernelModules = [
+      "b43"
+      "bcma"
+      "ssb"
     ];
   };
+  
+  hardware.enableRedistributableFirmware = true;
+  
+  nixpkgs.config.permittedInsecurePackages = [
+    "broadcom-sta-6.30.223.271-59-6.17.9"
+  ];
+};
 }