Merge: Branch 'streamline'

12 files changed, 16 insertions, 19 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8cfc43a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{nix}]
+charset = utf-8
+indent_style = space
+indent_size = 2
diff --git a/flake.nix b/flake.nix
index 5485ed9..dfa7222 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,5 +115,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix
index f444715..26de287 100644
--- a/hosts/server1/configuration.nix
+++ b/hosts/server1/configuration.nix
@@ -16,5 +16,3 @@
 
   system.stateVersion = "22.11";
 }
-# vim: ts=2
-
diff --git a/system/disks/default.nix b/system/disks/default.nix
index 5453426..f4e6935 100644
--- a/system/disks/default.nix
+++ b/system/disks/default.nix
@@ -80,5 +80,3 @@ in {
     };
   };
 }
-# vim: ts=2
-
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
index ac42c1c..3d92fe8 100644
--- a/system/secrets/default.nix
+++ b/system/secrets/default.nix
@@ -10,5 +10,3 @@
     };
   };
 }
-# vim: ts=2
-
diff --git a/system/secrets/secrets.nix b/system/secrets/secrets.nix
index 5070d38..cdaf50d 100644
--- a/system/secrets/secrets.nix
+++ b/system/secrets/secrets.nix
@@ -10,5 +10,3 @@ in {
     server1
   ];
 }
-# vim: ts=2
-
diff --git a/system/services/fail2ban/default.nix b/system/services/fail2ban/default.nix
index 3e6244b..43fd674 100644
--- a/system/services/fail2ban/default.nix
+++ b/system/services/fail2ban/default.nix
@@ -27,4 +27,3 @@
     };
   };
 }
-
diff --git a/system/services/mail/default.nix b/system/services/mail/default.nix
index 0640fc7..382a87f 100644
--- a/system/services/mail/default.nix
+++ b/system/services/mail/default.nix
@@ -39,5 +39,3 @@ in {
     }
     users;
 }
-# vim: ts=2
-
diff --git a/system/services/nginx/default.nix b/system/services/nginx/default.nix
index b9a0754..404c167 100644
--- a/system/services/nginx/default.nix
+++ b/system/services/nginx/default.nix
@@ -17,5 +17,3 @@
     enable = true;
   };
 }
-# vim: ts=2
-
diff --git a/system/services/nginx/hosts.nix b/system/services/nginx/hosts.nix
index 03806c0..1590756 100644
--- a/system/services/nginx/hosts.nix
+++ b/system/services/nginx/hosts.nix
Binary files differdiff --git a/system/services/nix-sync/default.nix b/system/services/nix-sync/default.nix
index 5c2ed80..44348c0 100644
--- a/system/services/nix-sync/default.nix
+++ b/system/services/nix-sync/default.nix
@@ -260,5 +260,3 @@ in {
       else lib.warnIf (cfg.group != "nix-sync") "The group (${cfg.group}) is not \"nix-sync\", thus you are responible for generating it.";
   };
 }
-# vim: ts=2
-
diff --git a/system/users/default.nix b/system/users/default.nix
index 7ea88c5..822c94b 100644
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -51,5 +51,3 @@
     };
   };
 }
-# vim: ts=2
-