From a36362265993b3de59b8b4d43c7388fd1be51fbf Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Sun, 5 Apr 2026 15:10:13 -0500 Subject: [PATCH] useless_parens --- .../matt@macbook-pro-nixos/default.nix | 2 +- lib/module/default.nix | 7 +-- modules/home/home/default.nix | 2 +- modules/home/programs/waybar/default.nix | 5 +- modules/home/user/default.nix | 6 +-- modules/nixos/boot/common/default.nix | 2 +- modules/nixos/hardware/raspberry-pi/audio.nix | 5 +- .../nixos/hardware/raspberry-pi/bluetooth.nix | 5 +- .../nixos/hardware/raspberry-pi/default.nix | 53 +++++++++---------- modules/nixos/hardware/raspberry-pi/i2c.nix | 5 +- .../hardware/raspberry-pi/modesetting.nix | 5 +- modules/nixos/hardware/raspberry-pi/pwm.nix | 7 ++- modules/nixos/hardware/raspberry-pi/wifi.nix | 5 +- .../services/govee2mqtt/default.nix | 6 +-- .../services/homeassistant/default.nix | 4 +- modules/nixos/services/arrs/default.nix | 10 ++-- modules/nixos/services/caddy/sops.nix | 15 +++--- modules/nixos/services/kavita/default.nix | 3 +- overlays/linux-rpi/default.nix | 2 +- packages/edk2-basetools/default.nix | 6 +-- packages/edk2/default.nix | 4 +- statix.toml | 2 - .../aarch64-darwin/macbook-pro/default.nix | 4 +- systems/aarch64-linux/pi5/sops.nix | 2 +- systems/x86_64-linux/jallen-nas/sops.nix | 2 +- 25 files changed, 76 insertions(+), 93 deletions(-) diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 945fed8..256988b 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -135,7 +135,7 @@ in sops = { secrets = { "protonmail-password" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/mac-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/mac-secrets.yaml"; }; }; }; diff --git a/lib/module/default.nix b/lib/module/default.nix index e3475dc..9fde3af 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -149,8 +149,9 @@ rec { reverseProxy = mkReverseProxyOpt name; hostedService = { - enable = mkOpt types.bool (cfg.reverseProxy.enable - ) "Expose this service in Glance dashboard (auto-enabled when reverseProxy is on)"; + enable = + mkOpt types.bool cfg.reverseProxy.enable + "Expose this service in Glance dashboard (auto-enabled when reverseProxy is on)"; title = mkOpt types.str name "Display title in Glance"; icon = mkOpt types.str "si:glance" "Icon identifier for Glance (e.g. si:actualbudget)"; group = mkOpt types.str "Services" "Glance group/category for this service"; @@ -254,7 +255,7 @@ rec { owner ? "nix-apps", group ? "jallen-nas", mode ? "660", - sopsFile ? (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"), + sopsFile ? lib.snowfall.fs.get-file "secrets/nas-secrets.yaml", }: { sops.secrets = mapAttrs (_key: extra: { inherit sopsFile; } // extra) secrets; diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix index 201f7f6..04ace01 100644 --- a/modules/home/home/default.nix +++ b/modules/home/home/default.nix @@ -57,7 +57,7 @@ in wget ] ++ ( - if (hasDestopEnvironment) then + if hasDestopEnvironment then [ boxbuddy cider-2 diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/waybar/default.nix index e336729..f6f7026 100755 --- a/modules/home/programs/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -294,7 +294,7 @@ in systemd.enable = true; settings = { - mainBar = ( + mainBar = (mkMerge [ { layer = cfg.layer; @@ -589,8 +589,7 @@ in }; }) ]) - // cfg.extra.settings - ); + // cfg.extra.settings; } // cfg.extraModules; # keep legacy top-level extra modules for compatibility diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix index 193ef4d..c1cd3be 100644 --- a/modules/home/user/default.nix +++ b/modules/home/user/default.nix @@ -35,17 +35,17 @@ in description = "The full name of the user."; }; home = mkOption { - type = (types.nullOr types.str); + type = types.nullOr types.str; default = home-directory; description = "The user's home directory."; }; icon = mkOption { - type = (types.nullOr types.package); + type = types.nullOr types.package; default = null; description = "The profile picture to use for the user. Set to a package whose output is the icon file (e.g. a derivation producing a PNG)."; }; name = mkOption { - type = (types.nullOr types.str); + type = types.nullOr types.str; default = "matt"; description = "The user account."; }; diff --git a/modules/nixos/boot/common/default.nix b/modules/nixos/boot/common/default.nix index 4ea78ff..7167779 100644 --- a/modules/nixos/boot/common/default.nix +++ b/modules/nixos/boot/common/default.nix @@ -62,7 +62,7 @@ in bcachefs.package = lib.mkOverride 90 pkgs.${namespace}.bcachefs; consoleLogLevel = lib.mkDefault 0; - bootspec.enable = (!isArm); + bootspec.enable = !isArm; initrd = { verbose = lib.mkDefault false; diff --git a/modules/nixos/hardware/raspberry-pi/audio.nix b/modules/nixos/hardware/raspberry-pi/audio.nix index 5f5d943..35ab30c 100644 --- a/modules/nixos/hardware/raspberry-pi/audio.nix +++ b/modules/nixos/hardware/raspberry-pi/audio.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { hardware.deviceTree = { - overlays = ( + overlays = with pkgs.${namespace}; ( if (variant == "5") then @@ -33,8 +33,7 @@ in dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts"; } ] - ) - ); + ); }; }; } diff --git a/modules/nixos/hardware/raspberry-pi/bluetooth.nix b/modules/nixos/hardware/raspberry-pi/bluetooth.nix index a44df7d..b36c9f7 100644 --- a/modules/nixos/hardware/raspberry-pi/bluetooth.nix +++ b/modules/nixos/hardware/raspberry-pi/bluetooth.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { hardware.deviceTree = { - overlays = ( + overlays = if (variant == "5") then [ { @@ -34,8 +34,7 @@ in pkgs.${namespace}.raspberrypi-overlays }/dtbs/raspberrypi-overlays/disable-bt-overlay.dts"; } - ] - ); + ]; }; }; } diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix index 0e787c6..cc25280 100644 --- a/modules/nixos/hardware/raspberry-pi/default.nix +++ b/modules/nixos/hardware/raspberry-pi/default.nix @@ -15,7 +15,7 @@ let # installs raspberry's firmware independent of the nixos generations # sometimes referred to as "boot code" - raspberryPiFirmware = ( + raspberryPiFirmware = { pkgs, firmware, @@ -33,10 +33,9 @@ let inherit firmware configTxt; }; - } - ); + }; - kernelbootGenBuilder = ( + kernelbootGenBuilder = { pkgs, deviceTreeInstaller, @@ -53,10 +52,9 @@ let installDeviceTree = deviceTreeInstaller; }; - } - ); + }; - deviceTree = ( + deviceTree = { pkgs, firmware, @@ -73,8 +71,7 @@ let inherit firmware; }; - } - ); + }; mkBootloader = pkgs: @@ -113,7 +110,7 @@ let }; - bootloader = ( + bootloader = { pkgs, nixosGenerationsDir, @@ -136,28 +133,25 @@ let # NixOS-generations -dependent inherit nixosGenerationsDir nixosGenBuilder; }; - } - ); + }; # Builders used to write during system activation ubootBuilder = import ./uboot-builder.nix { inherit pkgs; - ubootPackage = ( - if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4 - ); + ubootPackage = + if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4; firmwareBuilder = firmwarePopulateCmd; extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd; }; uefiBuilder = import ./uefi-builder.nix { inherit pkgs; - uefiPackage = ( + uefiPackage = if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else - pkgs.${namespace}.edk2.override { MODEL = "4"; } - ); + pkgs.${namespace}.edk2.override { MODEL = "4"; }; firmwareBuilder = firmwarePopulateCmd; }; @@ -297,14 +291,16 @@ in enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true); useGenerationDeviceTree = lib.mkOverride 60 (if cfg.bootType == "uefi" then false else true); }; - systemd-boot.enable = (if cfg.bootType == "uefi" then true else false); - systemd-boot.extraInstallCommands = - let - bootloaderInstaller = (builder."${cfg.bootType}"); - in - '' - ${bootloaderInstaller} -f /boot/firmware -b /boot -c - ''; + systemd-boot = { + enable = if cfg.bootType == "uefi" then true else false; + extraInstallCommands = + let + bootloaderInstaller = builder."${cfg.bootType}"; + in + '' + ${bootloaderInstaller} -f /boot/firmware -b /boot -c + ''; + }; grub.enable = lib.mkForce false; }; }; @@ -350,14 +346,13 @@ in }; kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") { enable = true; - value = ( + value = if cfg.bootType == "uboot" then "u-boot.bin" else if cfg.bootType == "kernel" then "kernel.img" else - "" - ); + ""; }; }; }; diff --git a/modules/nixos/hardware/raspberry-pi/i2c.nix b/modules/nixos/hardware/raspberry-pi/i2c.nix index d975b44..7bab8f0 100644 --- a/modules/nixos/hardware/raspberry-pi/i2c.nix +++ b/modules/nixos/hardware/raspberry-pi/i2c.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { hardware.deviceTree = { - overlays = ( + overlays = if (variant == "5") then [ { @@ -70,8 +70,7 @@ in name = "i2c6-overlay"; dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts"; } - ] - ); + ]; }; }; } diff --git a/modules/nixos/hardware/raspberry-pi/modesetting.nix b/modules/nixos/hardware/raspberry-pi/modesetting.nix index da3866f..244baab 100644 --- a/modules/nixos/hardware/raspberry-pi/modesetting.nix +++ b/modules/nixos/hardware/raspberry-pi/modesetting.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { hardware.deviceTree = { - overlays = ( + overlays = if (variant == "5") then [ { @@ -34,8 +34,7 @@ in pkgs.${namespace}.raspberrypi-overlays }/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts"; } - ] - ); + ]; }; }; } diff --git a/modules/nixos/hardware/raspberry-pi/pwm.nix b/modules/nixos/hardware/raspberry-pi/pwm.nix index 7191338..e35608a 100644 --- a/modules/nixos/hardware/raspberry-pi/pwm.nix +++ b/modules/nixos/hardware/raspberry-pi/pwm.nix @@ -19,13 +19,12 @@ in overlays = [ { name = "enable-pwm"; - filter = (if (variant == "5") then "*pi5*" else "*rpi-4-b*"); - dtsFile = ( + filter = if (variant == "5") then "*pi5*" else "*rpi-4-b*"; + dtsFile = if (variant == "5") then "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts" else - "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts" - ); + "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts"; } ]; }; diff --git a/modules/nixos/hardware/raspberry-pi/wifi.nix b/modules/nixos/hardware/raspberry-pi/wifi.nix index d591696..8d15498 100644 --- a/modules/nixos/hardware/raspberry-pi/wifi.nix +++ b/modules/nixos/hardware/raspberry-pi/wifi.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { hardware.deviceTree = { - overlays = ( + overlays = if (variant == "5") then [ { @@ -38,8 +38,7 @@ in name = "wifimac-overlay"; dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts"; } - ] - ); + ]; }; }; } diff --git a/modules/nixos/homeassistant/services/govee2mqtt/default.nix b/modules/nixos/homeassistant/services/govee2mqtt/default.nix index 874ff76..817c831 100644 --- a/modules/nixos/homeassistant/services/govee2mqtt/default.nix +++ b/modules/nixos/homeassistant/services/govee2mqtt/default.nix @@ -13,13 +13,13 @@ in sops = { secrets = { "jallen-nas/govee2mqtt/govee-email" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/govee2mqtt/govee-password" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/govee2mqtt/govee-api" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; }; templates = { diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index 4b53a1e..eb661d4 100644 --- a/modules/nixos/homeassistant/services/homeassistant/default.nix +++ b/modules/nixos/homeassistant/services/homeassistant/default.nix @@ -32,13 +32,13 @@ in sops = { secrets = { "home-assistant/auth-client-id" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nuc-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nuc-secrets.yaml"; owner = config.users.users.hass.name; group = config.users.users.hass.group; restartUnits = [ "home-assistant.service" ]; }; "home-assistant/auth-client-secret" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nuc-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nuc-secrets.yaml"; owner = config.users.users.hass.name; group = config.users.users.hass.group; restartUnits = [ "home-assistant.service" ]; diff --git a/modules/nixos/services/arrs/default.nix b/modules/nixos/services/arrs/default.nix index 77f45ba..96acff3 100644 --- a/modules/nixos/services/arrs/default.nix +++ b/modules/nixos/services/arrs/default.nix @@ -18,19 +18,19 @@ let sops = { secrets = { "jallen-nas/sabnzbd/password" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/sabnzbd/api-key" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/sabnzbd/nzb-key" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/sabnzbd/server/username" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; "jallen-nas/sabnzbd/server/password" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; }; }; templates = { diff --git a/modules/nixos/services/caddy/sops.nix b/modules/nixos/services/caddy/sops.nix index 037406f..faac277 100644 --- a/modules/nixos/services/caddy/sops.nix +++ b/modules/nixos/services/caddy/sops.nix @@ -4,7 +4,6 @@ namespace, ... }: -with lib; let cfg = config.${namespace}.services.caddy; in @@ -13,45 +12,45 @@ in sops = { secrets = { "jallen-nas/traefik/crowdsec/lapi-key" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/crowdsec/capi-machine-id" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/crowdsec/capi-password" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/cloudflare-dns-api-token" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/cloudflare-zone-api-token" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/cloudflare-api-key" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; }; "jallen-nas/traefik/cloudflare-email" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.caddy.name; group = config.users.users.caddy.group; restartUnits = [ "caddy.service" ]; diff --git a/modules/nixos/services/kavita/default.nix b/modules/nixos/services/kavita/default.nix index 5e16601..b9a0b94 100644 --- a/modules/nixos/services/kavita/default.nix +++ b/modules/nixos/services/kavita/default.nix @@ -4,7 +4,6 @@ namespace, ... }: -with lib; let name = "kavita"; cfg = config.${namespace}.services.${name}; @@ -17,7 +16,7 @@ let sops = { secrets = { "jallen-nas/kavita/token" = { - sopsFile = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + sopsFile = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; owner = config.users.users.kavita.name; group = config.users.users.kavita.group; restartUnits = [ "kavita.service" ]; diff --git a/overlays/linux-rpi/default.nix b/overlays/linux-rpi/default.nix index 31c2bd9..433944e 100644 --- a/overlays/linux-rpi/default.nix +++ b/overlays/linux-rpi/default.nix @@ -4,7 +4,7 @@ }: final: prev: let - linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi); + linux-rpi5 = final.linuxPackagesFor final.${namespace}.linux-rpi; linux-rpi5-latest = final.linuxPackagesFor ( final.${namespace}.linux-rpi.override { kernelVersion = "unstable"; diff --git a/packages/edk2-basetools/default.nix b/packages/edk2-basetools/default.nix index 4c47213..e2ebb97 100644 --- a/packages/edk2-basetools/default.nix +++ b/packages/edk2-basetools/default.nix @@ -12,14 +12,14 @@ let pname = "edk2-basetools"; src = srcOverride; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit src pname version; env = { NIX_CFLAGS_COMPILE = "-Wno-return-type" - + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + + lib.optionalString stdenv.cc.isGNU " -Wno-error=stringop-truncation" + + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-error=macro-redefined"; PYTHON_COMMAND = lib.getExe pythonEnv; # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 ${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix; diff --git a/packages/edk2/default.nix b/packages/edk2/default.nix index bc3d99c..d66ff9f 100644 --- a/packages/edk2/default.nix +++ b/packages/edk2/default.nix @@ -61,8 +61,8 @@ stdenv.mkDerivation rec { env = { NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error" - + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" - + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + + lib.optionalString stdenv.cc.isGNU " -Wno-error=stringop-truncation" + + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-error=macro-redefined"; PYTHON_COMMAND = lib.getExe pythonEnv; # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 ${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix; diff --git a/statix.toml b/statix.toml index 17f0303..96a6834 100644 --- a/statix.toml +++ b/statix.toml @@ -1,12 +1,10 @@ # Disable lint rules that generate excessive false-positives or noise. # # manual_inherit / manual_inherit_from: very high volume of style suggestions. -# useless_parens: many intentional parentheses for readability. # empty_pattern: { ... }: is a valid and readable no-arg pattern. disabled = [ "manual_inherit", "manual_inherit_from", - "useless_parens", "empty_pattern", # needed for some overlays ] diff --git a/systems/aarch64-darwin/macbook-pro/default.nix b/systems/aarch64-darwin/macbook-pro/default.nix index 49e813a..9683e12 100755 --- a/systems/aarch64-darwin/macbook-pro/default.nix +++ b/systems/aarch64-darwin/macbook-pro/default.nix @@ -34,9 +34,7 @@ nix = { linux-builder = { enable = false; - config = ({ - virtualisation.cores = 6; - }); + config.virtualisation.cores = 6; }; }; diff --git a/systems/aarch64-linux/pi5/sops.nix b/systems/aarch64-linux/pi5/sops.nix index 0c3b58a..d04d442 100755 --- a/systems/aarch64-linux/pi5/sops.nix +++ b/systems/aarch64-linux/pi5/sops.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let user = "matt"; - defaultSops = (lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml"); + defaultSops = lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml"; in { sops = { diff --git a/systems/x86_64-linux/jallen-nas/sops.nix b/systems/x86_64-linux/jallen-nas/sops.nix index 8d50f9e..d696675 100755 --- a/systems/x86_64-linux/jallen-nas/sops.nix +++ b/systems/x86_64-linux/jallen-nas/sops.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let user = "nix-apps"; - defaultSops = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); + defaultSops = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"; in { # Permission modes are in octal representation (same as chmod),