talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build.

Browse Source
This commit is contained in:
Tom Alexander 2025-11-18 22:02:12 -05:00
parent 8ccd34aba9
commit 300dfc68cf
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nix/configuration/configuration.nix
View File

@ -179,6 +179,11 @@
(final: prev: { (final: prev: {
grub2 = (final.callPackage ./package/grub { }); grub2 = (final.callPackage ./package/grub { });
}) })
(final: prev: {
rpcs3 = prev.rpcs3.override {
ffmpeg = final.ffmpeg_7;
};
})
]; ];
# This option defines the first version of NixOS you have installed on this particular machine, # This option defines the first version of NixOS you have installed on this particular machine,

4
nix/configuration/hosts/odo/default.nix
View File

@ -116,7 +116,7 @@
me.rpcs3.enable = true; me.rpcs3.enable = true;
me.rust.enable = true; me.rust.enable = true;
me.sequoia.enable = true; me.sequoia.enable = true;
me.shadps4.enable = true; me.shadps4.enable = false;
me.shikane.enable = true; me.shikane.enable = true;
me.sops.enable = true; me.sops.enable = true;
me.sound.enable = true; me.sound.enable = true;
@ -135,7 +135,7 @@
me.vscode.enable = true; me.vscode.enable = true;
me.wasm.enable = true; me.wasm.enable = true;
me.waybar.enable = true; me.waybar.enable = true;
me.wine.enable = true; me.wine.enable = false;
me.wireguard.activated = [ me.wireguard.activated = [
"drmario" "drmario"
"wgh" "wgh"

4
nix/configuration/hosts/odowork/default.nix
View File

@ -116,7 +116,7 @@
me.rpcs3.enable = true; me.rpcs3.enable = true;
me.rust.enable = true; me.rust.enable = true;
me.sequoia.enable = true; me.sequoia.enable = true;
me.shadps4.enable = true; me.shadps4.enable = false;
me.shikane.enable = true; me.shikane.enable = true;
me.sops.enable = true; me.sops.enable = true;
me.sound.enable = true; me.sound.enable = true;
@ -135,7 +135,7 @@
me.vscode.enable = true; me.vscode.enable = true;
me.wasm.enable = true; me.wasm.enable = true;
me.waybar.enable = true; me.waybar.enable = true;
me.wine.enable = true; me.wine.enable = false;
me.wireguard.activated = [ me.wireguard.activated = [
"wgh" "wgh"
]; ];

4
nix/configuration/roles/distributed_build/default.nix
View File

@ -4,6 +4,8 @@
... ...
}: }:
# TODO: FreeBSD is x86_64-freebsd
let let
make_machine_config = name: { make_machine_config = name: {
enable = lib.mkOption { enable = lib.mkOption {
@ -52,6 +54,7 @@ in
# sshKey = ""; # sshKey = "";
# publicHostKey = ""; # publicHostKey = "";
systems = [ systems = [
"i686-linux"
"x86_64-linux" "x86_64-linux"
# "aarch64-linux" # "aarch64-linux"
]; ];
@ -82,6 +85,7 @@ in
# From: base64 -w0 /persist/ssh/ssh_host_ed25519_key.pub # From: base64 -w0 /persist/ssh/ssh_host_ed25519_key.pub
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUx0alplYlVYTkRkU3Y1enVGbjM3eFNMZUN3S2hPKzFMdWovM2FYNFJRTEEgcm9vdEBxdWFyawo="; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUx0alplYlVYTkRkU3Y1enVGbjM3eFNMZUN3S2hPKzFMdWovM2FYNFJRTEEgcm9vdEBxdWFyawo=";
systems = [ systems = [
"i686-linux"
"x86_64-linux" "x86_64-linux"
# "aarch64-linux" # "aarch64-linux"
]; ];