refactor more

hosts/chidi/default.nix

@@ -1,10 +1,20 @@
 {
+	inputs,
 	pkgs,
 	user,
+	constants,
 	...
 }: {
 	imports = [
+		../../modules/core.nix
 		../../modules/darwin.nix
+		../../modules/darwin-syncthing.nix
+		../../modules/darwin-system.nix
+		../../modules/dock.nix
+		../../modules/homebrew.nix
+		../../modules/syncthing.nix
+		../../modules/tailscale.nix
+		inputs.sops-nix.darwinModules.sops
 	];
 
 	networking.hostName = "chidi";
@@ -18,6 +28,38 @@
 	};
 
 	home-manager.users.${user} = {
+		pkgs,
+		lib,
+		...
+	}: {
+		_module.args = {inherit user constants inputs;};
+		imports = [
+			inputs.nixvim.homeModules.nixvim
+			../../modules/atuin.nix
+			../../modules/bash.nix
+			../../modules/bat.nix
+			../../modules/direnv.nix
+			../../modules/eza.nix
+			../../modules/fish.nix
+			../../modules/fzf.nix
+			../../modules/ghostty.nix
+			../../modules/git.nix
+			../../modules/home.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
+		];
+		fonts.fontconfig.enable = true;
 		programs.git.settings.user.email = "christoph@tuist.dev";
 	};
 

hosts/jason/default.nix

@@ -1,6 +1,18 @@
-{user, ...}: {
+{
+	inputs,
+	user,
+	...
+}: {
 	imports = [
+		../../modules/core.nix
 		../../modules/darwin.nix
+		../../modules/darwin-syncthing.nix
+		../../modules/darwin-system.nix
+		../../modules/dock.nix
+		../../modules/homebrew.nix
+		../../modules/syncthing.nix
+		../../modules/tailscale.nix
+		inputs.sops-nix.darwinModules.sops
 	];
 
 	networking.hostName = "jason";
@@ -31,6 +43,39 @@
 	};
 
 	home-manager.users.${user} = {
+		pkgs,
+		lib,
+		constants,
+		...
+	}: {
+		_module.args = {inherit user constants inputs;};
+		imports = [
+			inputs.nixvim.homeModules.nixvim
+			../../modules/atuin.nix
+			../../modules/bash.nix
+			../../modules/bat.nix
+			../../modules/direnv.nix
+			../../modules/eza.nix
+			../../modules/fish.nix
+			../../modules/fzf.nix
+			../../modules/ghostty.nix
+			../../modules/git.nix
+			../../modules/home.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
+		];
+		fonts.fontconfig.enable = true;
 		programs.git.settings.user.email = "christoph@schmatzler.com";
 	};
 }

hosts/michael/default.nix

@@ -12,12 +12,19 @@
 		(modulesPath + "/profiles/qemu-guest.nix")
 		./disk-config.nix
 		./hardware-configuration.nix
