From 8a356de70853f660a40dd9a90099615fabb5ab28 Mon Sep 17 00:00:00 2001
From: Christoph Schmatzler <christoph@schmatzler.com>
Date: Sat, 6 Dec 2025 18:03:39 +0000
Subject: [PATCH] reorg

---
 flake.nix                  | 16 ++++++----------
 hosts/jason/default.nix    |  2 +-
 hosts/tahani/default.nix   |  2 +-
 modules/core.nix           |  5 ++++-
 modules/darwin/default.nix |  6 ++----
 modules/nixos/default.nix  |  6 ++----
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7eb788b..92f62db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,11 +58,9 @@
 						hostname:
 							inputs.darwin.lib.darwinSystem {
 								system = "aarch64-darwin";
-								specialArgs =
-									inputs
-									// {
-										inherit inputs user hostname constants;
-									};
+								specialArgs = {
+									inherit inputs user hostname constants;
+								};
 								modules = [
 									inputs.home-manager.darwinModules.home-manager
 									inputs.nix-homebrew.darwinModules.nix-homebrew
@@ -89,11 +87,9 @@
 						hostname:
 							inputs.nixpkgs.lib.nixosSystem {
 								system = "x86_64-linux";
-								specialArgs =
-									inputs
-									// {
-										inherit inputs user hostname constants;
-									};
+								specialArgs = {
+									inherit inputs user hostname constants;
+								};
 								modules = [
 									inputs.home-manager.nixosModules.home-manager
 									{
diff --git a/hosts/jason/default.nix b/hosts/jason/default.nix
index 3c45787..b9e3080 100644
--- a/hosts/jason/default.nix
+++ b/hosts/jason/default.nix
@@ -9,7 +9,7 @@
 	services.syncthing.settings.folders = {
 		"Projects/Personal" = {
 			path = "/Users/${user}/Projects/Personal";
-			devices = ["jason" "jason"];
+			devices = ["tahani" "jason"];
 		};
 	};
 
diff --git a/hosts/tahani/default.nix b/hosts/tahani/default.nix
index ab13d26..0e4a393 100644
--- a/hosts/tahani/default.nix
+++ b/hosts/tahani/default.nix
@@ -35,7 +35,7 @@
 	services.openssh = {
 		enable = true;
 		settings = {
-			PermitRootLogin = "yes";
+			PermitRootLogin = "prohibit-password";
 			PasswordAuthentication = false;
 		};
 	};
diff --git a/modules/core.nix b/modules/core.nix
index f1929f8..53a892f 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -17,7 +17,10 @@
 				"https://nix-community.cachix.org"
 				"https://cache.nixos.org"
 			];
-			trusted-public-keys = ["cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="];
+			trusted-public-keys = [
+				"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+				"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+			];
 		};
 		gc = {
 			automatic = true;
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 3bd5ec2..6c55d7f 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -2,10 +2,8 @@
 	config,
 	constants,
 	inputs,
-	nixvim,
 	pkgs,
 	user,
-	sops-nix,
 	...
 }: {
 	imports = [
@@ -16,7 +14,7 @@
 		./homebrew.nix
 		./syncthing.nix
 		./system.nix
-		sops-nix.darwinModules.sops
+		inputs.sops-nix.darwinModules.sops
 	];
 
 	system = {
@@ -50,7 +48,7 @@
 		}: {
 			_module.args = {inherit user constants inputs;};
 			imports = [
-				nixvim.homeModules.nixvim
+				inputs.nixvim.homeModules.nixvim
 				../home/default.nix
 				./home/default.nix
 			];
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index a8c8cbb..e58042d 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,17 +1,15 @@
 {
 	pkgs,
 	inputs,
-	nixvim,
 	user,
 	constants,
-	sops-nix,
 	...
 }: {
 	imports = [
 		../core.nix
 		../syncthing.nix
 		../tailscale.nix
-		sops-nix.nixosModules.sops
+		inputs.sops-nix.nixosModules.sops
 	];
 
 	security.sudo.enable = true;
@@ -74,7 +72,7 @@
 		}: {
 			_module.args = {inherit user constants inputs;};
 			imports = [
-				nixvim.homeModules.nixvim
+				inputs.nixvim.homeModules.nixvim
 				../home/default.nix
 				./home/default.nix
 			];