mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

useless_parens

Browse Source
This commit is contained in:
mjallen18
2026-04-05 15:10:13 -05:00
parent 07b1fc3618
commit a363622659
25 changed files with 76 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homes/aarch64-linux/matt@macbook-pro-nixos/default.nix
View File

@@ -135,7 +135,7 @@ in
sops = { sops = {
secrets = { secrets = {
"protonmail-password" = { "protonmail-password" = {
sopsFile = (lib.snowfall.fs.get-file "secrets/mac-secrets.yaml"); sopsFile = lib.snowfall.fs.get-file "secrets/mac-secrets.yaml";
}; };
}; };
}; };

7
lib/module/default.nix
View File

@@ -149,8 +149,9 @@ rec {
reverseProxy = mkReverseProxyOpt name; reverseProxy = mkReverseProxyOpt name;
hostedService = { hostedService = {
enable = mkOpt types.bool (cfg.reverseProxy.enable enable =
) "Expose this service in Glance dashboard (auto-enabled when reverseProxy is on)"; 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"; title = mkOpt types.str name "Display title in Glance";
icon = mkOpt types.str "si:glance" "Icon identifier for Glance (e.g. si:actualbudget)"; 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"; group = mkOpt types.str "Services" "Glance group/category for this service";
@@ -254,7 +255,7 @@ rec {
owner ? "nix-apps", owner ? "nix-apps",
group ? "jallen-nas", group ? "jallen-nas",
mode ? "660", 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; sops.secrets = mapAttrs (_key: extra: { inherit sopsFile; } // extra) secrets;

2
modules/home/home/default.nix
View File

@@ -57,7 +57,7 @@ in
wget wget
] ]
++ ( ++ (
if (hasDestopEnvironment) then if hasDestopEnvironment then
[ [
boxbuddy boxbuddy
cider-2 cider-2

5
modules/home/programs/waybar/default.nix
View File

@@ -294,7 +294,7 @@ in
systemd.enable = true; systemd.enable = true;
settings = { settings = {
mainBar = ( mainBar =
(mkMerge [ (mkMerge [
{ {
layer = cfg.layer; layer = cfg.layer;
@@ -589,8 +589,7 @@ in
}; };
}) })
]) ])
// cfg.extra.settings // cfg.extra.settings;
);
} }
// cfg.extraModules; # keep legacy top-level extra modules for compatibility // cfg.extraModules; # keep legacy top-level extra modules for compatibility

6
modules/home/user/default.nix
View File

@@ -35,17 +35,17 @@ in
description = "The full name of the user."; description = "The full name of the user.";
}; };
home = mkOption { home = mkOption {
type = (types.nullOr types.str); type = types.nullOr types.str;
default = home-directory; default = home-directory;
description = "The user's home directory."; description = "The user's home directory.";
}; };
icon = mkOption { icon = mkOption {
type = (types.nullOr types.package); type = types.nullOr types.package;
default = null; 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)."; 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 { name = mkOption {
type = (types.nullOr types.str); type = types.nullOr types.str;
default = "matt"; default = "matt";
description = "The user account."; description = "The user account.";
}; };

2
modules/nixos/boot/common/default.nix
View File

@@ -62,7 +62,7 @@ in
bcachefs.package = lib.mkOverride 90 pkgs.${namespace}.bcachefs; bcachefs.package = lib.mkOverride 90 pkgs.${namespace}.bcachefs;
consoleLogLevel = lib.mkDefault 0; consoleLogLevel = lib.mkDefault 0;
bootspec.enable = (!isArm); bootspec.enable = !isArm;
initrd = { initrd = {
verbose = lib.mkDefault false; verbose = lib.mkDefault false;

5
modules/nixos/hardware/raspberry-pi/audio.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.deviceTree = { hardware.deviceTree = {
overlays = ( overlays =
with pkgs.${namespace}; with pkgs.${namespace};
( (
if (variant == "5") then if (variant == "5") then
@@ -33,8 +33,7 @@ in
dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts"; dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
} }
] ]
) );
);
}; };
}; };
} }

