reorg

flake.nix

@@ -58,9 +58,7 @@
 						hostname:
 							inputs.darwin.lib.darwinSystem {
 								system = "aarch64-darwin";
-								specialArgs =
+								specialArgs = {
-									inputs
-									// {
 									inherit inputs user hostname constants;
 								};
 								modules = [
@@ -89,9 +87,7 @@
 						hostname:
 							inputs.nixpkgs.lib.nixosSystem {
 								system = "x86_64-linux";
-								specialArgs =
+								specialArgs = {
-									inputs
-									// {
 									inherit inputs user hostname constants;
 								};
 								modules = [

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"];
 		};
 	};
 

hosts/tahani/default.nix

@@ -35,7 +35,7 @@
 	services.openssh = {
 		enable = true;
 		settings = {
-			PermitRootLogin = "yes";
+			PermitRootLogin = "prohibit-password";
 			PasswordAuthentication = false;
 		};
 	};

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;

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
 			];

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
 			];