update

hosts/macbook/configuration.nix

@@ -5,56 +5,26 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.darwinModules.default
+    ../../modules/common/common.nix
     ../../modules/nix-darwin/system.nix
     ../../modules/nix-darwin/aerospace.nix
-    ../../modules/nixos/neovim.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.config.allowBroken = true;
-
-  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
 
   networking.hostName = "macbook";
 
   system.primaryUser = "mthomson";
 
-  nix.settings = {
-    trusted-users = ["mthomson"];
-
-    substituters = [
-      "https://cache.nixos.org"
-      "https://nix-community.cachix.org"
-    ];
-
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
   users.users.mthomson = {
     home = "/Users/mthomson";
   };
 
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
   environment.systemPackages = with pkgs; [
     man-pages
     man-pages-posix
   ];
 
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    backupFileExtension = "backup";
-    users = {
-      mthomson = import ./home.nix;
-    };
-  };
-
   system.stateVersion = 5;
 
   # fix for this: https://github.com/LnL7/nix-darwin/issues/1346

hosts/macbook/home.nix

@@ -30,13 +30,6 @@
 
   home.packages = with pkgs; [
     hidden-bar
-    presenterm
-    (azure-cli.withExtensions [
-      azure-cli.extensions.containerapp
-    ])
-    nh
-    todo-txt-cli
-    age
   ];
 
   programs.home-manager.enable = true;