diff --git a/.gitignore b/.gitignore index 6cce155..effb4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ result .direnv doc/index.html +keys # Result of bud commands vm diff --git a/hosts/lungmen/default.nix b/hosts/lungmen/default.nix index 9f32b54..cf93a20 100644 --- a/hosts/lungmen/default.nix +++ b/hosts/lungmen/default.nix @@ -47,6 +47,7 @@ in { common-gpu-amd common-cpu-amd ../../modules/network/dns + ../../modules/develop/nixbuild ../../users/root ../../users/patriot ]; diff --git a/modules/base/nix.nix b/modules/base/nix.nix index 6299f1d..e772295 100644 --- a/modules/base/nix.nix +++ b/modules/base/nix.nix @@ -15,6 +15,7 @@ keep-derivations = true fallback = true extra-experimental-features = nix-command flakes + builders-use-substitutes = true ''; useSandbox = true; allowedUsers = ["@wheel"]; diff --git a/modules/develop/nixbuild/default.nix b/modules/develop/nixbuild/default.nix new file mode 100644 index 0000000..fb84531 --- /dev/null +++ b/modules/develop/nixbuild/default.nix @@ -0,0 +1,26 @@ +{...}: { + programs.ssh.extraConfig = '' + Host eu.nixbuild.net + PubkeyAcceptedKeyTypes ssh-ed25519 + IdentityFile /etc/nixos/keys/nixbuild.key + ''; + + programs.ssh.knownHosts = { + nixbuild = { + hostNames = ["eu.nixbuild.net"]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; + }; + }; + + nix = { + distributedBuilds = true; + buildMachines = [ + { + hostName = "eu.nixbuild.net"; + system = "x86_64-linux"; + maxJobs = 100; + supportedFeatures = ["benchmark" "big-parallel"]; + } + ]; + }; +} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index c2244fc..56098ec 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -123,7 +123,7 @@ in { noto-fonts-cjk font-awesome dejavu_fonts - (nerdfonts.override {fonts = ["Monoid"];}) + #(nerdfonts.override {fonts = [font.name];}) # Programs wezterm cargo-outdated @@ -151,12 +151,9 @@ in { rust-analyzer ( lib.hiPrio - ( - steam.override - { - extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols]; - } - ) + (steam.override { + extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols]; + }) ) /* (multimc.overrideAttrs (old: { @@ -164,7 +161,6 @@ in { })) */ standardnotes - #discord-system-electron gh cloudflared ripcord