diff --git a/nix-system-configs/modules/local/networking_local.nix b/nix-system-configs/modules/local/networking_local.nix index 140fb8d..5a41377 100644 --- a/nix-system-configs/modules/local/networking_local.nix +++ b/nix-system-configs/modules/local/networking_local.nix @@ -4,44 +4,42 @@ lib, ... }: { - config = { - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; - # List services that you want to enable: + # List services that you want to enable: - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; - services.resolved.enable = false; + services.resolved.enable = false; - # Use this clean static network configuration instead: - networking.useDHCP = false; - networking.networkmanager.enable = false; # Disable NetworkManager + # Use this clean static network configuration instead: + networking.useDHCP = false; + networking.networkmanager.enable = false; # Disable NetworkManager - networking.interfaces.ens18 = { - ipv4.addresses = [ - { - address = config.local.address or "10.1.1.100"; - prefixLength = 24; - } - ]; - }; - - networking.defaultGateway = { - address = "10.1.1.1"; - interface = "ens18"; - }; - - # Explicitly set DNS - networking.nameservers = ["10.1.1.2"]; # PiHole DNS + networking.interfaces.ens18 = { + ipv4.addresses = [ + { + address = config.local.address or "10.1.1.100"; + prefixLength = 24; + } + ]; }; + + networking.defaultGateway = { + address = "10.1.1.1"; + interface = "ens18"; + }; + + # Explicitly set DNS + networking.nameservers = ["10.1.1.2"]; # PiHole DNS } diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix index 69a53de..816b356 100644 --- a/nix-system-configs/modules/system/forgejo.nix +++ b/nix-system-configs/modules/system/forgejo.nix @@ -8,13 +8,6 @@ cfg = config.services.forgejo; srv = cfg.settings.server; in { - options.local = { - hostname = lib.mkOption {type = lib.types.str;}; - username = lib.mkOption {type = lib.types.str;}; - userDescription = lib.mkOption {type = lib.types.str;}; - address = lib.mkOption {type = lib.types.str;}; - }; - config = { local.hostname = "forgejoprg"; local.username = "forgejoprg"; diff --git a/nix-system-configs/modules/system/traefik.nix b/nix-system-configs/modules/system/traefik.nix index 56644c9..b6007b8 100644 --- a/nix-system-configs/modules/system/traefik.nix +++ b/nix-system-configs/modules/system/traefik.nix @@ -4,13 +4,6 @@ lib, ... }: { - options.local = { - hostname = lib.mkOption {type = lib.types.str;}; - username = lib.mkOption {type = lib.types.str;}; - userDescription = lib.mkOption {type = lib.types.str;}; - address = lib.mkOption {type = lib.types.str;}; - }; - config = { local.hostname = "nixos-traefik"; local.username = "traefikprg";