From 180c7abdf77c8e6f2e316a994840654116683efc Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 14 Oct 2024 09:54:30 -0500
Subject: [PATCH] nas cleanup

---
 hosts/nas/configuration.nix | 4 +++-
 hosts/nas/services.nix      | 6 +-----
 hosts/nas/sops.nix          | 1 +
 hosts/nas/ups.nix           | 6 ++++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix
index 4aeec02..e56420a 100755
--- a/hosts/nas/configuration.nix
+++ b/hosts/nas/configuration.nix
@@ -74,7 +74,7 @@ in
     # $ nix search wget
 
     sessionVariables = {
-      CACHIX_AGENT_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJlY2RjYjJiNi05YWQ4LTRiYmMtYWEwYS1mNGU5Yzk1ODM2OTMiLCJzY29wZXMiOiJhZ2VudCJ9.8SENqsNZ-UIFV4atm-cZnMT6LR08Iz_raAZi5QVsppo";
+      CACHIX_AGENT_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkYmNkZWNjYi04ZTI4LTQwOTAtYWIxOC02MTU5OTYwZTgxMTAiLCJzY29wZXMiOiJjYWNoZSJ9.G-9wCfKc3d8ld_zDJNjTxNWlkS3_yojI-6gaRpUT-i0";
     };
 
     systemPackages = with pkgs; [
@@ -91,6 +91,7 @@ in
       glances
       gparted
       htop
+      jq
       lm_sensors
       nano
       ninja
@@ -207,6 +208,7 @@ in
       isSystemUser = true;
       createHome = true;
       home = "/var/lib/nut";
+      homeMode = "750";
       hashedPasswordFile = passwordFile;
     };
 
diff --git a/hosts/nas/services.nix b/hosts/nas/services.nix
index 02533b0..0ffd350 100644
--- a/hosts/nas/services.nix
+++ b/hosts/nas/services.nix
@@ -65,7 +65,7 @@ in
         };
         dhcp = {
           enabled = true;
-          interface_name = "wlp6s0";
+          interface_name = "wlp7s0";
           dhcpv4 = {
             gateway_ip = "10.0.1.1";
             subnet_mask = "255.255.255.0";
@@ -127,10 +127,6 @@ in
       };
     };
 
-    apcupsd = {
-      enable = true;
-    };
-
     tailscale = {
       enable = true;
       openFirewall = true;
diff --git a/hosts/nas/sops.nix b/hosts/nas/sops.nix
index 737b9f6..f0189b2 100644
--- a/hosts/nas/sops.nix
+++ b/hosts/nas/sops.nix
@@ -11,6 +11,7 @@
   sops.secrets."jallen-nas/ups_password" = {
     # restartUnits = [ "ups stuff lol" ];
   };
+  sops.secrets."jallen-nas/ups_password".mode = "0777";
 
   sops.secrets."jallen-nas/collabora" = {
     restartUnits = [ "podman-collabora.service" ];
diff --git a/hosts/nas/ups.nix b/hosts/nas/ups.nix
index ddf9ed6..e546004 100644
--- a/hosts/nas/ups.nix
+++ b/hosts/nas/ups.nix
@@ -43,4 +43,10 @@ in
       ];
     };
   };
+
+  services = {
+    apcupsd = {
+      enable = true;
+    };
+  };
 }