diff --git a/Justfile b/Justfile index 1483ba5..4925d56 100644 --- a/Justfile +++ b/Justfile @@ -68,7 +68,7 @@ sops-generate-keys: deploy target_host extra_flags="": @test -f nixos/hosts/{{target_host}}/.target || { echo "Host cannot be deployed, add a .target file with SSH destination"; exit 1; } - ssh -A `cat nixos/hosts/{{target_host}}/.target` sudo nixos-rebuild switch {{extra_flags}} --flake \"git+https://codeberg.org/noe/nixos.git?ref={{branch}}\&rev={{commit}}#{{target_host}}\" + ssh -A `cat nixos/hosts/{{target_host}}/.target` sudo nixos-rebuild switch {{extra_flags}} --accept-flake-config --flake \"git+https://codeberg.org/noe/nixos.git?ref={{branch}}\&rev={{commit}}#{{target_host}}\" # ssh target_host *args='': diff --git a/flake.lock b/flake.lock index 2924423..d17dd3e 100644 --- a/flake.lock +++ b/flake.lock @@ -571,11 +571,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1710110055, - "narHash": "sha256-Ytk8pGJpKJorcwcArWb+6UGEvZUgHBPIvPBthgXkC1I=", + "lastModified": 1710114558, + "narHash": "sha256-W/QyuLZbZXxwGxhxclyfd+jnNo4wtuRDdQ4dvgtnznc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b1da94375cf40d4774f0d29a0dd21d4d07087723", + "rev": "4e0a85752775cb57f81af602fe19cd1d39c8179f", "type": "github" }, "original": { diff --git a/home-manager/noe/hosts/cider.nix b/home-manager/noe/hosts/cider.nix index e9c5b94..9cde426 100644 --- a/home-manager/noe/hosts/cider.nix +++ b/home-manager/noe/hosts/cider.nix @@ -19,8 +19,4 @@ # im blind LOL #programs.kitty.settings.font_size = 16; - - home.packages = with pkgs; [ - cider - ]; } diff --git a/nixos/hosts/cider/default.nix b/nixos/hosts/cider/default.nix index 0944205..d1b1e94 100644 --- a/nixos/hosts/cider/default.nix +++ b/nixos/hosts/cider/default.nix @@ -10,6 +10,7 @@ ../../features/wifi.nix ../../features/tailscale.nix ../../features/bluetooth.nix + ../../features/telemetry ]; home-manager.users.noe = import ../../../home-manager/noe/hosts/cider.nix; diff --git a/nixos/hosts/monitoring/default.nix b/nixos/hosts/monitoring/default.nix index e85e3bf..8e828d8 100644 --- a/nixos/hosts/monitoring/default.nix +++ b/nixos/hosts/monitoring/default.nix @@ -3,6 +3,7 @@ ../../templates/proxmox-lxc.nix ../../server.nix ../../features/dns-cache.nix + ../../features/telemetry ]; networking.hostName = "monitoring"; @@ -57,6 +58,8 @@ (static "happystaticbuzz" [ node ]) (static "keylime" [ node ]) (static "keysmash" [ node ]) + (static "cider" [ node ]) + (static "monitoring" [ node ]) (static "ingress-proxy" [ node nginx ]) { job_name = "pve_node"; diff --git a/nixos/hosts/ps2live/.target b/nixos/hosts/ps2live/.target index bb49e4e..0bc6d35 100644 --- a/nixos/hosts/ps2live/.target +++ b/nixos/hosts/ps2live/.target @@ -1 +1 @@ -192.168.1.177 +root@192.168.1.177 diff --git a/nixos/hosts/ps2live/default.nix b/nixos/hosts/ps2live/default.nix index 37fe6c3..62db1c0 100644 --- a/nixos/hosts/ps2live/default.nix +++ b/nixos/hosts/ps2live/default.nix @@ -11,4 +11,5 @@ networking.hostName = "ps2live"; system.stateVersion = "24.05"; + nixpkgs.hostPlatform = "x86_64-linux"; }