udpate 24.11

hosts/nas/apps.nix

@@ -1,8 +1,10 @@
 { config, ... }:
 {
-  # imports = [
-  #   ../../modules/services/jellyfin
-  # ];
+  imports = [
+    ../../modules/apps/jellyseerr/jellyseerr.nix
+    ../../modules/apps/radarr/radarr.nix
+    ../../modules/apps/sonarr/sonarr.nix
+  ];
 
   nas-apps = {
     beszel.enable = true;
@@ -24,7 +26,7 @@
 
     jellyfin.enable = true;
 
-    jellyseerr.enable = true;
+    jellyseerr.enable = false;
 
     manyfold.enable = true;
 
@@ -63,11 +65,11 @@
       httpsPort = "3301";
     };
 
-    radarr.enable = true;
+    radarr.enable = false;
 
     sabnzbd.enable = true;
 
-    sonarr.enable = true;
+    sonarr.enable = false;
 
     swag.enable = true;
 

hosts/nas/boot.nix

@@ -46,7 +46,7 @@ in
       systemd = {
         enable = true;
         # tpm2.enable = true;
-        enableTpm2 = true;
+        tpm2.enable = true;
       };
     };
   };

hosts/nas/configuration.nix

@@ -168,6 +168,8 @@ in
         "libvirtd"
         "nix-apps"
         "jallen-nas"
+        "media"
+        "nscd"
       ]; # Enable ‘sudo’ for the user.
       hashedPasswordFile = passwordFile;
       shell = pkgs.zsh;

hosts/nas/networking.nix

@@ -24,62 +24,14 @@ in
 
     # Disable Network Manager
     networkmanager.enable = true;
-
-    # interfaces = {
-    #   wlp7s0 = {
-    #     useDHCP = true;
-    #     ipv4.addresses = [
-    #       {
-    #         address = ipAddress;
-    #         prefixLength = 24;
-    #       }
-    #     ];
-    #   };
-    #   wlp6s0 = {
-    #     useDHCP = true;
-    #     ipv4.addresses = [
-    #       {
-    #         address = ipAddress2;
-    #         prefixLength = 24;
-    #       }
-    #     ];
-    #   };
-    # };
-
-    # defaultGateway = {
-    #   interface = "wlp7s0";
-    #   address = gateway;
-    #   metric = 1;
-    # };
-
-    # nameservers = [ gateway ];
-
-    # wireless = {
-    #   enable = false;
-    #   userControlled.enable = true;
-    #   # secretsFile = config.sops.secrets."wifi".path;
-    #   environmentFile = config.sops.secrets."wifi".path;
-    #   allowAuxiliaryImperativeNetworks = true;
-    #   interfaces = [
-    #     "wlp6s0"
-    #     "wlp7s0"
-    #   ];
-    #   networks = {
-    #     "Joey's Jungle 6G" = {
-    #       pskRaw = "ext:PSK";
-    #       priority = 1000;
-    #       # psk = "kR8v&3Qd";
-    #       extraConfig = ''
-    #         key_mgmt=SAE
-    #         ieee80211w=2
-    #       '';
-    #     };
-    #     "Joey's Jungle 5G" = {
-    #       pskRaw = "ext:PSK";
-    #       priority = -100;
-    #     };
-    #   };
-    # };
+    
+    nat = {
+      enable = true;
+      internalInterfaces = ["ve-+"];
+      externalInterface = "wlp7s0";
+      # Lazy IPv6 connectivity for the container
+      enableIPv6 = true;
+    };
 
     firewall = {
       enable = true;
@@ -91,50 +43,5 @@ in
       # always allow traffic from your Tailscale network
       trustedInterfaces = [ "tailscale0" ];
     };
-
-    # nat = {
-    #   enable = true;
-    #   externalInterface = "wlp7s0";
-    #   internalInterfaces = [ "wg0" ];
-    # };
-
-    # wireguard.interfaces = {
-    #   # "wg0" is the network interface name. You can name the interface arbitrarily.
-    #   wg0 = {
-    #     # Determines the IP address and subnet of the server's end of the tunnel interface.
-    #     ips = [ "10.0.100.1/24" ];
-
-    #     # The port that WireGuard listens to. Must be accessible by the client.
-    #     listenPort = 51820;
-
-    #     # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
-    #     # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
-    #     postSetup = ''
-    #       ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.0.100.0/24 -o wlp7s0 -j MASQUERADE
-    #     '';
-
-    #     # This undoes the above command
-    #     postShutdown = ''
-    #       ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.0.100.0/24 -o wlp7s0 -j MASQUERADE
-    #     '';
-
-    #     # Path to the private key file.
-    #     #
-    #     # Note: The private key can also be included inline via the privateKey option,
-    #     # but this makes the private key world-readable; thus, using privateKeyFile is
-    #     # recommended.
-    #     privateKeyFile = wireguard-private;
-
-    #     peers = [
-    #       # List of allowed peers.
-    #       { # Feel free to give a meaning full name
-    #         # Public key of the peer (not a file path).
-    #         publicKey = wireguard-public;
-    #         # List of IPs assigned to this peer within the tunnel subnet. Used to configure routing.
-    #         allowedIPs = [ "10.0.100.2/32" ];
-    #       }
-    #     ];
-    #   };
-    # };
   };
 }