diff --git a/flake.lock b/flake.lock index afd22d9..b53f927 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1717279440, + "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "717cc95983cdc357bc347d70be20ced21f935843", "type": "github" }, "original": { @@ -54,11 +54,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1717161359, - "narHash": "sha256-OgbzieYV/ZvJn2Gj0Eqe5QMdl9DJEHhbsIjfP8w1KQs=", + "lastModified": 1717621462, + "narHash": "sha256-mXo0SRiedkQVZ9MOkWjT9PsIL7AOwjMlMu+KnTEiDZ8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5507ee42f38a2ba917a47d6964e56701317a0d21", + "rev": "56929432c95bd3569adc36b478be5aa0c9b46254", "type": "github" }, "original": { @@ -134,11 +134,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1716883613, - "narHash": "sha256-1fJyH76Pfx863Uk5jpPtpmyAIZcCk1luPD0cmPnhUNU=", + "lastModified": 1717556423, + "narHash": "sha256-n1neYvj1Yov77dKe5+1w0xJxxNW/uwg+YMO/wE+pJqI=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "f4cfc77a577e0dfd152878830294c8eb3fe47861", + "rev": "732e8b82aa74fcfacbe78afbd62946e5d6bdd791", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1717025063, - "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=", + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", "owner": "ipetkov", "repo": "crane", - "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", "type": "github" }, "original": { @@ -251,11 +251,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1717136818, - "narHash": "sha256-BKFOT/eg0mCf99oTKa63yW+d5Y3K6c5Gb+NetxacaHg=", + "lastModified": 1717568841, + "narHash": "sha256-uF0TjD2fu8uShcCubVoKA9CQaAjJpDVCnzrK0uSMU1g=", "owner": "nix-community", "repo": "fenix", - "rev": "14c3b99d4b7cb91343807eac77f005ed9218f742", + "rev": "1df7cd8d759674ac69bdb67e0d55446c2394da68", "type": "github" }, "original": { @@ -415,11 +415,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { @@ -456,11 +456,11 @@ ] }, "locked": { - "lastModified": 1717097707, - "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1717012808, - "narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=", + "lastModified": 1717520847, + "narHash": "sha256-5dUXMWe+K/PukrgFt8Yp+HHJG6VmTOlw+04+L+V2RfU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98", + "rev": "ab21c7d33b116f2f4def094a0f0c339b61f4335d", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1717118858, - "narHash": "sha256-zHqicvUQzBbR3/NlII54Yem/mC5sR5gdE1TN0MamR4M=", + "lastModified": 1717586967, + "narHash": "sha256-nc5LshLRdNqRamVnIbNvkpqEUmDWGz3JxPEND3Qsu+c=", "owner": "martinvonz", "repo": "jj", - "rev": "404f31cbc1fa2f603e83630fe1229d88a9694569", + "rev": "a3c6a9b1b753e713898a58835d889e0650d03a77", "type": "github" }, "original": { @@ -643,11 +643,11 @@ ] }, "locked": { - "lastModified": 1716990063, - "narHash": "sha256-0Vv125wrFCJgSUSQRqhuHQOopWbOc8ICVeY/d2wAjOg=", + "lastModified": 1717519579, + "narHash": "sha256-V2CupUp1TJKho3rsw5vyvuupcrm0x8EpTQYutOti+RM=", "owner": "YaLTeR", "repo": "niri", - "rev": "c8e46b9d172dfa2ca89d82b87055b8e39622f80c", + "rev": "c6c17cccac979575b6402729af39f7c998e90874", "type": "github" }, "original": { @@ -734,11 +734,11 @@ "parts": "parts_2" }, "locked": { - "lastModified": 1713493270, - "narHash": "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=", + "lastModified": 1717293583, + "narHash": "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=", "owner": "bluskript", "repo": "nix-inspect", - "rev": "86f636b1e01579b3a63b2c778c21a818b00c3d1e", + "rev": "c55921e1d1cf980ff6351273fde6cedd5d8fa320", "type": "github" }, "original": { @@ -769,11 +769,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", "type": "github" }, "original": { @@ -785,11 +785,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -833,11 +833,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1717555607, + "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", "type": "github" }, "original": { @@ -849,11 +849,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -910,11 +910,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -1076,11 +1076,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1714501997, - "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", + "lastModified": 1717511332, + "narHash": "sha256-50VrD5Wl2BVJZkSRj/stvEvHvbrJcIOPTtQbI6Zvqfw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", + "rev": "29e5cdfb054635364b6d8290a096e64d258ce78b", "type": "github" }, "original": { diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index bc1fa2c..4d3a9d0 100644 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -330,7 +330,26 @@ in hostId = "4b501480"; # Enable Network Manager - networkmanager.enable = true; + networkmanager.enable = false; + + interfaces = { + wlp6s0.ipv4.addresses = [ { + address = "10.0.1.18"; + prefixLength = 24; + } ]; + }; + + defaultGateway.address = "10.0.1.1"; + nameservers = [ "10.0.1.1" ]; + + wireless = { + enable = true; + networks = { + "Joey’s Jungle" = { + psk = "kR8v&3Qd"; + }; + }; + }; firewall = { enable = true; @@ -343,9 +362,9 @@ in # Configure environment environment = { - # etc."nut/upsd.conf".source = ./upsd.conf; - # etc."nut/upsd.users".source = ./upsd.users; - # etc."nut/upsmon.conf".source = ./upsmon.conf; + etc."nut/upsd.conf".source = /root/upsd.conf; + etc."nut/upsd.users".source = /root/upsd.users; + etc."nut/upsmon.conf".source = /root/upsmon.conf; # List packages installed in system profile. To search, run: # $ nix search wget @@ -392,49 +411,51 @@ in nix-ld.enable = true; }; - power.ups.ups = { - enable = enableUps; - mode = "netserver"; - ups."nasups" = { - driver = "usbhid-ups"; - port = "auto"; - description = "NAS UPS"; - }; - upsmon = { - monitor = "nasups@localhost 1 upsuser BogieDudie1 primary"; - }; - upsd = { - enable = true; - listen = { - address = 0.0 0.0 0.0; - port = 3493; + power.ups = { + ups = { + enable = enableUps; + mode = "netserver"; + ups."nasups" = { + driver = "usbhid-ups"; + port = "auto"; + description = "NAS UPS"; + }; + upsmon = { + monitor = "nasups@localhost 1 upsuser BogieDudie1 primary"; + }; + upsd = { + enable = true; + listen = { + address = 0.0 0.0 0.0; + port = 3493; + }; + }; + users = { + actions = [ "SET" ]; + instcmds = [ "ALL" ]; + upsmon = "primary"; + passwordFile = "/root/ups.conf"; }; }; - users = { - actions = [ "SET" ]; - instcmds = [ "ALL" ]; - upsmon = "primary"; - passwordFile = "/root/ups.conf"; + + # Add UPS monitoring service + upsmon = { + enable = true; + # Configure UPS device + device = "/dev/usb/hiddev1"; # Change this to your UPS device + driver = "usbhid-ups"; # Change this if your UPS uses a different driver + # Set UPS monitoring options + options = { + # NOTIFYCMD = "/path/to/notify-script.sh"; # Path to your notification script + POLLFREQ = 5; + POLLFREQALERT = 5; + HOSTSYNC = "on"; + DEADTIME = 15; + FINALDELAY = 5; + }; }; }; - # Add UPS monitoring service - # power.upsmon = { - # enable = true; - # # Configure UPS device - # device = "/dev/usb/hiddev1"; # Change this to your UPS device - # driver = "usbhid-ups"; # Change this if your UPS uses a different driver - # # Set UPS monitoring options - # options = { - # # NOTIFYCMD = "/path/to/notify-script.sh"; # Path to your notification script - # POLLFREQ = 5; - # POLLFREQALERT = 5; - # HOSTSYNC = "on"; - # DEADTIME = 15; - # FINALDELAY = 5; - # }; - # }; - # Configure nixpkgs nixpkgs = { overlays = [ outputs.overlays.nixpkgs-unstable ];