From 8dc6b44c7b09a0e56f60ec079fb4fa64625e8aea Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 25 Apr 2025 22:50:38 +0200 Subject: [PATCH] technitium module, remove unneeded files, update dns-1 --- .../technitium-dns-server/default.nix | 4 +- systems/x86_64-linux/dns-1/default.nix | 11 ++---- .../dns-1/hardware-configuration.nix | 37 ------------------- systems/x86_64-linux/dns-1/networking.nix | 28 -------------- 4 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 systems/x86_64-linux/dns-1/hardware-configuration.nix delete mode 100644 systems/x86_64-linux/dns-1/networking.nix diff --git a/modules/nixos/services/technitium-dns-server/default.nix b/modules/nixos/services/technitium-dns-server/default.nix index 44cf559..18912e8 100644 --- a/modules/nixos/services/technitium-dns-server/default.nix +++ b/modules/nixos/services/technitium-dns-server/default.nix @@ -44,6 +44,8 @@ in type = with types; listOf int; default = [ 53 + 80 + 443 5380 # web interface HTTP 53443 # web interface HTTPS ]; @@ -103,5 +105,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ fabianrig ]; + meta.maintainers = with lib.maintainers; [ fabianrig Spaenny ]; } diff --git a/systems/x86_64-linux/dns-1/default.nix b/systems/x86_64-linux/dns-1/default.nix index cc79198..b49edee 100644 --- a/systems/x86_64-linux/dns-1/default.nix +++ b/systems/x86_64-linux/dns-1/default.nix @@ -1,19 +1,14 @@ { lib, - pkgs, + modulesPath, namespace, ... }: with lib.${namespace}; { - imports = [ - ./hardware-configuration.nix - ./networking.nix - ]; + imports = [ (modulesPath + "/virtualisation/proxmox-lxc.nix") ]; - boot.loader = { - grub.enable = false; - }; + documentation.man.generateCaches = false; nix.settings.experimental-features = [ "nix-command" diff --git a/systems/x86_64-linux/dns-1/hardware-configuration.nix b/systems/x86_64-linux/dns-1/hardware-configuration.nix deleted file mode 100644 index b3d6685..0000000 --- a/systems/x86_64-linux/dns-1/hardware-configuration.nix +++ /dev/null @@ -1,37 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/0cf4622b-0da7-4c05-b603-3b3228b63941"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F9CE-788D"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/systems/x86_64-linux/dns-1/networking.nix b/systems/x86_64-linux/dns-1/networking.nix deleted file mode 100644 index add808d..0000000 --- a/systems/x86_64-linux/dns-1/networking.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - networking = { - hostName = "dns-1"; - firewall.enable = false; - networkmanager.enable = false; - dhcpcd.enable = false; - nameservers = [ - "1.1.1.1" - "8.8.8.8" - ]; - defaultGateway.address = "192.168.5.1"; - interfaces.ens18 = { - ipv4.addresses = [ - { - address = "192.168.5.100"; - prefixLength = 24; - } - ]; - ipv6.addresses = [ - { - address = "fd00:192:168:5::100"; - prefixLength = 64; - } - ]; - }; - }; - -}