+		../../modules/core.nix
 		../../modules/nixos.nix
 		inputs.disko.nixosModules.disko
 	];
 
 	home-manager.users.${user} = {
+		pkgs,
+		lib,
+		...
+	}: {
+		_module.args = {inherit user constants inputs;};
 		imports = [
+			inputs.nixvim.homeModules.nixvim
 			../../modules/bash.nix
 			../../modules/bat.nix
 			../../modules/direnv.nix
@@ -25,6 +32,7 @@
 			../../modules/fish.nix
 			../../modules/fzf.nix
 			../../modules/git.nix
+			../../modules/home.nix
 			../../modules/jjui.nix
 			../../modules/jujutsu.nix
 			../../modules/lazygit.nix
@@ -34,15 +42,6 @@
 			../../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];

hosts/tahani/default.nix

@@ -8,12 +8,21 @@
 	...
 }: {
 	imports = [
+		../../modules/core.nix
 		../../modules/nixos.nix
 		../../modules/syncthing.nix
+		../../modules/tailscale.nix
+		inputs.sops-nix.nixosModules.sops
 	];
 
 	home-manager.users.${user} = {
+		pkgs,
+		lib,
+		...
+	}: {
+		_module.args = {inherit user constants inputs;};
 		imports = [
+			inputs.nixvim.homeModules.nixvim
 			../../modules/atuin.nix
 			../../modules/bash.nix
 			../../modules/bat.nix
@@ -22,6 +31,7 @@
 			../../modules/fish.nix
 			../../modules/fzf.nix
 			../../modules/git.nix
+			../../modules/home.nix
 			../../modules/jjui.nix
 			../../modules/jujutsu.nix
 			../../modules/lazygit.nix
@@ -37,18 +47,10 @@
 			../../modules/zsh.nix
 		];
 
-		programs.home-manager.enable = true;
+		home.packages = [
-
+			inputs.beads.packages.${pkgs.system}.default
-		home = {
+			inputs.nix-ai-tools.packages.${pkgs.system}.amp
-			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";
 	};

modules/darwin-home.nix

@@ -1,22 +0,0 @@
-{
-	pkgs,
-	lib,
-	...
-}: let
-	setWallpaperScript = import ./darwin-wallpaper.nix {inherit pkgs;};
-in {
-	imports = [
-		./darwin-ghostty.nix
-	];
-
-	home = {
-		packages = pkgs.callPackage ./darwin-packages.nix {};
-		activation = {
-			"setWallpaper" =
-				lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
-					echo "[+] Setting wallpaper"
-					${setWallpaperScript}/bin/set-wallpaper-script
-				'';
-		};
-	};
-}

modules/darwin-packages.nix

@@ -1,10 +0,0 @@
-{pkgs}:
-with pkgs; [
-	_1password-gui
-	dockutil
-	mas
-	raycast
-	tailscale
-	# whatsapp-for-mac
-	xcodes
-]

modules/darwin.nix

@@ -1,22 +1,9 @@
 {
-	config,
 	constants,
-	inputs,
 	pkgs,
 	user,
 	...
 }: {
-	imports = [
-		./core.nix
-		./syncthing.nix
-		./tailscale.nix
-		./darwin-dock.nix
-		./darwin-homebrew.nix
-		./darwin-syncthing.nix
-		./darwin-system.nix
-		inputs.sops-nix.darwinModules.sops
-	];
-
 	system = {
 		primaryUser = user;
 		stateVersion = constants.stateVersions.darwin;
@@ -38,42 +25,5 @@
 		shell = pkgs.fish;
 	};
 
-	home-manager = {
+	home-manager.useGlobalPkgs = true;
-		useGlobalPkgs = true;
-		users.${user} = {
-			pkgs,
-			config,
-			lib,
-			...
-		}: {
-			_module.args = {inherit user constants inputs;};
-			imports = [
-				inputs.nixvim.homeModules.nixvim
-				./home.nix
-				./darwin-home.nix
-			];
-			fonts.fontconfig.enable = true;
-		};
-	};
-
-	local = {
-		dock = {
-			enable = true;
-			username = user;
-			entries = [
-				{path = "/Applications/Helium.app/";}
-				{path = "${config.users.users.${user}.home}/Applications/Home Manager Apps/Ghostty.app/";}
-				{path = "/System/Applications/Calendar.app/";}
-				{path = "/System/Applications/Mail.app/";}
-				{path = "/System/Applications/Notes.app/";}
-				{path = "/System/Applications/Music.app/";}
-				{path = "/System/Applications/System Settings.app/";}
-				{
-					path = "${config.users.users.${user}.home}/Downloads";
-					section = "others";
-					options = "--sort name --view grid --display stack";
-				}
-			];
-		};
-	};
 }

modules/dock.nix

@@ -2,6 +2,7 @@
 	config,
 	pkgs,
 	lib,
+	user,
 	...
 }:
 with lib; let
@@ -36,13 +37,27 @@ in {
 										};
 								};
 							});
-					readOnly = true;
+					default = [
+						{path = "/Applications/Helium.app/";}
+						{path = "${config.users.users.${user}.home}/Applications/Home Manager Apps/Ghostty.app/";}
+						{path = "/System/Applications/Calendar.app/";}
+						{path = "/System/Applications/Mail.app/";}
+						{path = "/System/Applications/Notes.app/";}
+						{path = "/System/Applications/Music.app/";}
+						{path = "/System/Applications/System Settings.app/";}
+						{
+							path = "${config.users.users.${user}.home}/Downloads";
+							section = "others";
+							options = "--sort name --view grid --display stack";
+						}
+					];
 				};
 
 			username =
 				mkOption {
 					description = "Username to apply the dock settings to";
 					type = types.str;
+					default = user;
 				};
 		};
 	};

