move stuff

modules/nixos/network/default.nix

@@ -18,7 +18,7 @@ in
       hostName = lib.mkForce cfg.hostName;
 
       # Use networkd if enabled
-      useNetworkd = lib.mkIf cfg.useNetworkd true;
+      useNetworkd = lib.mkDefault true;
 
       # Set default gateway and nameservers if in manual mode
       defaultGateway = lib.mkIf (cfg.ipv4.method == "manual") {

modules/nixos/ollama/options.nix

@@ -1,7 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.ollama = {
-    enable = mkEnableOption "enable ollama";
-  };
-}

modules/nixos/services/ai/default.nix

@@ -7,7 +7,7 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.ollama;
+  cfg = config.${namespace}.services.ai;
 in
 {
   imports = [ ./options.nix ];

modules/nixos/services/ai/options.nix

@@ -0,0 +1,7 @@
+{ lib, namespace, ... }:
+with lib;
+{
+  options.${namespace}.services.ai = {
+    enable = mkEnableOption "enable ai";
+  };
+}

systems/x86_64-linux/jallen-nas/default.nix

@@ -15,7 +15,7 @@
     ./boot.nix
     ./apps.nix
     ./grafana.nix
-    # ./networking.nix - moved to modules/nixos/network
+    ./networking.nix # - moved to modules/nixos/network
     ./ups.nix
     ./users.nix
     ./samba.nix
@@ -48,7 +48,6 @@
       enableNvidiaDocker = true;
     };
     network = {
-      hostName = "jallen-nas";
       ipv4 = {
         address = "10.0.1.3/24";
         method = "manual";

systems/x86_64-linux/jallen-nas/networking.nix

@@ -10,7 +10,7 @@ let
     10200
     10300
     8127
-    9980 # onlyoffice
+    9943 # onlyoffice
     4000 # netbootxyz
     4080 # netbootxyz
     3000 # gitea
@@ -28,27 +28,27 @@ in
 {
   # Networking configs
   networking = {
-    useNetworkd = true;
+    # useNetworkd = true;
 
-    hostId = "4b501480";
+    # hostId = "4b501480";
 
-    nat = {
+    # nat = {
-      enable = true;
+    #   enable = true;
-      internalInterfaces = [ "ve-+" ];
+    #   internalInterfaces = [ "ve-+" ];
-      externalInterface = "wlp6s0";
+    #   externalInterface = "wlp6s0";
-      # Lazy IPv6 connectivity for the container
+    #   # Lazy IPv6 connectivity for the container
-      enableIPv6 = true;
+    #   enableIPv6 = true;
-    };
+    # };
 
     firewall = {
-      enable = true;
+      # enable = true;
-      allowPing = true;
+      # allowPing = true;
 
       allowedTCPPorts = ports;
       allowedUDPPorts = ports;
 
-      # always allow traffic from your Tailscale network
+      # # always allow traffic from your Tailscale network
-      trustedInterfaces = [ "tailscale0" ];
+      # trustedInterfaces = [ "tailscale0" ];
     };
   };
 }