clean up commented lines

This commit is contained in:
2026-07-13 01:42:28 +10:00
parent 94df02515d
commit b25d9db82b
+14 -48
View File
@@ -4,26 +4,14 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
# let
# pythonEnv = pkgs.python3.withPackages (ps: with ps; [
# docker
# pytz
# ]);
# in
{ {
imports = imports =
[ # Include the results of the hardware scan. [
../../common/configuration.nix ../../common/configuration.nix
# ../../modules/nix/cache-client.nix
../../modules/nix-cache/client.nix ../../modules/nix-cache/client.nix
# ../../modules/nix/remote-builder-client.nix
../../modules/remote-builder-client.nix ../../modules/remote-builder-client.nix
# ../../modules/nix/docker-data.nix
../../modules/docker/mount-data.nix ../../modules/docker/mount-data.nix
# ../../modules/nix/docker-service.nix
../../modules/docker/enable-service.nix ../../modules/docker/enable-service.nix
# ../../modules/nix/tailscale-service.nix
../../modules/tailscale/enable-service.nix ../../modules/tailscale/enable-service.nix
../../modules/rotate-traefik-logs.nix ../../modules/rotate-traefik-logs.nix
../../modules/raspi/mount-data.nix ../../modules/raspi/mount-data.nix
@@ -32,42 +20,20 @@
]; ];
networking.hostName = "docker"; # Define your hostname. networking.hostName = "docker"; # Define your hostname.
networking.hostId = "007f0200"; networking.hostId = "007f0200";
boot.zfs.forceImportRoot = false; boot.zfs.forceImportRoot = false;
environment.systePackages = with pkgs; [
nfs-utils
];
boot.supportedFilesystems = [ "nfs" ];
environment.systemPackages = with pkgs; [ services.rpcbind.enable = true;
nfs-utils systemd.tmpfiles.rules = [
]; "L+ /home/nixos/docker - - - - /mnt/docker/config"
"d /mnt/docker 0755 nixos users -"
];
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
#'';
users.users.nixos.extraGroups = [ "docker" ]; users.users.nixos.extraGroups = [ "docker" ];
services.openssh.settings.PermitRootLogin = "yes"; services.openssh.settings.PermitRootLogin = "no";
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 80 8080 443 8090 ]; networking.firewall.allowedTCPPorts = [ 80 8080 443 8090 ];