diff --git a/bin/skyg b/bin/skyg index 3ffc7f0..a6ba915 100755 --- a/bin/skyg +++ b/bin/skyg @@ -31,7 +31,7 @@ def "main build" [] { # Switch configuration def "main switch" [] { - nh os switch | print + nh os switch --ask | print } # test configuration @@ -73,7 +73,7 @@ def "main remote" [cmd:string, target:string = ""] { return $valid_cmds } $"($cmd) on ($target_host) with ($profile)" | print - mut runcmd = $"nixos-rebuild ($cmd) --target-host ($target_host) --sudo --flake .#($profile)" + mut runcmd = $"nh os ($cmd) --target-host ($target_host) --ask .#($profile)" $runcmd | print bash -c $runcmd } diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index c18614a..777ea23 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -8,11 +8,11 @@ jellyfin-backups = { OnCalendar = "daily"; wantedBy = [ - "mnt-terra1-Data-apps.mount" + "homelab-terra1-Data-apps.mount" ]; script = '' set -eu - ${pkgs.rsync}/bin/rsync -avpzP --delete /opt/jellyfin /mnt/terra1/Data/apps/ + ${pkgs.rsync}/bin/rsync -avpzP --delete /opt/jellyfin /homelab/terra1/Data/apps/ ''; }; }; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 57e9171..e64c8ef 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -6,8 +6,10 @@ programs.nix-ld.enable = true; nixpkgs.config.allowUnfree = true; nix = { + enable = true; optimise.automatic = true; settings.experimental-features = [ "nix-command" "flakes" ]; + clean.enable = true; }; environment.systemPackages = with pkgs; [ # nix utils diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index 881f4b1..5ccb7c6 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -20,6 +20,9 @@ in settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; settings.PermitRootLogin = "yes"; + # Keep connections alive during large transfers + settings.ClientAliveInterval = 15; + settings.ClientAliveCountMax = 8; }; users.users.${config.skyg.user.name}.openssh.authorizedKeys.keys = [ cfg.masterPubKey @@ -29,4 +32,3 @@ in ]; }; } - diff --git a/modules/nixos/server/services/scrypted.nix b/modules/nixos/server/services/scrypted.nix index d578c88..f66f38e 100644 --- a/modules/nixos/server/services/scrypted.nix +++ b/modules/nixos/server/services/scrypted.nix @@ -29,11 +29,11 @@ in scrypted-backups = { OnCalendar = "daily"; wantedBy = [ - "mnt-terra1-Data-apps.mount" + "homelab-terra1-Data-apps.mount" ]; script = '' set -eu - ${pkgs.rsync}/bin/rsync -avpzP --delete /opt/homelab/scrypted /mnt/terra1/Data/apps/ + ${pkgs.rsync}/bin/rsync -avpzP --delete /opt/homelab/scrypted /homelab/terra1/Data/apps/ ''; }; scrypted-autoupdate = { @@ -48,7 +48,7 @@ in virtualisation.oci-containers = { containers = { scrypted = { - autoStart = false; + autoStart = true; image = "ghcr.io/koush/scrypted"; extraOptions = [ "--network=host" ]; volumes = [