From 47cc1f23abc0f28eadef8efbb7210ebd1e040476 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 30 May 2025 16:15:43 -0500
Subject: [PATCH] Desktop Updates Fri May 30 04:15:43 PM CDT 2025

---
 flake.lock              |  6 +++---
 hosts/nas/grafana.nix   | 18 ++++++++++++++++++
 hosts/nas/nix-serve.nix | 32 ++++++++++++++++----------------
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 86e2465..beab94b 100755
--- a/flake.lock
+++ b/flake.lock
@@ -180,11 +180,11 @@
     },
     "desktop-nixos-hardware": {
       "locked": {
-        "lastModified": 1748613622,
-        "narHash": "sha256-SLB2MV138ujdjw0ETEakNt/o2O+d/QtvNLlwaBZSWKg=",
+        "lastModified": 1748634340,
+        "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b9d69212b5e65620e7d5b08df818db656f7fefb3",
+        "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
         "type": "github"
       },
       "original": {
diff --git a/hosts/nas/grafana.nix b/hosts/nas/grafana.nix
index 347ed78..c2f0ae7 100755
--- a/hosts/nas/grafana.nix
+++ b/hosts/nas/grafana.nix
@@ -1,4 +1,7 @@
 { config, ... }:
+let
+  upsUser = "nas-admin";
+in
 {
   services = {
     prometheus = {
@@ -18,6 +21,21 @@
             "--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 = [
         {
diff --git a/hosts/nas/nix-serve.nix b/hosts/nas/nix-serve.nix
index 5fe69cc..69abe17 100755
--- a/hosts/nas/nix-serve.nix
+++ b/hosts/nas/nix-serve.nix
@@ -75,22 +75,22 @@
         exit 1
       fi
       
-      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
-        echo "jallen-nas flake updated successfully at $(date)"
-      else
-        echo "jallen-nas flake failed to update at $(date)"
-        exit 1
-      fi
-      if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then
-        echo "jallen-nas built successfully at $(date)"
-        git add .
-        git commit -m "Jallen-NAS Updates $(date)"
-      else
-        echo "jallen-nas failed to build at $(date)"
-        git reset --hard
-        exit 1
-      fi
+      # 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
+      #   echo "jallen-nas flake updated successfully at $(date)"
+      # else
+      #   echo "jallen-nas flake failed to update at $(date)"
+      #   exit 1
+      # fi
+      # if nix build .\#nixosConfigurations.jallen-nas.config.system.build.toplevel --no-link; then
+      #   echo "jallen-nas built successfully at $(date)"
+      #   git add .
+      #   git commit -m "Jallen-NAS Updates $(date)"
+      # else
+      #   echo "jallen-nas failed to build at $(date)"
+      #   git reset --hard
+      #   exit 1
+      # fi
       
       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