From c0ca89728e91c6ca6e55ef67b52d15c27c499d06 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Mon, 20 May 2024 00:07:52 -0400
Subject: [PATCH] revert statix fixes for empty_pattern
empty_pattern forces {...} to be converted to {_}, which breaks
situations where an import is done multiple ways with the same
attributes, and only some of the imported files use those
attributes (ex. systems/<host>/default.nix)
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
checks.nix | 3 +++
lib/systems.nix | 2 +-
statix.toml | 4 ++++
systems/artemision/zerotier.nix | 2 +-
systems/jeeves-jr/default.nix | 2 +-
systems/jeeves/default.nix | 2 +-
users/alice/home/gammastep.nix | 2 +-
7 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 statix.toml
diff --git a/checks.nix b/checks.nix
index 66fca37..a214212 100644
--- a/checks.nix
+++ b/checks.nix
@@ -31,6 +31,9 @@ forEachSystem (system: {
excludes = [ "settings.json$" ];
};
+ # toml hooks
+ check-toml.enable = true;
+
# git hooks
check-merge-conflicts.enable = true;
## prevents committing to main
diff --git a/lib/systems.nix b/lib/systems.nix
index a31970a..3a15482 100644
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -97,7 +97,7 @@ rec {
# type:
# genNonX86 :: AttrSet -> [AttrSet]
genNonX86 =
- { _ }:
+ { ... }:
[
{
config.nixpkgs = {
diff --git a/statix.toml b/statix.toml
new file mode 100644
index 0000000..a8dc9b0
--- /dev/null
+++ b/statix.toml
@@ -0,0 +1,4 @@
+disabled = ["empty_pattern"]
+nix_version = '2.4'
+ignore = ['.direnv']
+
diff --git a/systems/artemision/zerotier.nix b/systems/artemision/zerotier.nix
index c185ab7..6bd43fd 100644
--- a/systems/artemision/zerotier.nix
+++ b/systems/artemision/zerotier.nix
@@ -1,4 +1,4 @@
-{ _ }:
+{ ... }:
{
services.zerotierone = {
enable = true;
diff --git a/systems/jeeves-jr/default.nix b/systems/jeeves-jr/default.nix
index ca97be7..01f0304 100644
--- a/systems/jeeves-jr/default.nix
+++ b/systems/jeeves-jr/default.nix
@@ -1,4 +1,4 @@
-{ _ }:
+{ ... }:
{
users = [
"alice"
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index ca97be7..01f0304 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -1,4 +1,4 @@
-{ _ }:
+{ ... }:
{
users = [
"alice"
diff --git a/users/alice/home/gammastep.nix b/users/alice/home/gammastep.nix
index 571aefb..92b8801 100644
--- a/users/alice/home/gammastep.nix
+++ b/users/alice/home/gammastep.nix
@@ -1,4 +1,4 @@
-{ _ }:
+{ ... }:
{
services.gammastep = {
enable = true;