diff --git a/modules/common.nix b/modules/common.nix index 339ca3e..35dd320 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,5 +1,4 @@ -_: -{ +_: { defaultSSHKeys = [ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBACLgT81iB1iWWVuXq6PdQ5GAAGhaZhSKnveQCvcNnAOZ5WKH80bZShKHyAYzrzbp8IGwLWJcZQ7TqRK+qZdfagAAAAEc3NoOg== harald@hoyer.xyz" diff --git a/modules/darwin/services/base/default.nix b/modules/darwin/services/base/default.nix index edb4e01..84c8f08 100644 --- a/modules/darwin/services/base/default.nix +++ b/modules/darwin/services/base/default.nix @@ -1,7 +1,8 @@ -{ config -, lib -, pkgs -, ... +{ + config, + lib, + pkgs, + ... }: with lib; with lib.metacfg; diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix index 391c8b7..ac35c06 100644 --- a/modules/nixos/services/gui/default.nix +++ b/modules/nixos/services/gui/default.nix @@ -70,33 +70,31 @@ in hardware.graphics = { enable = true; - extraPackages = - lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( - with pkgs; - [ - vpl-gpu-rt - intel-compute-runtime - intel-media-driver # LIBVA_DRIVER_NAME=iHD - #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - libvdpau-va-gl - rocmPackages.clr.icd - ] - ); + extraPackages = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( + with pkgs; + [ + vpl-gpu-rt + intel-compute-runtime + intel-media-driver # LIBVA_DRIVER_NAME=iHD + #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + libvdpau-va-gl + rocmPackages.clr.icd + ] + ); }; systemd.tmpfiles.rules = let rocmEnv = pkgs.symlinkJoin { name = "rocm-combined"; - paths = - lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( - with pkgs.rocmPackages; - [ - rocblas - hipblas - clr - ] - ); + paths = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( + with pkgs.rocmPackages; + [ + rocblas + hipblas + clr + ] + ); }; in [ "L+ /opt/rocm - - - - ${rocmEnv}" ]; diff --git a/overlays/inetutils-darwin-fix/default.nix b/overlays/inetutils-darwin-fix/default.nix index 9fc5644..38b1162 100644 --- a/overlays/inetutils-darwin-fix/default.nix +++ b/overlays/inetutils-darwin-fix/default.nix @@ -1,5 +1,4 @@ -_: -final: prev: { +_: final: prev: { inetutils = prev.inetutils.overrideAttrs (old: { # Fix gnulib variadic macro error on Darwin with newer Clang # The error.h macro __gl_error_call1 has issues with __VA_ARGS__ diff --git a/overlays/mods/default.nix b/overlays/mods/default.nix index dfce3e3..d6a566b 100644 --- a/overlays/mods/default.nix +++ b/overlays/mods/default.nix @@ -1,5 +1,4 @@ -_: -final: prev: { +_: final: prev: { gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: { patches = (prevAttrs.patches or [ ]) ++ [ ./gnome-console-Add-image-and-file-path-pasting-support-for.patch diff --git a/overlays/unstable/default.nix b/overlays/unstable/default.nix index c212a6e..c3b2561 100644 --- a/overlays/unstable/default.nix +++ b/overlays/unstable/default.nix @@ -36,8 +36,7 @@ final: prev: { hash = "sha256-GCAOKYyijaQPVBgAixoZRPHIdiUfV8mPeeflE7aX8Ac="; }; } - .${prev.stdenv.system} - or (throw "unsupported system ${prev.stdenv.hostPlatform.system}") + .${prev.stdenv.system} or (throw "unsupported system ${prev.stdenv.hostPlatform.system}") ); }); # gemini-cli = channels.unstable.callPackage ./gemini-cli/package.nix { }; diff --git a/systems/nixbuild.nix b/systems/nixbuild.nix index fdb2a8c..94af67b 100644 --- a/systems/nixbuild.nix +++ b/systems/nixbuild.nix @@ -1,5 +1,4 @@ -_: -{ +_: { nix.distributedBuilds = true; nix.buildMachines = [ diff --git a/systems/x86_64-linux/amd/hardware-configuration.nix b/systems/x86_64-linux/amd/hardware-configuration.nix index 216eb61..26e992a 100644 --- a/systems/x86_64-linux/amd/hardware-configuration.nix +++ b/systems/x86_64-linux/amd/hardware-configuration.nix @@ -26,7 +26,10 @@ "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "ryzen_smu" ]; + boot.kernelModules = [ + "kvm-amd" + "ryzen_smu" + ]; boot.extraModulePackages = [ config.boot.kernelPackages.ryzen-smu ]; boot.kernelParams = [ diff --git a/systems/x86_64-linux/amd/sound.nix b/systems/x86_64-linux/amd/sound.nix index 99fa565..e0130d2 100644 --- a/systems/x86_64-linux/amd/sound.nix +++ b/systems/x86_64-linux/amd/sound.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { "monitor.alsa.rules" = [ { diff --git a/systems/x86_64-linux/amd/xremap.nix b/systems/x86_64-linux/amd/xremap.nix index a3090d4..2125205 100644 --- a/systems/x86_64-linux/amd/xremap.nix +++ b/systems/x86_64-linux/amd/xremap.nix @@ -1,5 +1,4 @@ -_: -{ +_: { metacfg.services.xremap = { enable = true; deviceNames = [ diff --git a/systems/x86_64-linux/attic/atticd.nix b/systems/x86_64-linux/attic/atticd.nix index 232c1ea..4bfee84 100644 --- a/systems/x86_64-linux/attic/atticd.nix +++ b/systems/x86_64-linux/attic/atticd.nix @@ -8,10 +8,12 @@ services.postgresql = { enable = true; ensureDatabases = [ "atticd" ]; - ensureUsers = [{ - name = "atticd"; - ensureDBOwnership = true; - }]; + ensureUsers = [ + { + name = "atticd"; + ensureDBOwnership = true; + } + ]; }; environment.systemPackages = with pkgs; [ attic-client ]; diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/attic/default.nix index 9b58f1e..b6ecf43 100644 --- a/systems/x86_64-linux/attic/default.nix +++ b/systems/x86_64-linux/attic/default.nix @@ -42,9 +42,12 @@ matchConfig.Name = "enp1s0"; networkConfig.DHCP = "ipv4"; 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; security.acme = { diff --git a/systems/x86_64-linux/halo/default.nix b/systems/x86_64-linux/halo/default.nix index 9d1c0ce..eeb376c 100644 --- a/systems/x86_64-linux/halo/default.nix +++ b/systems/x86_64-linux/halo/default.nix @@ -26,13 +26,12 @@ with lib.metacfg; hardware.graphics = { enable = true; - extraPackages = - lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( - with pkgs; - [ - rocmPackages.clr.icd - ] - ); + extraPackages = lib.optionals pkgs.stdenv.targetPlatform.isx86_64 ( + with pkgs; + [ + rocmPackages.clr.icd + ] + ); }; systemd.tmpfiles.rules = @@ -123,13 +122,11 @@ with lib.metacfg; python313Packages.huggingface-hub ]; - virtualisation = { docker.enable = true; podman.dockerCompat = false; }; - # zram swap with zstd compression for better performance zramSwap = { algorithm = "zstd"; diff --git a/systems/x86_64-linux/halo/sound.nix b/systems/x86_64-linux/halo/sound.nix index 99fa565..e0130d2 100644 --- a/systems/x86_64-linux/halo/sound.nix +++ b/systems/x86_64-linux/halo/sound.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { "monitor.alsa.rules" = [ { diff --git a/systems/x86_64-linux/halo/xremap.nix b/systems/x86_64-linux/halo/xremap.nix index a3090d4..2125205 100644 --- a/systems/x86_64-linux/halo/xremap.nix +++ b/systems/x86_64-linux/halo/xremap.nix @@ -1,5 +1,4 @@ -_: -{ +_: { metacfg.services.xremap = { enable = true; deviceNames = [ diff --git a/systems/x86_64-linux/mx/nginx.nix b/systems/x86_64-linux/mx/nginx.nix index 6e61be9..864d244 100644 --- a/systems/x86_64-linux/mx/nginx.nix +++ b/systems/x86_64-linux/mx/nginx.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.nginx.virtualHosts = { "00000" = { useACMEHost = "hoyer.xyz"; diff --git a/systems/x86_64-linux/sgx/fileserver.nix b/systems/x86_64-linux/sgx/fileserver.nix index 2dc8a07..699a7c7 100644 --- a/systems/x86_64-linux/sgx/fileserver.nix +++ b/systems/x86_64-linux/sgx/fileserver.nix @@ -1,5 +1,4 @@ -_: -{ +_: { systemd.services.netatalk.requires = [ "mnt-backup.mount" "mnt-raid.mount" diff --git a/systems/x86_64-linux/sgx/openwebui.nix b/systems/x86_64-linux/sgx/openwebui.nix index c072c47..589139e 100644 --- a/systems/x86_64-linux/sgx/openwebui.nix +++ b/systems/x86_64-linux/sgx/openwebui.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.open-webui = { enable = true; port = 8080; diff --git a/systems/x86_64-linux/sgx/uptime-kuma.nix b/systems/x86_64-linux/sgx/uptime-kuma.nix index 0001220..6e9ae29 100644 --- a/systems/x86_64-linux/sgx/uptime-kuma.nix +++ b/systems/x86_64-linux/sgx/uptime-kuma.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.uptime-kuma = { enable = true; settings = { diff --git a/systems/x86_64-linux/sgx/wyoming.nix b/systems/x86_64-linux/sgx/wyoming.nix index b8b2227..1b4f870 100644 --- a/systems/x86_64-linux/sgx/wyoming.nix +++ b/systems/x86_64-linux/sgx/wyoming.nix @@ -1,5 +1,4 @@ -_: -{ +_: { services.wyoming = { faster-whisper.servers."main" = { enable = true; diff --git a/systems/x86_64-linux/x1/xremap.nix b/systems/x86_64-linux/x1/xremap.nix index a3090d4..2125205 100644 --- a/systems/x86_64-linux/x1/xremap.nix +++ b/systems/x86_64-linux/x1/xremap.nix @@ -1,5 +1,4 @@ -_: -{ +_: { metacfg.services.xremap = { enable = true; deviceNames = [