aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authortdback <tyler@tdback.net>2024-12-27 19:09:34 -0500
committertdback <tyler@tdback.net>2024-12-27 19:09:34 -0500
commit836ec67a008ce16c57ea5071ef901154f7e93ea9 (patch)
treebdd6cef8b412bc2f34da476753898ec319a8f507 /modules
parentc3f79aa804421d71f9a48296b3dea0cea2af0368 (diff)
fix: remove pipe-operators experimental feature
im going to hold off on using the pipe-operators until they are an official part of the nix language. in its current state portability gets hurt for any modules using the feature, since one has to manually opt-in. in the end, it's just a syntax change!
Diffstat (limited to 'modules')
-rw-r--r--modules/customs/cgit/default.nix6
-rw-r--r--modules/profiles/common/default.nix6
-rw-r--r--modules/profiles/libvirtd/default.nix8
-rw-r--r--modules/profiles/wireshark/default.nix8
-rw-r--r--modules/scripts/zquota/default.nix9
5 files changed, 17 insertions, 20 deletions
diff --git a/modules/customs/cgit/default.nix b/modules/customs/cgit/default.nix
index a6fd79a..dc30d2a 100644
--- a/modules/customs/cgit/default.nix
+++ b/modules/customs/cgit/default.nix
@@ -22,12 +22,14 @@ let
);
mkCgitAssets = pkg: files:
- builtins.map (f: ''
+ strings.concatStringsSep "\n" (
+ builtins.map (f: ''
handle_path /${f} {
root * ${pkg}/cgit/${f}
file_server
}
- '') files |> strings.concatStringsSep "\n";
+ '') files
+ );
in
{
disabledModules = [ "services/networking/cgit.nix" ];
diff --git a/modules/profiles/common/default.nix b/modules/profiles/common/default.nix
index c25fece..67d228a 100644
--- a/modules/profiles/common/default.nix
+++ b/modules/profiles/common/default.nix
@@ -3,11 +3,7 @@
nix = {
settings = {
trusted-users = [ "@wheel" "root" ];
- experimental-features = lib.mkDefault [
- "nix-command"
- "flakes"
- "pipe-operators"
- ];
+ experimental-features = lib.mkDefault [ "nix-command" "flakes" ];
auto-optimise-store = true;
};
gc = {
diff --git a/modules/profiles/libvirtd/default.nix b/modules/profiles/libvirtd/default.nix
index fa617d1..222fdab 100644
--- a/modules/profiles/libvirtd/default.nix
+++ b/modules/profiles/libvirtd/default.nix
@@ -13,9 +13,7 @@
programs.virt-manager.enable = true;
# Add any users in the 'wheel' group to the 'libvirtd' group.
- users.groups.libvirtd.members = let users = config.users.users; in
- builtins.attrNames users
- |> builtins.filter (
- x: builtins.elem "wheel" users.${x}.extraGroups
- );
+ users.groups.libvirtd.members =
+ with builtins; let users = config.users.users; in
+ filter (u: elem "wheel" users.${u}.extraGroups) (attrNames users);
}
diff --git a/modules/profiles/wireshark/default.nix b/modules/profiles/wireshark/default.nix
index d4d0627..ab741ff 100644
--- a/modules/profiles/wireshark/default.nix
+++ b/modules/profiles/wireshark/default.nix
@@ -6,9 +6,7 @@
};
# Add any users in the 'wheel' group to the 'wireshark' group.
- users.groups.wireshark.members = let users = config.users.users; in
- builtins.attrNames users
- |> builtins.filter (
- x: builtins.elem "wheel" users.${x}.extraGroups
- );
+ users.groups.wireshark.members =
+ with builtins; let users = config.users.users; in
+ filter (u: elem "wheel" users.${u}.extraGroups) (attrNames users);
}
diff --git a/modules/scripts/zquota/default.nix b/modules/scripts/zquota/default.nix
index cfa08ee..cc0f08f 100644
--- a/modules/scripts/zquota/default.nix
+++ b/modules/scripts/zquota/default.nix
@@ -64,9 +64,12 @@ in
systemd.services."zquota" = {
description = "Perform and report scheduled quota checks on ZFS datasets.";
serviceConfig.Type = "oneshot";
- script = strings.concatStringsSep "\n" <| mapAttrsToList (
- dataset: quota: "/run/current-system/sw/bin/zquota ${dataset} ${builtins.toString quota}"
- ) cfg.quotas;
+ script =
+ strings.concatStringsSep "\n" (
+ mapAttrsToList (
+ dataset: quota: "/run/current-system/sw/bin/zquota ${dataset} ${builtins.toString quota}"
+ ) cfg.quotas
+ );
};
systemd.timers."zquota" = {
wantedBy = [ "timers.target" ];