5
modules/nixos/hardware/raspberry-pi/bluetooth.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.deviceTree = { hardware.deviceTree = {
overlays = ( overlays =
if (variant == "5") then if (variant == "5") then
[ [
{ {
@@ -34,8 +34,7 @@ in
pkgs.${namespace}.raspberrypi-overlays pkgs.${namespace}.raspberrypi-overlays
}/dtbs/raspberrypi-overlays/disable-bt-overlay.dts"; }/dtbs/raspberrypi-overlays/disable-bt-overlay.dts";
} }
] ];
);
}; };
}; };
} }

53
modules/nixos/hardware/raspberry-pi/default.nix
View File

@@ -15,7 +15,7 @@ let
# installs raspberry's firmware independent of the nixos generations # installs raspberry's firmware independent of the nixos generations
# sometimes referred to as "boot code" # sometimes referred to as "boot code"
raspberryPiFirmware = ( raspberryPiFirmware =
{ {
pkgs, pkgs,
firmware, firmware,
@@ -33,10 +33,9 @@ let
inherit firmware configTxt; inherit firmware configTxt;
}; };
} };
);
kernelbootGenBuilder = ( kernelbootGenBuilder =
{ {
pkgs, pkgs,
deviceTreeInstaller, deviceTreeInstaller,
@@ -53,10 +52,9 @@ let
installDeviceTree = deviceTreeInstaller; installDeviceTree = deviceTreeInstaller;
}; };
} };
);
deviceTree = ( deviceTree =
{ {
pkgs, pkgs,
firmware, firmware,
@@ -73,8 +71,7 @@ let
inherit firmware; inherit firmware;
}; };
} };
);
mkBootloader = mkBootloader =
pkgs: pkgs:
@@ -113,7 +110,7 @@ let
}; };
bootloader = ( bootloader =
{ {
pkgs, pkgs,
nixosGenerationsDir, nixosGenerationsDir,
@@ -136,28 +133,25 @@ let
# NixOS-generations -dependent # NixOS-generations -dependent
inherit nixosGenerationsDir nixosGenBuilder; inherit nixosGenerationsDir nixosGenBuilder;
}; };
} };
);
# Builders used to write during system activation # Builders used to write during system activation
ubootBuilder = import ./uboot-builder.nix { ubootBuilder = import ./uboot-builder.nix {
inherit pkgs; inherit pkgs;
ubootPackage = ( ubootPackage =
if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4 if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4;
);
firmwareBuilder = firmwarePopulateCmd; firmwareBuilder = firmwarePopulateCmd;
extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd; extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
}; };
uefiBuilder = import ./uefi-builder.nix { uefiBuilder = import ./uefi-builder.nix {
inherit pkgs; inherit pkgs;
uefiPackage = ( uefiPackage =
if (cfg.variant == "5") then if (cfg.variant == "5") then
pkgs.${namespace}.uefi-rpi5 pkgs.${namespace}.uefi-rpi5
else else
pkgs.${namespace}.edk2.override { MODEL = "4"; } pkgs.${namespace}.edk2.override { MODEL = "4"; };
);
firmwareBuilder = firmwarePopulateCmd; firmwareBuilder = firmwarePopulateCmd;
}; };
@@ -297,14 +291,16 @@ in
enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true); enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true);
useGenerationDeviceTree = lib.mkOverride 60 (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 = {
systemd-boot.extraInstallCommands = enable = if cfg.bootType == "uefi" then true else false;
let extraInstallCommands =
bootloaderInstaller = (builder."${cfg.bootType}"); let
in bootloaderInstaller = builder."${cfg.bootType}";
'' in
${bootloaderInstaller} -f /boot/firmware -b /boot -c ''
''; ${bootloaderInstaller} -f /boot/firmware -b /boot -c
'';
};
grub.enable = lib.mkForce false; grub.enable = lib.mkForce false;
}; };
}; };
@@ -350,14 +346,13 @@ in
}; };
kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") { kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") {
enable = true; enable = true;
value = ( value =
if cfg.bootType == "uboot" then if cfg.bootType == "uboot" then
"u-boot.bin" "u-boot.bin"
else if cfg.bootType == "kernel" then else if cfg.bootType == "kernel" then
"kernel.img" "kernel.img"
else else
"" "";
);
}; };
}; };
}; };

