style: update formatting standards

Author: soupglasses

.editorconfig

@@ -11,17 +11,6 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
 
-[*.{yml,yaml}]
-indent_size = 2
-
-[*.nix]
-# We deal with indendation trough nixpkgs-fmt as its much
-# more intelligent.
-indent_size = unset
-
-[*.py]
-indent_size = 4
-
 [*.{diff,patch}]
 end_of_line = unset
 insert_final_newline = unset

.envrc

@@ -8,7 +8,7 @@ fi
 
 # Ensure and download a common nix-direnv version to unify installs.
 if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
 fi
 
 use flake

README.md

@@ -17,7 +17,7 @@ This repository contains the infrastructure as code for Phenix, my personal infr
 
 ```bash
 $ nix develop
- ...
+  ...
 $ nixos-rebuild switch --fast --use-remote-sudo --target-host [user]@[hostname] --flake .#host
 ```
 
@@ -27,7 +27,7 @@ Read [CONTRIBUTING.md](./CONTRIBUTING.md)
 
 ```bash
 $ nix fmt .
- ...
+  ...
 $ nix flake check
 ```
 

flake.nix

@@ -128,11 +128,8 @@
       treefmt-nix.lib.mkWrapper pkgs {
         projectRootFile = "flake.nix";
         programs.alejandra.enable = true;
-        settings.formatter.deadnix = {
-          command = "${pkgs.deadnix}/bin/deadnix";
-          options = ["--edit"];
-          includes = ["*.nix"];
-        };
+        programs.deadnix.enable = true;
+        programs.terraform.enable = true;
       });
 
     # -- Development Shells --

terraform/main.tf

@@ -27,19 +27,19 @@ resource "desec_rrset" "byte_surf-nona_hosts-A" {
   domain  = "byte.surf"
   subname = "nona.hosts"
   type    = "A"
-  records = ["89.58.34.244"]
   ttl     = 3600
+  records = ["89.58.34.244"]
 }
 
 resource "desec_rrset" "byte_surf-nona_hosts-SSHFP" {
   domain  = "byte.surf"
   subname = "nona.hosts"
   type    = "SSHFP"
+  ttl     = 3600
   records = [
     "4 2 ea2c60748fafe3d40f35f2ac34e4187601ca042a5f83298422ba12229c3eb87b",
     "1 2 84d768f3a348146aa3ae6c195ae516522731ff2fc0e32bc254ac8e2b08f8078d"
   ]
-  ttl     = 3600
 }
 
 # Services
@@ -48,32 +48,32 @@ resource "desec_rrset" "byte_surf-cloud-CNAME" {
   domain  = "byte.surf"
   subname = "cloud"
   type    = "CNAME"
-  records = ["nona.hosts.byte.surf."]
   ttl     = 3600
+  records = ["nona.hosts.byte.surf."]
 }
 
 resource "desec_rrset" "byte_surf-mc-CNAME" {
   domain  = "byte.surf"
   subname = "mc"
   type    = "CNAME"
-  records = ["nona.hosts.byte.surf."]
   ttl     = 3600
+  records = ["nona.hosts.byte.surf."]
 }
 
 resource "desec_rrset" "byte_surf-read-CNAME" {
   domain  = "byte.surf"
   subname = "read"
   type    = "CNAME"
-  records = ["nona.hosts.byte.surf."]
   ttl     = 3600
+  records = ["nona.hosts.byte.surf."]
 }
 
 resource "desec_rrset" "byte_surf-watch-CNAME" {
   domain  = "byte.surf"
   subname = "watch"
   type    = "CNAME"
-  records = ["nona.hosts.byte.surf."]
   ttl     = 3600
+  records = ["nona.hosts.byte.surf."]
 }
 
 # Top level
@@ -82,8 +82,8 @@ resource "desec_rrset" "byte_surf--A" {
   domain  = "byte.surf"
   subname = ""
   type    = "A"
-  records = ["89.58.34.244"]
   ttl     = 3600
+  records = ["89.58.34.244"]
 }
 
 # TLS hardening
@@ -92,8 +92,8 @@ resource "desec_rrset" "byte_surf--CAA" {
   domain  = "byte.surf"
   subname = ""
   type    = "CAA"
-  records = ["0 issue \"letsencrypt.org\""]
   ttl     = 3600
+  records = ["0 issue \"letsencrypt.org\""]
 }
 
 # Email - Sendinblue
@@ -102,25 +102,25 @@ resource "desec_rrset" "byte_surf--TXT" {
   domain  = "byte.surf"
   subname = ""
   type    = "TXT"
+  ttl     = 3600
   records = [
     "v=spf1 include:spf.sendinblue.com mx -all",
     "sendinblue-code:deaab76cc107c5de8cad5f956450eb6b"
   ]
-  ttl     = 3600
 }
 
 resource "desec_rrset" "byte_surf-dmarc-TXT" {
   domain  = "byte.surf"
   subname = "_dmarc"
   type    = "TXT"
-  records = ["v=DMARC1; p=reject;"]
   ttl     = 3600
+  records = ["v=DMARC1; p=reject;"]
 }
 
 resource "desec_rrset" "byte_surf-mail_domainkey-TXT" {
   domain  = "byte.surf"
   subname = "mail._domainkey"
   type    = "TXT"
-  records = ["k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDeMVIzrCa3T14JsNY0IRv5/2V1/v2itlviLQBwXsa7shBD6TrBkswsFUToPyMRWC9tbR/5ey0nRBH0ZVxp+lsmTxid2Y2z+FApQ6ra2VsXfbJP3HE6wAO0YTVEJt1TmeczhEd2Jiz/fcabIISgXEdSpTYJhb0ct0VJRxcg4c8c7wIDAQAB"]
   ttl     = 3600
+  records = ["k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDeMVIzrCa3T14JsNY0IRv5/2V1/v2itlviLQBwXsa7shBD6TrBkswsFUToPyMRWC9tbR/5ey0nRBH0ZVxp+lsmTxid2Y2z+FApQ6ra2VsXfbJP3HE6wAO0YTVEJt1TmeczhEd2Jiz/fcabIISgXEdSpTYJhb0ct0VJRxcg4c8c7wIDAQAB"]
 }