reorganize

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "home/nvim"]
-	path = home/nvim
-	url = https://github.com/michaelthomson0797/nvim.git

flake.lock

@@ -20,6 +20,26 @@
         "type": "github"
       }
     },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709001452,
+        "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "6c06334f0843c7300d1678726bb607ce526f6b36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1708296515,
@@ -39,6 +59,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -3,23 +3,33 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    home-manager = {
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-darwin = {
+      url = "github:LnL7/nix-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
+  outputs = inputs@{ self, nixpkgs, home-manager, nix-darwin, ... }: {
     nixosConfigurations = {
       nixos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-          ./system
+          ./hosts/nixos/configuration.nix
+        ];
+      };
+    };
 
-	  home-manager.nixosModules.home-manager {
+    darwinConfigurations = {
-            home-manager.useGlobalPkgs = true;
+      macbook = nix-darwin.lib.darwinSystem {
-	    home-manager.useUserPackages = true;
+        system = "aarch64-darwin";
-	    home-manager.users.mthomson = import ./home;
+        specialArgs = { inherit inputs; };
-	  }
+        modules = [
+          ./hosts/macbook/configuration.nix
         ];
       };
     };

home/nvim

@@ -1 +0,0 @@
-Subproject commit ccd3d56eb3097febe89dccbfa39be088386e85b3

hosts/macbook/configuration.nix

@@ -0,0 +1,25 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      inputs.home-manager.nixosModules.default
+    ];
+
+  environment.systemPackages = with pkgs; [
+    hello
+  ];
+
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      "mthomson" = import ./home.nix;
+    };
+  };
+
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
+  nix.package = pkgs.nix;
+}

hosts/macbook/home.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home-manager/wezterm
+  ];
+  home.username = "mthomson";
+  home.homeDirectory = "/Users/mthomson";
+  home.stateVersion = "23.11";
+
+  home.packages = with pkgs; [
+    hello
+    cowsay
+  ];
+
+  programs.home-manager.enable = true;
+  programs.git.enable = true;
+}

hosts/nixos/configuration.nix

@@ -8,6 +8,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      inputs.home-manager.nixosModules.default
     ];
 
 # Bootloader.
@@ -90,6 +91,15 @@
 
   environment.variables.EDITOR = "nvim";
 
+  home-manager = {
+    extraSpecialArgs = { inherit inputs; };
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users = {
+      "mthomson" = import ./home.nix;
+    };
+  };
+
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [
 # Add any missing dynamic libraries for unpackaged programs

modules/home-manager/wezterm/default.nix

@@ -6,7 +6,7 @@
     extraConfig = ''
     return {
       color_scheme = 'catppuccin-frappe',
-      -- font = wezterm.font('PragmataPro Liga'),
+      font = wezterm.font('PragmataPro Liga'),
       font_size = 16,
       use_fancy_tab_bar = false,
       native_macos_fullscreen_mode = false,