Desktop Updates Fri May 30 04:15:43 PM CDT 2025

This commit is contained in:
mjallen18
2025-05-30 16:15:43 -05:00
parent 5e400f9667
commit 47cc1f23ab
3 changed files with 37 additions and 19 deletions

6
flake.lock generated
View File

@@ -180,11 +180,11 @@
}, },
"desktop-nixos-hardware": { "desktop-nixos-hardware": {
"locked": { "locked": {
"lastModified": 1748613622, "lastModified": 1748634340,
"narHash": "sha256-SLB2MV138ujdjw0ETEakNt/o2O+d/QtvNLlwaBZSWKg=", "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "b9d69212b5e65620e7d5b08df818db656f7fefb3", "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,4 +1,7 @@
{ config, ... }: { config, ... }:
let
upsUser = "nas-admin";
in
{ {
services = { services = {
prometheus = { prometheus = {
@@ -18,6 +21,21 @@
"--collector.filesystem.mount-points-exclude=^/(dev|proc|sys|run)($|/)" "--collector.filesystem.mount-points-exclude=^/(dev|proc|sys|run)($|/)"
]; ];
}; };
libvirt = {
enable = true;
openFirewall = true;
};
nut = {
enable = true;
openFirewall = true;
passwordPath = config.sops.secrets."jallen-nas/ups_password".path;
nutUser = upsUser;
};
# restic = {
# enable = true;
# openFirewall = true;
# resticPort = 8008;
# };
}; };
scrapeConfigs = [ scrapeConfigs = [
{ {

View File

@@ -75,22 +75,22 @@
exit 1 exit 1
fi fi
echo "Starting build of jallen-nas at $(date)" # echo "Starting build of jallen-nas at $(date)"
if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then # if nix flake update nas-nixpkgs nas-authentik-nix nas-cosmic nas-crowdsec nas-home-manager nas-impermanence nas-lanzaboote nas-nixos-hardware nas-sops-nix; then
echo "jallen-nas flake updated successfully at $(date)" # echo "jallen-nas flake updated successfully at $(date)"
else # else
echo "jallen-nas flake failed to update at $(date)" # echo "jallen-nas flake failed to update at $(date)"
exit 1 # exit 1
fi # fi
if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then # if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then
echo "jallen-nas built successfully at $(date)" # echo "jallen-nas built successfully at $(date)"
git add . # git add .
git commit -m "Jallen-NAS Updates $(date)" # git commit -m "Jallen-NAS Updates $(date)"
else # else
echo "jallen-nas failed to build at $(date)" # echo "jallen-nas failed to build at $(date)"
git reset --hard # git reset --hard
exit 1 # exit 1
fi # fi
echo "Starting build of pi4 at $(date)" echo "Starting build of pi4 at $(date)"
if nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko; then if nix flake update pi4-nixpkgs pi4-home-manager pi4-impermanence pi4-sops-nix pi4-nixos-hardware pi4-nixos-raspberrypi pi4-disko; then