This commit is contained in:
mjallen18
2025-06-13 17:34:18 -05:00
parent 475ad55c4b
commit d8a63c58a5
3 changed files with 65 additions and 40 deletions

54
flake.lock generated
View File

@@ -310,11 +310,11 @@
"rust-analyzer-src": "rust-analyzer-src_2" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1749278330, "lastModified": 1749623906,
"narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=", "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -713,11 +713,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749243446, "lastModified": 1749649116,
"narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "narHash": "sha256-pCuUfMkhlP+XqW+TXX5Tssk8IE4TpS3MbG7OQtvaQdM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "rev": "02040b7777f65342b96c7f826a5c6aef95585057",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -757,11 +757,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749312278, "lastModified": 1749627191,
"narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1851,11 +1851,11 @@
"rust-analyzer-src_2": { "rust-analyzer-src_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749194353, "lastModified": 1749558764,
"narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2021,11 +2021,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1749412641, "lastModified": 1749757487,
"narHash": "sha256-1ftxNhm7bmqv3TDVYmn+DQIBHNJmDBgIHqIqCaPBcpk=", "narHash": "sha256-yPxNQ2wo4Iiv/QiacFcL4gPC/uansnY6FmPvW53fUhg=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "aa46f16e8aafe8903d59fcd71e9c0786d31de861", "rev": "12314126ea2c78758055c1f413182fbea617801c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2063,11 +2063,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749400020, "lastModified": 1749821119,
"narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=", "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f", "rev": "79dfd9aa295e53773aad45480b44c131da29f35b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2099,11 +2099,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749312278, "lastModified": 1749627191,
"narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2140,11 +2140,11 @@
}, },
"steamdeck-nixos-hardware": { "steamdeck-nixos-hardware": {
"locked": { "locked": {
"lastModified": 1749195551, "lastModified": 1749832440,
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2177,11 +2177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747603214, "lastModified": 1749592509,
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "rev": "50754dfaa0e24e313c626900d44ef431f3210138",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -8,7 +8,7 @@ let
actualUrl = "http://${config.containers.actual.localAddress}:${toString config.containers.actual.config.services.actual.settings.port}"; actualUrl = "http://${config.containers.actual.localAddress}:${toString config.containers.actual.config.services.actual.settings.port}";
authentikUrl = "http://${serverIp}:9000"; authentikUrl = "http://${serverIp}:9000";
cacheUrl = "http://${serverIp}:${toString config.services.nix-serve.port}"; cacheUrl = "http://${serverIp}:9012";
cloudUrl = "http://${config.containers.nextcloud.localAddress}:80"; cloudUrl = "http://${config.containers.nextcloud.localAddress}:80";
giteaUrl = "http://${config.containers.gitea.localAddress}:${toString config.containers.gitea.config.services.gitea.settings.server.SSH_PORT}"; giteaUrl = "http://${config.containers.gitea.localAddress}:${toString config.containers.gitea.config.services.gitea.settings.server.SSH_PORT}";
hassUrl = "http://homeassistant.local:8123"; hassUrl = "http://homeassistant.local:8123";

View File

@@ -6,7 +6,7 @@ in
# "https://cache.mjallen.dev" # "https://cache.mjallen.dev"
# "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc=" # "cache.mjallen.dev-1:IzFmKCd8/gggI6lcCXsW65qQwiCLGFFN9t9s2iw7Lvc="
services.nix-serve = { services.nix-serve = {
enable = true; enable = false;
package = pkgs.nix-serve-ng; package = pkgs.nix-serve-ng;
secretKeyFile = "/etc/nix/cache-priv-key.pem"; secretKeyFile = "/etc/nix/cache-priv-key.pem";
port = 5000; # Choose your preferred port port = 5000; # Choose your preferred port
@@ -24,6 +24,29 @@ in
# Improved systemd service with better error handling # Improved systemd service with better error handling
systemd = { systemd = {
services = { services = {
attic-watch-store = {
enable = true;
description = "watch store for cache";
serviceConfig = {
Type = "simple";
User = "admin";
Group = "jallen-nas";
WorkingDirectory = "/etc/nixos";
StandardOutput = "journal+console";
StandardError = "journal+console";
Restart = "always";
restartSec = "5";
};
path = with pkgs; [
bash
attic-client
];
script = ''
#!/usr/bin/env bash
attic watch-store nas-cache
'';
};
nix-rebuild-cache-desktop = { nix-rebuild-cache-desktop = {
enable = true; enable = true;
description = "Rebuild desktop NixOS configurations for cache"; description = "Rebuild desktop NixOS configurations for cache";
@@ -307,15 +330,17 @@ in
}; };
}; };
nix.settings.builders-use-substitutes = true; nix = {
nix.distributedBuilds = true; settings.builders-use-substitutes = true;
nix.buildMachines = [ distributedBuilds = true;
{ buildMachines = [
hostName = "pi5.local"; {
system = "aarch64-linux"; hostName = "pi5.local";
maxJobs = 4; system = "aarch64-linux";
sshUser = "matt"; maxJobs = 4;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; sshUser = "matt";
} supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
]; }
];
};
} }