10 Commits

Author SHA1 Message Date
Tom Alexander
b4d5e44b6b Add a nix-darwin config for a m1 mac mini. 2026-08-12 18:16:10 -04:00
Tom Alexander
1845b1ac30 Increase thresholds for automatic garbage collection. 2026-08-10 22:38:26 -04:00
Tom Alexander
4a772b7276 Disable ca-derivations for the kubernetes cluster also. 2026-08-10 18:30:58 -04:00
Tom Alexander
0e231428df Disable ca-derivations.
Seeing if this is what is causing all my issues with files/directories in the nix store going missing.
2026-08-10 15:27:18 -04:00
Tom Alexander
27b5c0c9ab Disable build of sm64ex. 2026-08-09 17:18:26 -04:00
Tom Alexander
54e97da71d Enable building on quark. 2026-08-09 16:23:47 -04:00
Tom Alexander
58c78c50e6 Add The Lord of the Rings The War in the North to RPCS3. 2026-08-09 16:23:47 -04:00
Tom Alexander
e2ed4013c5 Add support for exfat. 2026-08-09 16:23:47 -04:00
Tom Alexander
3aefe7c0b5 Update nix builder to gracefully handle errors during setup. 2026-08-09 00:45:41 -04:00
Tom Alexander
a2485dcfe0 Update NixBSD build target to my repo and add a wip branch build target. 2026-08-08 18:36:06 -04:00
13 changed files with 246 additions and 15 deletions

View File

@@ -36,6 +36,7 @@ in
./roles/emacs
./roles/emulate_isa
./roles/esim
./roles/exfat
./roles/firefox
./roles/firewall
./roles/flux
@@ -117,14 +118,14 @@ in
nix.settings.experimental-features = [
"nix-command"
"flakes"
"ca-derivations"
# "ca-derivations"
# "blake3-hashes"
# "git-hashing"
];
nix.settings.trusted-users = [ "@wheel" ];
nix.settings.connect-timeout = 5;
nix.settings.min-free = 128000000;
nix.settings.max-free = 1000000000;
nix.settings.min-free = 5 * 1024 * 1024 * 1024; # Kick off garbage collect if space for nix store is less than 5 GiB
nix.settings.max-free = 10 * 1024 * 1024 * 1024; # Run that garbage collect until at least 10 GiB are free.
nix.settings.fallback = true;
nix.settings.warn-dirty = false;
nix.settings.fsync-metadata = true;

View File

@@ -170,11 +170,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1785893798,
"narHash": "sha256-69nKdvM+E/66sj9R2HEK8i0p0TOt/0MSqfXiZjcJ9nI=",
"lastModified": 1786250497,
"narHash": "sha256-OPhVT5n9OyPDZA3mIO6D5jVVvp/QmG8nT5Trb0gouSs=",
"ref": "refs/heads/main",
"rev": "6386febdb81eb1e072ad7cb568019f06618008fe",
"revCount": 41,
"rev": "0a270dcbdd51baa2895634a3baee29373db8337a",
"revCount": 42,
"type": "git",
"url": "https://code.fizz.buzz/talexander/nix_builder.git"
},

View File

@@ -94,6 +94,7 @@
me.emacs_flavor = "full";
me.emulate_isa.enable = true;
me.esim.enable = true;
me.exfat.enable = true;
me.firefox.enable = true;
me.firewall.enable = true;
me.flux.enable = true;
@@ -164,7 +165,7 @@
me.zrepl.enable = true;
me.zsh.enable = true;
me.sm64ex.enable = true;
me.sm64ex.enable = false;
me.shipwright.enable = false;
me.ship2harkinian.enable = true;
};

View File

