From 41105e3f5a8839ee0e04c452eca43d2e96b1b2f0 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Tue, 14 Oct 2025 18:42:33 -0500 Subject: [PATCH] nas stuff and upd --- modules/home/programs/hyprland/default.nix | 1 - modules/nixos/homeassistant/default.nix | 5 +++++ overlays/rcon/default.nix | 8 ++++++++ systems/aarch64-linux/pi4/default.nix | 4 ++++ systems/x86_64-linux/jallen-nas/apps.nix | 4 ++-- systems/x86_64-linux/jallen-nas/default.nix | 1 - systems/x86_64-linux/jallen-nas/services.nix | 5 +++++ 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index 27415a0..9975cb9 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -47,7 +47,6 @@ in mako meson nautilus - networkmanagerapplet nomacs nwg-look overskride diff --git a/modules/nixos/homeassistant/default.nix b/modules/nixos/homeassistant/default.nix index 754221d..6b93c85 100755 --- a/modules/nixos/homeassistant/default.nix +++ b/modules/nixos/homeassistant/default.nix @@ -18,6 +18,10 @@ in ''; services = { + matter-server = { + enable = true; + port = 5580; + }; postgresql = { enable = true; ensureDatabases = [ "hass" ]; @@ -35,6 +39,7 @@ in cfg.zigbee2mqttPort 8095 8097 + 5580 ]; }; } diff --git a/overlays/rcon/default.nix b/overlays/rcon/default.nix index 4c08163..0146504 100644 --- a/overlays/rcon/default.nix +++ b/overlays/rcon/default.nix @@ -6,4 +6,12 @@ final: prev: { wyoming-faster-whisper = inputs.nixpkgs-stable.legacyPackages.${prev.system}.wyoming-faster-whisper; calibre = inputs.nixpkgs-stable.legacyPackages.${prev.system}.calibre; ollama = inputs.nixpkgs-stable.legacyPackages.${prev.system}.ollama; + + libraspberrypi = inputs.nixpkgs-stable.legacyPackages.${prev.system}.libraspberrypi; + fex = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fex; + gjs = inputs.nixpkgs-stable.legacyPackages.${prev.system}.gjs; + libsecret = inputs.nixpkgs-stable.legacyPackages.${prev.system}.libsecret; + kdeconnect = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kdeconnect; + electron = inputs.nixpkgs-stable.legacyPackages.${prev.system}.electron; + code-server = inputs.nixpkgs-stable.legacyPackages.${prev.system}.code-server; } diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix index 452693c..7329fda 100755 --- a/systems/aarch64-linux/pi4/default.nix +++ b/systems/aarch64-linux/pi4/default.nix @@ -81,6 +81,10 @@ ]; }; + programs = { + seahorse.enable = false; + }; + virtualisation = { docker.enable = false; podman.enable = false; diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix index 80c170f..35607ec 100755 --- a/systems/x86_64-linux/jallen-nas/apps.nix +++ b/systems/x86_64-linux/jallen-nas/apps.nix @@ -56,11 +56,11 @@ dataDir = "/media/nas/main/nix-app-data/sabnzbd"; }; deluge = { - enable = true; + enable = false; port = 8112; }; jackett = { - enable = true; + enable = false; port = 9117; dataDir = "/media/nas/main/nix-app-data/jackett"; }; diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 5ca6477..015cc9a 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -271,7 +271,6 @@ in ffmpeg ipset keyutils - networkmanagerapplet nut packagekit pass diff --git a/systems/x86_64-linux/jallen-nas/services.nix b/systems/x86_64-linux/jallen-nas/services.nix index 92caef8..376dc75 100755 --- a/systems/x86_64-linux/jallen-nas/services.nix +++ b/systems/x86_64-linux/jallen-nas/services.nix @@ -36,6 +36,11 @@ ensureDBOwnership = true; } ]; + # Allow access via pg_hba.conf rules: + authentication = pkgs.lib.mkOverride 50 '' + # TYPE DATABASE USER ADDRESS METHOD + host homeassistant homeassistant 10.0.1.0/24 trust + ''; }; redis = {