chore: nix fmt

This commit is contained in:
Harald Hoyer 2026-05-03 14:48:41 +02:00
parent 38767905af
commit f74928ce5f
21 changed files with 60 additions and 71 deletions

View file

@ -1,5 +1,4 @@
_: _: {
{
defaultSSHKeys = [ defaultSSHKeys = [
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz"

View file

@ -1,7 +1,8 @@
{ config {
, lib config,
, pkgs lib,
, ... pkgs,
...
}: }:
with lib; with lib;
with lib.metacfg; with lib.metacfg;

View file

@ -70,33 +70,31 @@ in
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = extraPackages = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( with pkgs;
with pkgs; [
[ vpl-gpu-rt
vpl-gpu-rt intel-compute-runtime
intel-compute-runtime intel-media-driver # LIBVA_DRIVER_NAME=iHD
intel-media-driver # LIBVA_DRIVER_NAME=iHD #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
#intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) libvdpau-va-gl
libvdpau-va-gl rocmPackages.clr.icd
rocmPackages.clr.icd ]
] );
);
}; };
systemd.tmpfiles.rules = systemd.tmpfiles.rules =
let let
rocmEnv = pkgs.symlinkJoin { rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined"; name = "rocm-combined";
paths = paths = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( with pkgs.rocmPackages;
with pkgs.rocmPackages; [
[ rocblas
rocblas hipblas
hipblas clr
clr ]
] );
);
}; };
in in
[ "L+ /opt/rocm - - - - ${rocmEnv}" ]; [ "L+ /opt/rocm - - - - ${rocmEnv}" ];

View file

@ -1,5 +1,4 @@
_: _: final: prev: {
final: prev: {
inetutils = prev.inetutils.overrideAttrs (old: { inetutils = prev.inetutils.overrideAttrs (old: {
# Fix gnulib variadic macro error on Darwin with newer Clang # Fix gnulib variadic macro error on Darwin with newer Clang
# The error.h macro __gl_error_call1 has issues with __VA_ARGS__ # The error.h macro __gl_error_call1 has issues with __VA_ARGS__

View file

@ -1,5 +1,4 @@
_: _: final: prev: {
final: prev: {
gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: { gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: {
patches = (prevAttrs.patches or [ ]) ++ [ patches = (prevAttrs.patches or [ ]) ++ [
./gnome-console-Add-image-and-file-path-pasting-support-for.patch ./gnome-console-Add-image-and-file-path-pasting-support-for.patch

View file

@ -36,8 +36,7 @@ final: prev: {
hash = "sha256-GCAOKYyijaQPVBgAixoZRPHIdiUfV8mPeeflE7aX8Ac="; hash = "sha256-GCAOKYyijaQPVBgAixoZRPHIdiUfV8mPeeflE7aX8Ac=";
}; };
} }
.${prev.stdenv.system} .${prev.stdenv.system} or (throw "unsupported system ${prev.stdenv.hostPlatform.system}")
or (throw "unsupported system ${prev.stdenv.hostPlatform.system}")
); );
}); });
# gemini-cli = channels.unstable.callPackage ./gemini-cli/package.nix { }; # gemini-cli = channels.unstable.callPackage ./gemini-cli/package.nix { };

View file

@ -1,5 +1,4 @@
_: _: {
{
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = [ nix.buildMachines = [

View file

@ -26,7 +26,10 @@
"sd_mod" "sd_mod"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" "ryzen_smu" ]; boot.kernelModules = [
"kvm-amd"
"ryzen_smu"
];
boot.extraModulePackages = [ config.boot.kernelPackages.ryzen-smu ]; boot.extraModulePackages = [ config.boot.kernelPackages.ryzen-smu ];
boot.kernelParams = [ boot.kernelParams = [

View file

@ -1,5 +1,4 @@
_: _: {
{
services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
"monitor.alsa.rules" = [ "monitor.alsa.rules" = [
{ {

View file

@ -1,5 +1,4 @@
_: _: {
{
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;
deviceNames = [ deviceNames = [

View file

@ -8,10 +8,12 @@
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ "atticd" ]; ensureDatabases = [ "atticd" ];
ensureUsers = [{ ensureUsers = [
name = "atticd"; {
ensureDBOwnership = true; name = "atticd";
}]; ensureDBOwnership = true;
}
];
}; };
environment.systemPackages = with pkgs; [ attic-client ]; environment.systemPackages = with pkgs; [ attic-client ];

View file

@ -42,9 +42,12 @@
matchConfig.Name = "enp1s0"; matchConfig.Name = "enp1s0";
networkConfig.DHCP = "ipv4"; networkConfig.DHCP = "ipv4";
address = [ "2a01:4f9:c014:619::1/64" ]; address = [ "2a01:4f9:c014:619::1/64" ];
routes = [{ Gateway = "fe80::1"; }]; routes = [ { Gateway = "fe80::1"; } ];
}; };
networking.firewall.allowedTCPPorts = [ 80 443 ]; networking.firewall.allowedTCPPorts = [
80
443
];
networking.firewall.allowPing = true; networking.firewall.allowPing = true;
security.acme = { security.acme = {

View file

@ -26,13 +26,12 @@ with lib.metacfg;
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
extraPackages = extraPackages = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( with pkgs;
with pkgs; [
[ rocmPackages.clr.icd
rocmPackages.clr.icd ]
] );
);
}; };
systemd.tmpfiles.rules = systemd.tmpfiles.rules =
@ -123,13 +122,11 @@ with lib.metacfg;
python313Packages.huggingface-hub python313Packages.huggingface-hub
]; ];
virtualisation = { virtualisation = {
docker.enable = true; docker.enable = true;
podman.dockerCompat = false; podman.dockerCompat = false;
}; };
# zram swap with zstd compression for better performance # zram swap with zstd compression for better performance
zramSwap = { zramSwap = {
algorithm = "zstd"; algorithm = "zstd";

View file

@ -1,5 +1,4 @@
_: _: {
{
services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
"monitor.alsa.rules" = [ "monitor.alsa.rules" = [
{ {

View file

@ -1,5 +1,4 @@
_: _: {
{
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;
deviceNames = [ deviceNames = [

View file

@ -1,5 +1,4 @@
_: _: {
{
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"00000" = { "00000" = {
useACMEHost = "hoyer.xyz"; useACMEHost = "hoyer.xyz";

View file

@ -1,5 +1,4 @@
_: _: {
{
systemd.services.netatalk.requires = [ systemd.services.netatalk.requires = [
"mnt-backup.mount" "mnt-backup.mount"
"mnt-raid.mount" "mnt-raid.mount"

View file

@ -1,5 +1,4 @@
_: _: {
{
services.open-webui = { services.open-webui = {
enable = true; enable = true;
port = 8080; port = 8080;

View file

@ -1,5 +1,4 @@
_: _: {
{
services.uptime-kuma = { services.uptime-kuma = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,5 +1,4 @@
_: _: {
{
services.wyoming = { services.wyoming = {
faster-whisper.servers."main" = { faster-whisper.servers."main" = {
enable = true; enable = true;

View file

@ -1,5 +1,4 @@
_: _: {
{
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;
deviceNames = [ deviceNames = [