modules/home.nix

@@ -1,37 +1,23 @@
 {
 	pkgs,
+	lib,
 	constants,
 	inputs,
 	...
-}: {
+}: let
-	imports = [
+	setWallpaperScript = import ./wallpaper.nix {inherit pkgs;};
-		./atuin.nix
+in {
-		./bash.nix
-		./bat.nix
-		./direnv.nix
-		./eza.nix
-		./fish.nix
-		./fzf.nix
-		./git.nix
-		./jjui.nix
-		./jujutsu.nix
-		./lazygit.nix
-		./mise.nix
-		./neovim
-		./opencode.nix
-		./ripgrep.nix
-		./ssh.nix
-		./starship.nix
-		./zellij.nix
-		./zk.nix
-		./zoxide.nix
-		./zsh.nix
-	];
-
 	programs.home-manager.enable = true;
 
 	home = {
 		packages = pkgs.callPackage ./packages.nix {inherit inputs;};
 		stateVersion = constants.stateVersions.homeManager;
+		activation = lib.mkIf pkgs.stdenv.isDarwin {
+			"setWallpaper" =
+				lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] ''
+					echo "[+] Setting wallpaper"
+					${setWallpaperScript}/bin/set-wallpaper-script
+				'';
+		};
 	};
 }

modules/nixos-packages.nix

@@ -1,6 +0,0 @@
-{pkgs}:
-with pkgs; [
-	gcc15
-	lm_sensors
-	ghostty.terminfo
-]

modules/nixos.nix

@@ -1,16 +1,9 @@
 {
 	pkgs,
-	inputs,
 	user,
 	constants,
 	...
 }: {
-	imports = [
-		./core.nix
-		./tailscale.nix
-		inputs.sops-nix.nixosModules.sops
-	];
-
 	security.sudo.enable = true;
 
 	system.stateVersion = constants.stateVersions.nixos;
@@ -61,18 +54,5 @@
 		};
 	};
 
-	home-manager = {
+	home-manager.useGlobalPkgs = true;
-		useGlobalPkgs = true;
-		users.${user} = {
-			pkgs,
-			config,
-			lib,
-			...
-		}: {
-			_module.args = {inherit user constants inputs;};
-			imports = [
-				inputs.nixvim.homeModules.nixvim
-			];
-		};
-	};
 }

modules/packages.nix

@@ -3,40 +3,54 @@
 	inputs,
 	...
 }:
-with pkgs; [
+with pkgs;
-	(callPackage ./open-project.nix {})
+	[
-	age
+		(callPackage ./open-project.nix {})
-	alejandra
+		age
-	ast-grep
+		alejandra
-	bun
+		ast-grep
-	delta
+		bun
-	devenv
+		delta
-	dig
+		devenv
-	docker
+		dig
-	docker-compose
+		docker
-	fastfetch
+		docker-compose
-	fd
+		fastfetch
-	gh
+		fd
-	git
+		gh
-	gnumake
+		git
-	gnupg
+		gnumake
-	hledger
+		gnupg
-	htop
+		hledger
-	hyperfine
+		htop
-	jq
+		hyperfine
-	killall
+		jq
-	lsof
+		killall
-	nurl
+		lsof
-	openssh
+		nurl
-	postgresql_17
+		openssh
-	sd
+		postgresql_17
-	sops
+		sd
-	sqlite
+		sops
-	tokei
+		sqlite
-	tree
+		tokei
-	tree-sitter
+		tree
-	unzip
+		tree-sitter
-	vivid
+		unzip
-	ov
+		vivid
-	zip
+		ov
-]
+		zip
+	]
+	++ lib.optionals stdenv.isDarwin [
+		_1password-gui
+		dockutil
+		mas
+		raycast
+		tailscale
+		xcodes
+	]
+	++ lib.optionals stdenv.isLinux [
+		gcc15
+		lm_sensors
+		ghostty.terminfo
+	]