From b25d9db82b855b3549c758084e88d84fdf19dd69 Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Mon, 13 Jul 2026 01:42:28 +1000 Subject: [PATCH] clean up commented lines --- hosts/docker/configuration.nix | 62 ++++++++-------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/hosts/docker/configuration.nix b/hosts/docker/configuration.nix index c6ef0ce..8989bfa 100644 --- a/hosts/docker/configuration.nix +++ b/hosts/docker/configuration.nix @@ -4,26 +4,14 @@ { config, lib, pkgs, inputs, ... }: -# let -# pythonEnv = pkgs.python3.withPackages (ps: with ps; [ -# docker -# pytz -# ]); -# in - { imports = - [ # Include the results of the hardware scan. + [ ../../common/configuration.nix - # ../../modules/nix/cache-client.nix ../../modules/nix-cache/client.nix - # ../../modules/nix/remote-builder-client.nix ../../modules/remote-builder-client.nix - # ../../modules/nix/docker-data.nix ../../modules/docker/mount-data.nix - # ../../modules/nix/docker-service.nix ../../modules/docker/enable-service.nix - # ../../modules/nix/tailscale-service.nix ../../modules/tailscale/enable-service.nix ../../modules/rotate-traefik-logs.nix ../../modules/raspi/mount-data.nix @@ -32,42 +20,20 @@ ]; -networking.hostName = "docker"; # Define your hostname. -networking.hostId = "007f0200"; -boot.zfs.forceImportRoot = false; - - - - - environment.systemPackages = with pkgs; [ - nfs-utils - ]; - - -boot.supportedFilesystems = [ "nfs" ]; -services.rpcbind.enable = true; - - -systemd.tmpfiles.rules = [ - # Create /mnt/docker - #"d /mnt/docker 0755 root root -" - - # Create /home/nixos/docker -> /mnt/docker-config - "L+ /home/nixos/docker - - - - /mnt/docker/config" - "d /mnt/docker 0755 nixos users -" - -]; - -#Add sym links to data on users home folder -#system.userActivationScripts.createDockerSymlink.text = '' -# ln -sf /mnt/docker/config /home/nixos/docker -#''; -#system.userActivationScripts.createSetupSymlink.text = '' -# ln -sf /mnt/docker-persistent-data/setup /home/nixos/setup -#''; - + networking.hostName = "docker"; # Define your hostname. + networking.hostId = "007f0200"; + boot.zfs.forceImportRoot = false; + environment.systePackages = with pkgs; [ + nfs-utils + ]; + boot.supportedFilesystems = [ "nfs" ]; + services.rpcbind.enable = true; + systemd.tmpfiles.rules = [ + "L+ /home/nixos/docker - - - - /mnt/docker/config" + "d /mnt/docker 0755 nixos users -" + ]; users.users.nixos.extraGroups = [ "docker" ]; - services.openssh.settings.PermitRootLogin = "yes"; + services.openssh.settings.PermitRootLogin = "no"; # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ 80 8080 443 8090 ];