refactor

hosts/chidi/default.nix

@@ -1,6 +1,6 @@
 {
-	inputs,
 	pkgs,
+	inputs,
 	user,
 	hostname,
 	...
@@ -20,7 +20,6 @@
 
 	home-manager.users.${user} = {
 		imports = [
-			inputs.nixvim.homeModules.nixvim
 			../../profiles/atuin.nix
 			../../profiles/bash.nix
 			../../profiles/bat.nix
@@ -44,6 +43,7 @@
 			../../profiles/zk.nix
 			../../profiles/zoxide.nix
 			../../profiles/zsh.nix
+			inputs.nixvim.homeModules.nixvim
 		];
 		fonts.fontconfig.enable = true;
 		programs.git.settings.user.email = "christoph@tuist.dev";

hosts/jason/default.nix

@@ -19,7 +19,6 @@
 
 	home-manager.users.${user} = {
 		imports = [
-			inputs.nixvim.homeModules.nixvim
 			../../profiles/atuin.nix
 			../../profiles/bash.nix
 			../../profiles/bat.nix
@@ -43,6 +42,7 @@
 			../../profiles/zk.nix
 			../../profiles/zoxide.nix
 			../../profiles/zsh.nix
+			inputs.nixvim.homeModules.nixvim
 		];
 		fonts.fontconfig.enable = true;
 		programs.git.settings.user.email = "christoph@schmatzler.com";

hosts/michael/default.nix

@@ -1,9 +1,9 @@
 {
-	modulesPath,
-	hostname,
-	inputs,
 	config,
+	inputs,
 	user,
+	hostname,
+	modulesPath,
 	...
 }: {
 	imports = [
@@ -14,9 +14,9 @@
 		./secrets.nix
 		../../modules/gitea.nix
 		../../profiles/core.nix
-		../../profiles/openssh.nix
 		../../profiles/fail2ban.nix
 		../../profiles/nixos.nix
+		../../profiles/openssh.nix
 		../../profiles/tailscale.nix
 		inputs.disko.nixosModules.disko
 		inputs.sops-nix.nixosModules.sops
@@ -35,9 +35,10 @@
 		};
 	};
 
+	networking.hostName = hostname;
+
 	home-manager.users.${user} = {
 		imports = [
-			inputs.nixvim.homeModules.nixvim
 			../../profiles/bash.nix
 			../../profiles/bat.nix
 			../../profiles/direnv.nix
@@ -54,8 +55,7 @@
 			../../profiles/ssh.nix
 			../../profiles/starship.nix
 			../../profiles/zoxide.nix
+			inputs.nixvim.homeModules.nixvim
 		];
 	};
-
-	networking.hostName = hostname;
 }

hosts/michael/secrets.nix

@@ -1,22 +1,22 @@
 {...}: {
-	sops.secrets.michael-gitea-litestream = {
+	sops.secrets = {
+		michael-gitea-litestream = {
 			sopsFile = ../../secrets/michael-gitea-litestream;
 			format = "binary";
 			owner = "gitea";
 			group = "gitea";
 		};
-
+		michael-gitea-restic-password = {
-	sops.secrets.michael-gitea-restic-password = {
 			sopsFile = ../../secrets/michael-gitea-restic-password;
 			format = "binary";
 			owner = "gitea";
 			group = "gitea";
 		};
-
+		michael-gitea-restic-env = {
-	sops.secrets.michael-gitea-restic-env = {
 			sopsFile = ../../secrets/michael-gitea-restic-env;
 			format = "binary";
 			owner = "gitea";
 			group = "gitea";
 		};
+	};
 }

hosts/tahani/default.nix

@@ -10,15 +10,16 @@
 		./paperless.nix
 		./secrets.nix
 		../../profiles/core.nix
-		../../profiles/openssh.nix
 		../../profiles/nixos.nix
+		../../profiles/openssh.nix
 		../../profiles/tailscale.nix
 		inputs.sops-nix.nixosModules.sops
 	];
 
+	networking.hostName = hostname;
+
 	home-manager.users.${user} = {
 		imports = [
-			inputs.nixvim.homeModules.nixvim
 			../../profiles/atuin.nix
 			../../profiles/bash.nix
 			../../profiles/bat.nix
@@ -41,6 +42,7 @@
 			../../profiles/zk.nix
 			../../profiles/zoxide.nix
 			../../profiles/zsh.nix
+			inputs.nixvim.homeModules.nixvim
 		];
 
 		programs.git.settings.user.email = "christoph@schmatzler.com";
@@ -54,6 +56,4 @@
 			size = 16 * 1024;
 		}
 	];
-
-	networking.hostName = hostname;
 }

hosts/tahani/networking.nix

@@ -1,10 +1,5 @@
-{
+{config, ...}: {
-	config,
-	hostname,
-	...
-}: {
 	networking = {
-		hostName = hostname;
 		useDHCP = false;
 		interfaces.eno1.ipv4.addresses = [
 			{

modules/gitea.nix

@@ -11,36 +11,42 @@ in {
 		enable = mkEnableOption "Gitea git hosting service";
 
 		litestream = {
-			bucket = mkOption {
+			bucket =
+				mkOption {
 					type = types.str;
 					description = "S3 bucket name for Litestream database replication";
 				};
 
-			secretFile = mkOption {
+			secretFile =
+				mkOption {
 					type = types.path;
 					description = "Path to the environment file containing S3 credentials for Litestream";
 				};
 		};
 
 		restic = {
-			bucket = mkOption {
+			bucket =
+				mkOption {
 					type = types.str;
 					description = "S3 bucket name for Restic repository backups";
 				};
 
-			passwordFile = mkOption {
+			passwordFile =
+				mkOption {
 					type = types.path;
 					description = "Path to the file containing the Restic repository password";
 				};
 
-			environmentFile = mkOption {
+			environmentFile =
+				mkOption {
 					type = types.path;
 					description = "Path to the environment file containing S3 credentials for Restic";
 				};
 		};
 
 		s3 = {
-			endpoint = mkOption {
+			endpoint =
+				mkOption {
 					type = types.str;
 					default = "s3.eu-central-003.backblazeb2.com";
 					description = "S3 endpoint URL";
@@ -48,7 +54,8 @@ in {
 		};
 	};
 
-	config = mkIf cfg.enable {
+	config =
+		mkIf cfg.enable {
 			networking.firewall.allowedTCPPorts = [80 443];
 
 			services.redis.servers.gitea = {

modules/pgbackrest.nix

@@ -34,20 +34,17 @@ in {
 									default = "s3.eu-central-003.backblazeb2.com";
 									description = "S3 endpoint URL";
 								};
-
 							bucket =
 								mkOption {
 									type = types.str;
 									description = "S3 bucket name";
 								};
-
 							region =
 								mkOption {
 									type = types.str;
 									default = "eu-central-003";
 									description = "S3 region";
 								};
-
 							path =
 								mkOption {
 									type = types.str;
@@ -71,7 +68,6 @@ in {
 									default = 7;
 									description = "Number of full backups to retain";
 								};
-
 							diff =
 								mkOption {
 									type = types.int;
@@ -95,7 +91,6 @@ in {
 									default = "zst";
 									description = "Compression algorithm (none, gz, lz4, zst)";
 								};
-
 							level =
 								mkOption {
 									type = types.int;
@@ -126,7 +121,6 @@ in {
 									default = "daily";
 									description = "OnCalendar expression for full backups";
 								};
-
 							diff =
 								mkOption {
 									type = types.str;

profiles/darwin.nix

@@ -1,8 +1,8 @@
 {
-	constants,
-	inputs,
 	pkgs,
+	inputs,
 	user,
+	constants,
 	...
 }: {
 	home-manager.extraSpecialArgs = {inherit user constants inputs;};

profiles/dock.nix

@@ -1,7 +1,7 @@
 {
 	config,
-	pkgs,
 	lib,
+	pkgs,
 	user,
 	...
 }:

profiles/home.nix

@@ -1,8 +1,8 @@
 {
-	pkgs,
 	lib,
-	constants,
+	pkgs,
 	inputs,
+	constants,
 	...
 }: let
 	setWallpaperScript = import ./wallpaper.nix {inherit pkgs;};

profiles/nixos.nix

@@ -1,8 +1,8 @@
 {
 	pkgs,
+	inputs,
 	user,
 	constants,
-	inputs,
 	...
 }: {
 	security.sudo.enable = true;

profiles/packages.nix

@@ -1,6 +1,6 @@
 {
+	lib,
 	pkgs,
-	inputs,
 	...
 }:
 with pkgs;

profiles/zellij.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-	lib,
-	pkgs,
-	...
-}: {
 	programs.zellij = {
 		enable = true;
 		settings = {