refactor

hosts/chidi/default.nix

@@ -4,7 +4,7 @@
 	...
 }: {
 	imports = [
-		../../modules/darwin
+		../../modules/darwin.nix
 	];
 
 	networking.hostName = "chidi";

hosts/jason/default.nix

@@ -1,6 +1,6 @@
 {user, ...}: {
 	imports = [
-		../../modules/darwin
+		../../modules/darwin.nix
 	];
 
 	networking.hostName = "jason";

hosts/michael/default.nix

@@ -2,6 +2,9 @@
 	modulesPath,
 	hostname,
 	inputs,
+	user,
+	pkgs,
+	constants,
 	...
 }: {
 	imports = [
@@ -9,10 +12,39 @@
 		(modulesPath + "/profiles/qemu-guest.nix")
 		./disk-config.nix
 		./hardware-configuration.nix
-		../../modules/nixos
+		../../modules/nixos.nix
 		inputs.disko.nixosModules.disko
 	];
 
+	home-manager.users.${user} = {
+		imports = [
+			../../modules/bash.nix
+			../../modules/bat.nix
+			../../modules/direnv.nix
+			../../modules/eza.nix
+			../../modules/fish.nix
+			../../modules/fzf.nix
+			../../modules/git.nix
+			../../modules/jjui.nix
+			../../modules/jujutsu.nix
+			../../modules/lazygit.nix
+			../../modules/neovim
+			../../modules/ripgrep.nix
+			../../modules/ssh.nix
+			../../modules/starship.nix
+			../../modules/zoxide.nix
+		];
+
+		programs.home-manager.enable = true;
+
+		home = {
+			packages =
+				(pkgs.callPackage ../../modules/packages.nix {inherit inputs;})
+				++ (pkgs.callPackage ../../modules/nixos-packages.nix {});
+			stateVersion = constants.stateVersions.homeManager;
+		};
+	};
+
 	networking.firewall.allowedTCPPorts = [80 443];
 
 	services.gitea = {

hosts/tahani/default.nix

@@ -2,12 +2,57 @@
 	config,
 	hostname,
 	user,
+	inputs,
+	pkgs,
+	constants,
 	...
 }: {
 	imports = [
-		../../modules/nixos
+		../../modules/nixos.nix
+		../../modules/syncthing.nix
 	];
 
+	home-manager.users.${user} = {
+		imports = [
+			../../modules/atuin.nix
+			../../modules/bash.nix
+			../../modules/bat.nix
+			../../modules/direnv.nix
+			../../modules/eza.nix
+			../../modules/fish.nix
+			../../modules/fzf.nix
+			../../modules/git.nix
+			../../modules/jjui.nix
+			../../modules/jujutsu.nix
+			../../modules/lazygit.nix
+			../../modules/mise.nix
+			../../modules/neovim
+			../../modules/opencode.nix
+			../../modules/ripgrep.nix
+			../../modules/ssh.nix
+			../../modules/starship.nix
+			../../modules/zellij.nix
+			../../modules/zk.nix
+			../../modules/zoxide.nix
+			../../modules/zsh.nix
+		];
+
+		programs.home-manager.enable = true;
+
+		home = {
+			packages =
+				(pkgs.callPackage ../../modules/packages.nix {inherit inputs;})
+				++ (pkgs.callPackage ../../modules/nixos-packages.nix {})
+				++ [
+					inputs.beads.packages.${pkgs.system}.default
+					inputs.nix-ai-tools.packages.${pkgs.system}.amp
+				];
+			stateVersion = constants.stateVersions.homeManager;
+		};
+
+		programs.git.settings.user.email = "christoph@schmatzler.com";
+	};
+
 	services.adguardhome = {
 		enable = true;
 		port = 10000;
@@ -105,8 +150,4 @@
 
 	# Allow Caddy to fetch Tailscale HTTPS certs
 	services.tailscale.permitCertUid = "caddy";
-
-	home-manager.users.${user} = {
-		programs.git.settings.user.email = "christoph@schmatzler.com";
-	};
 }

modules/darwin-home.nix

@@ -3,14 +3,14 @@
 	lib,
 	...
 }: let
-	setWallpaperScript = import ../bin/wallpaper.nix {inherit pkgs;};
+	setWallpaperScript = import ./darwin-wallpaper.nix {inherit pkgs;};
 in {
 	imports = [
-		./ghostty.nix
+		./darwin-ghostty.nix
 	];
 
 	home = {
-		packages = pkgs.callPackage ../packages.nix {};
+		packages = pkgs.callPackage ./darwin-packages.nix {};
 		activation = {
 			"setWallpaper" =
 				lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''

modules/darwin.nix

@@ -7,13 +7,13 @@
 	...
 }: {
 	imports = [
-		../core.nix
+		./core.nix
-		../syncthing.nix
-		../tailscale.nix
-		./dock
-		./homebrew.nix
 		./syncthing.nix
-		./system.nix
+		./tailscale.nix
+		./darwin-dock.nix
+		./darwin-homebrew.nix
+		./darwin-syncthing.nix
+		./darwin-system.nix
 		inputs.sops-nix.darwinModules.sops
 	];
 
@@ -49,8 +49,8 @@
 			_module.args = {inherit user constants inputs;};
 			imports = [
 				inputs.nixvim.homeModules.nixvim
-				../home/default.nix
+				./home.nix
-				./home/default.nix
+				./darwin-home.nix
 			];
 			fonts.fontconfig.enable = true;
 		};

modules/home.nix

@@ -31,7 +31,7 @@
 	programs.home-manager.enable = true;
 
 	home = {
-		packages = pkgs.callPackage ../packages.nix {inherit inputs;};
+		packages = pkgs.callPackage ./packages.nix {inherit inputs;};
 		stateVersion = constants.stateVersions.homeManager;
 	};
 }

modules/nixos.nix

@@ -6,9 +6,8 @@
 	...
 }: {
 	imports = [
-		../core.nix
+		./core.nix
-		../syncthing.nix
+		./tailscale.nix
-		../tailscale.nix
 		inputs.sops-nix.nixosModules.sops
 	];
 
@@ -73,8 +72,6 @@
 			_module.args = {inherit user constants inputs;};
 			imports = [
 				inputs.nixvim.homeModules.nixvim
-				../home/default.nix
-				./home/default.nix
 			];
 		};
 	};

modules/nixos/home/default.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-	home = {
-		packages = pkgs.callPackage ../packages.nix {};
-	};
-}

modules/packages.nix

@@ -4,9 +4,7 @@
 	...
 }:
 with pkgs; [
-	inputs.beads.packages.${pkgs.system}.default
+	(callPackage ./open-project.nix {})
-	inputs.nix-ai-tools.packages.${pkgs.system}.amp
-	(callPackage ./bin/open-project.nix {})
 	age
 	alejandra
 	ast-grep