Merge #2

2: more treefmt r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>

nix/modules/flake-module.nix

@@ -1,6 +1,6 @@
 { inputs, ... }: {
   flake.nixosModules = {
-    hcloud.imports = [ 
+    hcloud.imports = [
       inputs.srvos.nixosModules.server
       inputs.srvos.nixosModules.hardware-hetzner-cloud
     ];

nix/modules/nixos-wiki.nix

@@ -1,3 +1 @@
-{...}: {
+{ ... }: { }
-
-}

terraform/modules/admins/providers.tf

@@ -1,5 +1,5 @@
 terraform {
   required_providers {
-    hcloud     = { source = "hetznercloud/hcloud" }
+    hcloud = { source = "hetznercloud/hcloud" }
   }
 }

terraform/modules/admins/variables.tf

@@ -1,5 +1,5 @@
 variable "ssh_keys" {
-  type = map(string)
+  type        = map(string)
   description = "SSH public keys for admin user (name -> key)"
 }
 

terraform/modules/wiki/providers.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
-    netlify    = { source = "AegirHealth/netlify" }
+    netlify = { source = "AegirHealth/netlify" }
-    hcloud     = { source = "hetznercloud/hcloud" }
+    hcloud  = { source = "hetznercloud/hcloud" }
-    local      = { source = "hashicorp/local" }
+    local   = { source = "hashicorp/local" }
   }
 }

terraform/modules/wiki/variables.tf

@@ -1,37 +1,37 @@
 variable "server_type" {
-  type = string
+  type        = string
-  default = "cx21"
+  default     = "cx21"
   description = "Hetzner cloud server type"
 }
 
 variable "server_location" {
-  type = string
+  type        = string
-  default = "hel1"
+  default     = "hel1"
   description = "Hetzner cloud server location"
 }
 
 variable "netlify_dns_zone" {
-  type = string
+  type        = string
   description = "Netlify DNS zone"
 }
 
 variable "nixos_vars_file" {
-  type = string
+  type        = string
   description = "File to write NixOS configuration variables to"
 }
 
 variable "nixos_flake_attr" {
-  type = string
+  type        = string
   description = "NixOS configuration flake attribute"
 }
 
 variable "domain" {
-  type = string
+  type        = string
   description = "Domain name"
 }
 
 variable "tags" {
-  type = map(string)
+  type        = map(string)
-  default = {}
+  default     = {}
   description = "Tags to add to the server"
 }