diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 9f33516..a4e5217 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -29,9 +29,26 @@ # Enable networking networking.networkmanager.enable = true; - networking.extraHosts = '' - 127.0.0.1 fc.dev - 109.238.11.111 nuage-v1.une-frouzins.fr''; + networking.extraHosts = "109.238.11.111 nuage-v1.une-frouzins.fr"; + + # Wildcard *.dev.local → 127.0.0.1, requis par gezy-local (Traefik route les + # sous-domaines clients). systemd-resolved ne sait pas répondre en wildcard : + # dnsmasq écoute sur 127.0.0.1:53 (le stub resolved est sur 127.0.0.53:53) et + # resolved ne lui délègue que la zone dev.local. + services.dnsmasq = { + enable = true; + resolveLocalQueries = false; + settings = { + listen-address = "127.0.0.1"; + bind-interfaces = true; + no-resolv = true; + address = "/dev.local/127.0.0.1"; + }; + }; + services.resolved.settings.Resolve = { + DNS = "127.0.0.1"; + Domains = "~dev.local"; + }; # Set your time zone. time.timeZone = "Europe/Paris"; @@ -170,19 +187,6 @@ }; }; - # Caddy - # Setup (one time): certutil -d sql:$HOME/.pki/nssdb -A -t "C,," -n "mkcert" -i ~/.local/share/mkcert/rootCA.pem - # Per domain: - # mkcert -cert-file /tmp/fc.dev.pem -key-file /tmp/fc.dev-key.pem fc.dev - # sudo mkdir -p /etc/caddy/certs && sudo cp /tmp/fc.dev.pem /tmp/fc.dev-key.pem /etc/caddy/certs/ && sudo chown -R caddy:caddy /etc/caddy/certs - services.caddy = { - enable = true; - virtualHosts."fc.dev".extraConfig = '' - tls /etc/caddy/certs/fc.dev.pem /etc/caddy/certs/fc.dev-key.pem - reverse_proxy http://127.0.0.1:4000 - ''; - }; - # Enable the OpenSSH daemon. # services.openssh.enable = true; diff --git a/packages.nix b/packages.nix index 27ececc..2521f3d 100644 --- a/packages.nix +++ b/packages.nix @@ -97,6 +97,7 @@ in pam_u2f polkit_gnome # fun fact: https://gitlab.gnome.org/GNOME/gdm/-/issues/613 sshpass + lftp arandr feh