diff --git a/.gitignore b/.gitignore index 865b9ec..726d2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ result .direnv -CLAUDE.md diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 2e1f741..be00ae7 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,27 +1,10 @@ { pkgs, ... }: { nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.settings.auto-optimise-store = true; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; time.timeZone = "Europe/London"; i18n.defaultLocale = "en_GB.UTF-8"; - users.users.lew = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - linger = true; - subUidRanges = [{ startUid = 100000; count = 65536; }]; - subGidRanges = [{ startGid = 100000; count = 65536; }]; - openssh.authorizedKeys.keys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KI06F0tHIurNFFRJRlHMeLb7dnUEk8jtSmdsdkfPPoDY0HL1A0QJwqsppFbjHSsJoQ/WZGIj09Evmk9RRGjR5uNEtDMWfxEoeJQoJ6Bwdit+BPa3TfgyyoLM107/D5JriFoZW9k0JVNkgAIFnHp6VAjFyrg4298yKzy2dZchDO4u5HfFi+HBwn2haP7IC0JNgq6GO8K+yw4UK2635/3B/xNLhhLobbT4sThcghBtBhvb8pSXJ0wLupwuGWN9uuONs0UYEOlb8BhedXR4ShJUsQERIPFByAvMaq5vbsVIojF5s4P4dAlpsRQpXhQa7E4wzwGy5bYVP3MNmtYwxZel ssh-key-2025-12-11" - ]; - }; - environment.systemPackages = with pkgs; [ neovim git diff --git a/hosts/lab/default.nix b/hosts/lab/default.nix index 1066cf6..07a547b 100644 --- a/hosts/lab/default.nix +++ b/hosts/lab/default.nix @@ -21,6 +21,14 @@ networking.firewall.allowedTCPPorts = [ 80 443 4200 ]; + users.users.lew = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KI06F0tHIurNFFRJRlHMeLb7dnUEk8jtSmdsdkfPPoDY0HL1A0QJwqsppFbjHSsJoQ/WZGIj09Evmk9RRGjR5uNEtDMWfxEoeJQoJ6Bwdit+BPa3TfgyyoLM107/D5JriFoZW9k0JVNkgAIFnHp6VAjFyrg4298yKzy2dZchDO4u5HfFi+HBwn2haP7IC0JNgq6GO8K+yw4UK2635/3B/xNLhhLobbT4sThcghBtBhvb8pSXJ0wLupwuGWN9uuONs0UYEOlb8BhedXR4ShJUsQERIPFByAvMaq5vbsVIojF5s4P4dAlpsRQpXhQa7E4wzwGy5bYVP3MNmtYwxZel ssh-key-2025-12-11" + ]; + }; + security.sudo.wheelNeedsPassword = false; virtualisation.containers.enable = true; @@ -33,7 +41,6 @@ sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; services.caddy.enable = true; - services.caddy.email = "lew@ily.rs"; system.stateVersion = "23.11"; } diff --git a/hosts/lab/dokuwiki.nix b/hosts/lab/dokuwiki.nix index ac8ca15..d94cb4b 100644 --- a/hosts/lab/dokuwiki.nix +++ b/hosts/lab/dokuwiki.nix @@ -8,7 +8,7 @@ }; virtualisation.oci-containers.containers.dokuwiki = { - image = "lscr.io/linuxserver/dokuwiki:2025-05-14b-ls299"; + image = "lscr.io/linuxserver/dokuwiki:latest"; environment = { PUID = "1000"; PGID = "1000"; @@ -20,6 +20,4 @@ ]; ports = [ "127.0.0.1:8070:80" ]; }; - - systemd.services.podman-dokuwiki.serviceConfig.User = "lew"; } diff --git a/hosts/lab/foundry.nix b/hosts/lab/foundry.nix index 162439c..2660860 100644 --- a/hosts/lab/foundry.nix +++ b/hosts/lab/foundry.nix @@ -8,16 +8,13 @@ }; virtualisation.oci-containers.containers.foundry = { - image = "node:22.22.2-slim"; + image = "node:22-slim"; cmd = [ "node" "main.js" "--dataPath=/data" ]; workdir = "/app"; - user = "1000:1000"; volumes = [ "/srv/foundry/app:/app:ro" "/srv/foundry/data:/data" ]; ports = [ "127.0.0.1:30000:30000" ]; }; - - systemd.services.podman-foundry.serviceConfig.User = "lew"; }