From 8ee0144cdfbd902783017f1e18a0fcb854543402 Mon Sep 17 00:00:00 2001
From: System administrator <freecorn1854@jimbosfiles.com>
Date: Fri, 27 Sep 2024 14:05:28 -0600
Subject: [PATCH] sdr server stuff (rtl_tcp support)

---
 configuration.nix | 45 ++++++++++++++++++++++++++-------------------
 freecorn.nix      |  1 +
 jimbo.nix         |  1 +
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 20cb5ef..6b4fd27 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -31,6 +31,14 @@ in
   # Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
 
+  # allow non nix programs to run
+  programs.nix-ld.enable = true;
+  programs.nix-ld.libraries = with pkgs; [
+    # Add any missing dynamic libraries for unpackaged programs
+    # here, NOT in environment.systemPackages
+  ];
+
+
   # Enable the X11 windowing system.
 #  services.xserver = {
 #    enable = true;
@@ -69,18 +77,18 @@ in
 #  };
 
   # Printer Stuff (FUCK HP!)
-  services = {
-    printing = {
-      enable = true;
-      drivers = [ pkgs.hplip ];
-      webInterface = false;
-    };
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-  };
+#  services = {
+#    printing = {
+#      enable = true;
+#      drivers = [ pkgs.hplip ];
+#      webInterface = false;
+#    };
+#    avahi = {
+#      enable = true;
+#      nssmdns4 = true;
+#      openFirewall = true;
+#    };
+#  };
 
   # Install fonts, need this for orbitron!
 #  fonts.packages = with pkgs; [
@@ -263,18 +271,18 @@ in
     firewall = {
       allowedTCPPorts = [ 
         1935 # RTMP
-        4455 # VR
+#        4455 # VR
         80 443 # Nginx
-        1234 # Something
-        25565 # minecraft port
+        1234 # rtl_tcp
+#        25565 # minecraft port
       ];
       allowedUDPPorts = [ 
-        4455
-        24454 # minecraft vc mod
+#        4455
+#        24454 # minecraft vc mod
       ];
       # Add extra input rules using nftables
       extraInputRules = ''
-        ip saddr { 10.0.0.240, 10.0.0.124 } tcp dport 2049 accept comment "Accept NFS"
+        ip saddr { 10.0.0.124, ${secrets.jimIP1}, ${secrets.jimIP2}, ${secrets.lunaIP} } tcp dport 2049 accept comment "Accept NFS"
       '';
     };
     nftables = {
@@ -300,7 +308,6 @@ in
   # NFS server
   services.nfs.server = {
     enable = true;
-    # Allowing to 0.0.0.0 makes any IP the firewall allows in
     exports = ''
       /export/freecornNFS *(rw,no_subtree_check)
     '';
diff --git a/freecorn.nix b/freecorn.nix
index f7e911c..0af0b0f 100644
--- a/freecorn.nix
+++ b/freecorn.nix
@@ -17,6 +17,7 @@ in {
       "nfsShare"
       "docker"
     ];
+    uid = 1000;
   };
 
   # Define home manager programs and configs
diff --git a/jimbo.nix b/jimbo.nix
index 9403602..f1a7078 100644
--- a/jimbo.nix
+++ b/jimbo.nix
@@ -10,6 +10,7 @@ in {
       "networkmanager"
       "wheel"
       "nginx"
+      "nfsShare"
     ];
     shell = pkgs.zsh;
   };