Merge branch 'main' into feat/mac-setup

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734366194,
+        "lastModified": 1735344290,
-        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734991663,
+        "lastModified": 1736200483,
-        "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=",
+        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff",
+        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
         "type": "github"
       },
       "original": {

hosts/dnsc-server/default.nix

@@ -76,6 +76,7 @@
     jellyfin
     jellyfin-web
     jellyfin-ffmpeg
+    usbutils
   ];
 
   # Programs
@@ -85,6 +86,23 @@
     enableSSHSupport = true;
   };
 
+  # UPS
+  power.ups = {
+    enable = true;
+  
+    ups."eaton-ups" = {
+      driver = "usbhid-ups";
+      port = "auto";
+    };
+  
+    users.upsmon = {
+      passwordFile = "/etc/upsmon.passwd";
+      upsmon = "primary";
+    };
+  
+    upsmon.monitor."eaton-ups".user = "upsmon";
+  };
+
   # Services
   # SSH
   services.openssh = {
@@ -106,7 +124,6 @@
   # Samba
   services.samba = {
     enable = true;
-    securityType = "user";
     openFirewall = true;
     settings = {
       global = {