From 96aea471ced9b223856ab34011b3bf3b320fb7d2 Mon Sep 17 00:00:00 2001 From: Soispha Date: Mon, 10 Jul 2023 15:47:06 +0200 Subject: Feat(.editorconfig): Add the configuration for all files This sets some formatting option based on the file. In comparison to the vim lines, this should be supported by more editors. --- .editorconfig | 16 ++++++++++++++++ flake.nix | 2 +- hosts/server1/configuration.nix | 2 +- system/disks/default.nix | 2 +- system/secrets/default.nix | 2 +- system/secrets/secrets.nix | 2 +- system/services/mail/default.nix | 2 +- system/services/nginx/default.nix | 2 +- system/services/nginx/hosts.nix | Bin 989 -> 978 bytes system/services/nix-sync/default.nix | 2 +- system/users/default.nix | 2 +- 11 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 .editorconfig 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..14caf97 100644 --- a/flake.nix +++ b/flake.nix @@ -115,5 +115,5 @@ }; }; } -# vim: ts=2 + diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index f444715..c29283a 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -16,5 +16,5 @@ system.stateVersion = "22.11"; } -# vim: ts=2 + diff --git a/system/disks/default.nix b/system/disks/default.nix index 5453426..4044b2b 100644 --- a/system/disks/default.nix +++ b/system/disks/default.nix @@ -80,5 +80,5 @@ in { }; }; } -# vim: ts=2 + diff --git a/system/secrets/default.nix b/system/secrets/default.nix index ac42c1c..3592a56 100644 --- a/system/secrets/default.nix +++ b/system/secrets/default.nix @@ -10,5 +10,5 @@ }; }; } -# vim: ts=2 + diff --git a/system/secrets/secrets.nix b/system/secrets/secrets.nix index 5070d38..7873165 100644 --- a/system/secrets/secrets.nix +++ b/system/secrets/secrets.nix @@ -10,5 +10,5 @@ in { server1 ]; } -# vim: ts=2 + diff --git a/system/services/mail/default.nix b/system/services/mail/default.nix index 0640fc7..f12a331 100644 --- a/system/services/mail/default.nix +++ b/system/services/mail/default.nix @@ -39,5 +39,5 @@ in { } users; } -# vim: ts=2 + diff --git a/system/services/nginx/default.nix b/system/services/nginx/default.nix index b9a0754..f5af497 100644 --- a/system/services/nginx/default.nix +++ b/system/services/nginx/default.nix @@ -17,5 +17,5 @@ enable = true; }; } -# vim: ts=2 + diff --git a/system/services/nginx/hosts.nix b/system/services/nginx/hosts.nix index 03806c0..8db389f 100644 Binary files a/system/services/nginx/hosts.nix and b/system/services/nginx/hosts.nix differ diff --git a/system/services/nix-sync/default.nix b/system/services/nix-sync/default.nix index 5c2ed80..2a13010 100644 --- a/system/services/nix-sync/default.nix +++ b/system/services/nix-sync/default.nix @@ -260,5 +260,5 @@ 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..33144f4 100644 --- a/system/users/default.nix +++ b/system/users/default.nix @@ -51,5 +51,5 @@ }; }; } -# vim: ts=2 + -- cgit 1.4.1 From 20a566f32cbaf5f08a627ae4d4afb17f653779c4 Mon Sep 17 00:00:00 2001 From: Soispha Date: Mon, 10 Jul 2023 17:16:51 +0200 Subject: Style(treewide): Format after removing vim lines --- flake.nix | 2 -- hosts/server1/configuration.nix | 2 -- system/disks/default.nix | 2 -- system/secrets/default.nix | 2 -- system/secrets/secrets.nix | 2 -- system/services/fail2ban/default.nix | 1 - system/services/mail/default.nix | 2 -- system/services/nginx/default.nix | 2 -- system/services/nginx/hosts.nix | Bin 978 -> 976 bytes system/services/nix-sync/default.nix | 2 -- system/users/default.nix | 2 -- 11 files changed, 19 deletions(-) diff --git a/flake.nix b/flake.nix index 14caf97..dfa7222 100644 --- a/flake.nix +++ b/flake.nix @@ -115,5 +115,3 @@ }; }; } - - diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index c29283a..26de287 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -16,5 +16,3 @@ system.stateVersion = "22.11"; } - - diff --git a/system/disks/default.nix b/system/disks/default.nix index 4044b2b..f4e6935 100644 --- a/system/disks/default.nix +++ b/system/disks/default.nix @@ -80,5 +80,3 @@ in { }; }; } - - diff --git a/system/secrets/default.nix b/system/secrets/default.nix index 3592a56..3d92fe8 100644 --- a/system/secrets/default.nix +++ b/system/secrets/default.nix @@ -10,5 +10,3 @@ }; }; } - - diff --git a/system/secrets/secrets.nix b/system/secrets/secrets.nix index 7873165..cdaf50d 100644 --- a/system/secrets/secrets.nix +++ b/system/secrets/secrets.nix @@ -10,5 +10,3 @@ in { server1 ]; } - - 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 f12a331..382a87f 100644 --- a/system/services/mail/default.nix +++ b/system/services/mail/default.nix @@ -39,5 +39,3 @@ in { } users; } - - diff --git a/system/services/nginx/default.nix b/system/services/nginx/default.nix index f5af497..404c167 100644 --- a/system/services/nginx/default.nix +++ b/system/services/nginx/default.nix @@ -17,5 +17,3 @@ enable = true; }; } - - diff --git a/system/services/nginx/hosts.nix b/system/services/nginx/hosts.nix index 8db389f..1590756 100644 Binary files a/system/services/nginx/hosts.nix and b/system/services/nginx/hosts.nix differ diff --git a/system/services/nix-sync/default.nix b/system/services/nix-sync/default.nix index 2a13010..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."; }; } - - diff --git a/system/users/default.nix b/system/users/default.nix index 33144f4..822c94b 100644 --- a/system/users/default.nix +++ b/system/users/default.nix @@ -51,5 +51,3 @@ }; }; } - - -- cgit 1.4.1