@@ -4,7 +4,7 @@
config = {
me.distributed_build.enable = true;
me.distributed_build.machines.quark = {
enable_build = false;
enable_build = true;
enable_substituter = false;
additional_config = {
speedFactor = 2;

View File

@@ -159,7 +159,7 @@
me.zrepl.enable = true;
me.zsh.enable = true;
me.sm64ex.enable = true;
me.sm64ex.enable = false;
me.shipwright.enable = false;
me.ship2harkinian.enable = true;
};

View File

@@ -0,0 +1,26 @@
{
config,
lib,
pkgs,
...
}:
{
imports = [ ];
options.me = {
exfat.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install exfat.";
};
};
config = lib.mkIf config.me.exfat.enable {
# boot.supportedFilesystems = [ "exfat" ];
environment.systemPackages = with pkgs; [
exfatprogs
];
};
}

View File

@@ -61,6 +61,7 @@
systemd.services."build-cache" =
let
enabled_targets = [
"wip"
"odo"
"odo_update"
"odowork"

View File

@@ -1,5 +1,12 @@
output_directory = "/home/nixworker/persist/nix_builder"
[[targets]]
name = "wip"
repo = "https://code.fizz.buzz/talexander/machine_setup.git"
branch = "wip"
path = "nix/configuration"
attr = "nixosConfigurations.odo.config.system.build.toplevel"
[[targets]]
name = "odo"
repo = "https://code.fizz.buzz/talexander/machine_setup.git"
@@ -180,10 +187,10 @@ output_directory = "/home/nixworker/persist/nix_builder"
[[targets]]
name = "nixbsd"
repo = "https://github.com/nixos-bsd/nixbsd.git"
revision = "2b512eda58e6d77378bd20d6027802b158942e24"
path = "."
attr = "base.vmClosureInfo"
repo = "https://code.fizz.buzz/talexander/machine_setup.git"
branch = "nixbsd"
path = "nix/nixbsd"
attr = "computer.vm"
[[targets]]
name = "nix_builder_develop"

View File

@@ -81,6 +81,10 @@ in
# Demon's Souls per-game config.
source = ./files/config_BLUS30443.yml;
};
".config/rpcs3/custom_configs/config_BLUS30421.yml" = {
# The Lord of the Rings The War in the North per-game config.
source = ./files/config_BLUS30421.yml;
};
".config/rpcs3/patches/patch.yml" = {
# All of the available patches.
source = ./files/patch.yml;

View File

@@ -0,0 +1,14 @@
Core:
SPU Block Size: Safe
Video:
Write Color Buffers: true
Minimum Scalable Dimension: 640
Net:
Internet enabled: Connected
IP address: 0.0.0.0
Bind address: 0.0.0.0
DNS address: 8.8.8.8
IP swap list: ""
UPNP Enabled: false
PSN status: RPCN
PSN Country: us

View File

@@ -41,7 +41,7 @@
nix.settings.experimental-features = [
"nix-command"
"flakes"
"ca-derivations"
# "ca-derivations"
# "blake3-hashes"
# "git-hashing"
];

49
nix/nix-darwin/flake.lock generated Normal file
View File

@@ -0,0 +1,49 @@
{
"nodes": {
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1785389976,
"narHash": "sha256-0tLW8Ff5yt8AH97jw4ZpFJ0OCJ122zIlgWGDmOfU/VU=",
"owner": "nix-darwin",
"repo": "nix-darwin",
"rev": "15abb8c98f336cd8bd840d71059adebabe60bf04",
"type": "github"
},
"original": {
"owner": "nix-darwin",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1786348146,
"narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

128
nix/nix-darwin/flake.nix Normal file
View File

@@ -0,0 +1,128 @@
# Initial install:
# Install nix: https://github.com/nixOS/nix-installer
# sudo nix run nix-darwin -- switch --flake .#garak
#
# Update after that:
# sudo darwin-rebuild switch --flake .#garak
#
# Manual:
# Install rosetta to run x86_64 programs:
# softwareupdate --install-rosetta --agree-to-license
#
# Install homebrew for installing graphical apps:
# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
{
description = "nix-darwin system flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-darwin.url = "github:nix-darwin/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs@{ self, nix-darwin, nixpkgs }:
let
configuration = { pkgs, ... }: {
# List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget
environment.systemPackages =
[
pkgs.tmux
pkgs.htop
pkgs.git
];
# Necessary for using flakes on this system.
nix.settings.experimental-features = "nix-command flakes";
# Enable alternative shell support in nix-darwin.
# programs.fish.enable = true;
# Set Git commit hash for darwin-version.
system.configurationRevision = self.rev or self.dirtyRev or null;
# Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog
system.stateVersion = 6;
# The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin";
# Identifies which user some settings apply to.
system.primaryUser = "talexander";
# Enable Linux VM for building Linux binaries.
#
# Test with:
# nix build --impure --expr '(with import <nixpkgs> { system = "aarch64-linux"; }; runCommand "foo" {} "uname -a > $out")'
nix.linux-builder.enable = true;
# system.defaults.CustomUserPreferences = {
# "com.apple.desktopservices" = {
# # Do not write .DS_Store files to external volumes
# DSDontWriteNetworkStores = true;
# DSDontWriteUSBStores = true;
# };
# "com.apple.screensaver" = {
# # Ask for password when returning from screensaver
# askForPassword = 1;
# askForPasswordDelay = 0;
# };
# "com.apple.SoftwareUpdate" = {
# AutomaticCheckEnabled = true;
# # Download updates in the background
# AutomaticDownload = 1;
# };
# };
# Use homebrew to install graphical apps from casks.
# homebrew = {
# enable = false;
# casks = [
# "firefox"
# ];
# };
# system.defaults = {
# dock = {
# autohide = true;
# };
# };
environment.variables = {
TERMINFO_DIRS = ["${pkgs.alacritty.terminfo.outPath}/share/terminfo"];
};
power = {
sleep = {
# sudo pmset -a displaysleep 10 sleep 0 disksleep 10
# Other options to consider: lowpowermode 0 standby 0 hibernatemode 0 powernap 0
#
# Defaults:
# standby 0
# Sleep On Power Button 1
# autorestartatconnect 0
# autorestart 0
# powernap 1
# networkoversleep 0
# disksleep 10
# sleep 1
# ttyskeepawake 1
# displaysleep 10
# tcpkeepalive 1
# womp 1
#
computer = "never";
display = 10;
harddisk = 10;
};
};
};
in
{
darwinConfigurations."garak" = nix-darwin.lib.darwinSystem {
modules = [ configuration ];
};
};
}