5
modules/nixos/hardware/raspberry-pi/i2c.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.deviceTree = { hardware.deviceTree = {
overlays = ( overlays =
if (variant == "5") then if (variant == "5") then
[ [
{ {
@@ -70,8 +70,7 @@ in
name = "i2c6-overlay"; name = "i2c6-overlay";
dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts"; dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts";
} }
] ];
);
}; };
}; };
} }

5
modules/nixos/hardware/raspberry-pi/modesetting.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.deviceTree = { hardware.deviceTree = {
overlays = ( overlays =
if (variant == "5") then if (variant == "5") then
[ [
{ {
@@ -34,8 +34,7 @@ in
pkgs.${namespace}.raspberrypi-overlays pkgs.${namespace}.raspberrypi-overlays
}/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts"; }/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts";
} }
] ];
);
}; };
}; };
} }

7
modules/nixos/hardware/raspberry-pi/pwm.nix
View File

@@ -19,13 +19,12 @@ in
overlays = [ overlays = [
{ {
name = "enable-pwm"; name = "enable-pwm";
filter = (if (variant == "5") then "*pi5*" else "*rpi-4-b*"); filter = if (variant == "5") then "*pi5*" else "*rpi-4-b*";
dtsFile = ( dtsFile =
if (variant == "5") then if (variant == "5") then
"${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts" "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts"
else else
"${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts" "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts";
);
} }
]; ];
}; };

5
modules/nixos/hardware/raspberry-pi/wifi.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.deviceTree = { hardware.deviceTree = {
overlays = ( overlays =
if (variant == "5") then if (variant == "5") then
[ [
{ {
@@ -38,8 +38,7 @@ in
name = "wifimac-overlay"; name = "wifimac-overlay";
dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts"; dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts";
} }
] ];
);
}; };
}; };
} }

6
modules/nixos/homeassistant/services/govee2mqtt/default.nix
View File

