From dd00fb48546207fdb6f20c54c028b30d59e463f9 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sun, 22 Sep 2024 14:41:57 -0600 Subject: [PATCH] minidlna disabled --- hosts/miniserver/configuration.nix | 60 +++++++++-------- hosts/server/configuration.nix | 102 ++++++++++++++++------------- 2 files changed, 91 insertions(+), 71 deletions(-) diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix index 83fbdb5..9734841 100644 --- a/hosts/miniserver/configuration.nix +++ b/hosts/miniserver/configuration.nix @@ -1,5 +1,10 @@ -{ ... }: { - imports = [ ./hardware-configuration.nix ../../base.nix ./temp-nginx.nix ]; +{ ... }: +{ + imports = [ + ./hardware-configuration.nix + ../../base.nix + ./temp-nginx.nix + ]; my = { emacs.enable = true; apps.dictionaries.enable = true; @@ -73,27 +78,31 @@ allowedUDPPorts = [ 2049 ]; }; }; - nix = let - featuresList = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - "gccarch-znver3" - "gccarch-skylake" - "gccarch-alderlake" - ]; - in { - settings.cores = 3; - buildMachines = [{ - hostName = "workstation"; - system = "x86_64-linux"; - sshUser = "nixremote"; - maxJobs = 14; - speedFactor = 1; - supportedFeatures = featuresList; - }]; - }; + nix = + let + featuresList = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + "gccarch-znver3" + "gccarch-skylake" + "gccarch-alderlake" + ]; + in + { + settings.cores = 3; + buildMachines = [ + { + hostName = "workstation"; + system = "x86_64-linux"; + sshUser = "nixremote"; + maxJobs = 14; + speedFactor = 1; + supportedFeatures = featuresList; + } + ]; + }; nixpkgs = { config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; hostPlatform = "x86_64-linux"; @@ -105,8 +114,7 @@ createHome = true; group = "nixremote"; home = "/var/nixremote/"; - openssh.authorizedKeys.keys = - [ (builtins.readFile ../../secrets/ssh/ed25519_nixworkstation.pub) ]; + openssh.authorizedKeys.keys = [ (builtins.readFile ../../secrets/ssh/ed25519_nixworkstation.pub) ]; }; }; services = { @@ -115,7 +123,7 @@ fileSystems = [ "/" ]; }; minidlna = { - enable = true; + enable = false; openFirewall = true; settings = { inotify = "yes"; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index ac6b1ea..7661059 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -1,5 +1,9 @@ -{ ... }: { - imports = [ ./hardware-configuration.nix ../../base.nix ]; +{ ... }: +{ + imports = [ + ./hardware-configuration.nix + ../../base.nix + ]; my = { emacs.enable = true; apps.dictionaries.enable = true; @@ -35,47 +39,53 @@ }; }; }; - networking = let - ports = [ - 2049 # idk - 8989 # sonarr - 7878 # radarr - 8686 # lidarr - 9696 # prowlarr - 8096 # jellyfin - 6767 # bazarr - 5000 # kavita - 3399 # sabnzbd - ]; - in { - hostName = "server"; - firewall = { - allowedTCPPorts = ports; - allowedUDPPorts = ports; + networking = + let + ports = [ + 2049 # idk + 8989 # sonarr + 7878 # radarr + 8686 # lidarr + 9696 # prowlarr + 8096 # jellyfin + 6767 # bazarr + 5000 # kavita + 3399 # sabnzbd + ]; + in + { + hostName = "server"; + firewall = { + allowedTCPPorts = ports; + allowedUDPPorts = ports; + }; }; - }; nixpkgs.hostPlatform = "x86_64-linux"; - nix = let - featuresList = [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - "gccarch-znver3" - "gccarch-skylake" - "gccarch-alderlake" - ]; - in { - settings.cores = 6; - buildMachines = [{ - hostName = "workstation"; - system = "x86_64-linux"; - sshUser = "nixremote"; - maxJobs = 14; - speedFactor = 1; - supportedFeatures = featuresList; - }]; - }; + nix = + let + featuresList = [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + "gccarch-znver3" + "gccarch-skylake" + "gccarch-alderlake" + ]; + in + { + settings.cores = 6; + buildMachines = [ + { + hostName = "workstation"; + system = "x86_64-linux"; + sshUser = "nixremote"; + maxJobs = 14; + speedFactor = 1; + supportedFeatures = featuresList; + } + ]; + }; users = { groups.nixremote.gid = 555; users.nixremote = { @@ -83,17 +93,19 @@ createHome = true; group = "nixremote"; home = "/var/nixremote/"; - openssh.authorizedKeys.keys = - [ (builtins.readFile ../../secrets/ssh/ed25519_nixworkstation.pub) ]; + openssh.authorizedKeys.keys = [ (builtins.readFile ../../secrets/ssh/ed25519_nixworkstation.pub) ]; }; }; services = { minidlna = { - enable = true; + enable = false; openFirewall = true; settings = { inotify = "yes"; - media_dir = [ "/mnt/pool" "/home/jawz" ]; + media_dir = [ + "/mnt/pool" + "/home/jawz" + ]; }; }; btrfs.autoScrub = {