@@ -13,13 +13,13 @@ in
sops = { sops = {
secrets = { secrets = {
"jallen-nas/govee2mqtt/govee-email" = { "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" = { "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" = { "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 = { templates = {

4
modules/nixos/homeassistant/services/homeassistant/default.nix
View File

@@ -32,13 +32,13 @@ in
sops = { sops = {
secrets = { secrets = {
"home-assistant/auth-client-id" = { "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; owner = config.users.users.hass.name;
group = config.users.users.hass.group; group = config.users.users.hass.group;
restartUnits = [ "home-assistant.service" ]; restartUnits = [ "home-assistant.service" ];
}; };
"home-assistant/auth-client-secret" = { "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; owner = config.users.users.hass.name;
group = config.users.users.hass.group; group = config.users.users.hass.group;
restartUnits = [ "home-assistant.service" ]; restartUnits = [ "home-assistant.service" ];

10
modules/nixos/services/arrs/default.nix
View File

@@ -18,19 +18,19 @@ let
sops = { sops = {
secrets = { secrets = {
"jallen-nas/sabnzbd/password" = { "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" = { "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" = { "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" = { "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" = { "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 = { templates = {

15
modules/nixos/services/caddy/sops.nix
View File

@@ -4,7 +4,6 @@
namespace, namespace,
... ...
}: }:
with lib;
let let
cfg = config.${namespace}.services.caddy; cfg = config.${namespace}.services.caddy;
in in
@@ -13,45 +12,45 @@ in
sops = { sops = {
secrets = { secrets = {
"jallen-nas/traefik/crowdsec/lapi-key" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/crowdsec/capi-machine-id" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/crowdsec/capi-password" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/cloudflare-dns-api-token" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/cloudflare-zone-api-token" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/cloudflare-api-key" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];
}; };
"jallen-nas/traefik/cloudflare-email" = { "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; owner = config.users.users.caddy.name;
group = config.users.users.caddy.group; group = config.users.users.caddy.group;
restartUnits = [ "caddy.service" ]; restartUnits = [ "caddy.service" ];

3
modules/nixos/services/kavita/default.nix
View File

@@ -4,7 +4,6 @@
namespace, namespace,
... ...
}: }:
with lib;
let let
name = "kavita"; name = "kavita";
cfg = config.${namespace}.services.${name}; cfg = config.${namespace}.services.${name};
@@ -17,7 +16,7 @@ let
sops = { sops = {
secrets = { secrets = {
"jallen-nas/kavita/token" = { "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; owner = config.users.users.kavita.name;
group = config.users.users.kavita.group; group = config.users.users.kavita.group;
restartUnits = [ "kavita.service" ]; restartUnits = [ "kavita.service" ];

2
overlays/linux-rpi/default.nix
View File

@@ -4,7 +4,7 @@
}: }:
final: prev: final: prev:
let let
linux-rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi); linux-rpi5 = final.linuxPackagesFor final.${namespace}.linux-rpi;
linux-rpi5-latest = final.linuxPackagesFor ( linux-rpi5-latest = final.linuxPackagesFor (
final.${namespace}.linux-rpi.override { final.${namespace}.linux-rpi.override {
kernelVersion = "unstable"; kernelVersion = "unstable";

6
packages/edk2-basetools/default.nix
View File

@@ -12,14 +12,14 @@ let
pname = "edk2-basetools"; pname = "edk2-basetools";
src = srcOverride; src = srcOverride;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation {
inherit src pname version; inherit src pname version;
env = { env = {
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
"-Wno-return-type" "-Wno-return-type"
+ lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + lib.optionalString stdenv.cc.isGNU " -Wno-error=stringop-truncation"
+ lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-error=macro-redefined";
PYTHON_COMMAND = lib.getExe pythonEnv; PYTHON_COMMAND = lib.getExe pythonEnv;
# trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319
${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix; ${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix;

4
packages/edk2/default.nix
View File

@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
env = { env = {
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
"-Wno-return-type -Wno-error" "-Wno-return-type -Wno-error"
+ lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + lib.optionalString stdenv.cc.isGNU " -Wno-error=stringop-truncation"
+ lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; + lib.optionalString stdenv.hostPlatform.isDarwin " -Wno-error=macro-redefined";
PYTHON_COMMAND = lib.getExe pythonEnv; PYTHON_COMMAND = lib.getExe pythonEnv;
# trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319
${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix; ${"GCC5_AARCH64_PREFIX"} = stdenv.cc.targetPrefix;

2
statix.toml
View File

@@ -1,12 +1,10 @@
# Disable lint rules that generate excessive false-positives or noise. # Disable lint rules that generate excessive false-positives or noise.
# #
# manual_inherit / manual_inherit_from: very high volume of style suggestions. # 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. # empty_pattern: { ... }: is a valid and readable no-arg pattern.
disabled = [ disabled = [
"manual_inherit", "manual_inherit",
"manual_inherit_from", "manual_inherit_from",
"useless_parens",
"empty_pattern", # needed for some overlays "empty_pattern", # needed for some overlays
] ]

4
systems/aarch64-darwin/macbook-pro/default.nix
View File

@@ -34,9 +34,7 @@
nix = { nix = {
linux-builder = { linux-builder = {
enable = false; enable = false;
config = ({ config.virtualisation.cores = 6;
virtualisation.cores = 6;
});
}; };
}; };

2
systems/aarch64-linux/pi5/sops.nix
View File

@@ -1,7 +1,7 @@
{ config, lib, ... }: { config, lib, ... }:
let let
user = "matt"; user = "matt";
defaultSops = (lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml"); defaultSops = lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml";
in in
{ {
sops = { sops = {

2
systems/x86_64-linux/jallen-nas/sops.nix
View File

@@ -1,7 +1,7 @@
{ config, lib, ... }: { config, lib, ... }:
let let
user = "nix-apps"; user = "nix-apps";
defaultSops = (lib.snowfall.fs.get-file "secrets/nas-secrets.yaml"); defaultSops = lib.snowfall.fs.get-file "secrets/nas-secrets.yaml";
in in
{ {
# Permission modes are in octal representation (same as chmod), # Permission modes are in octal representation (same as chmod),