9f7c2640b5
✅ Completed Tasks: - Task 6: Successfully tested deploy-rs on all machines (grey-area, reverse-proxy, congenital-optimist) - Task 7: Added deploy-rs status monitoring to lab tool 🔧 Infrastructure Improvements: - Added sma user to local machine for consistent SSH access - Created shared shell-aliases.nix module to eliminate conflicts - Enhanced lab status command with deploy-rs deployment info - Added generation tracking, build dates, and uptime monitoring 🚀 Deploy-rs Status: - All 4 machines successfully tested with both dry-run and actual deployments - Automatic rollback protection working correctly - Health checks and magic rollback functioning properly - Tailscale connectivity verified across all nodes 📊 New Status Features: - lab status --deploy-rs: Shows deployment details - lab status -v: Verbose SSH connection info - lab status -vd: Combined verbose + deploy-rs info - Real-time generation and system closure information The hybrid deployment approach is now fully operational with modern safety features while maintaining legacy compatibility.
66 lines
1.4 KiB
Nix
66 lines
1.4 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
inputs,
|
|
unstable,
|
|
...
|
|
}: {
|
|
imports = [
|
|
./hardware-co.nix
|
|
./disk-ram-co.nix
|
|
./network-congenital-optimist.nix
|
|
|
|
# Security modules
|
|
../../modules/security/ssh-keys.nix
|
|
|
|
# Network modules
|
|
../../modules/network/extraHosts.nix
|
|
|
|
# Services
|
|
../../modules/services/nfs-client.nix
|
|
|
|
# Desktop environments
|
|
../../modules/desktop/common.nix
|
|
../../modules/desktop/gnome.nix
|
|
../../modules/desktop/cosmic.nix
|
|
../../modules/desktop/sway.nix
|
|
../../modules/desktop/niri.nix
|
|
../../modules/desktop/steam-xwayland-satellite.nix
|
|
|
|
# Fonts
|
|
../../modules/desktop/fonts.nix
|
|
|
|
# Development tools
|
|
../../modules/development/tools.nix
|
|
|
|
# User configuration
|
|
../../modules/users/geir.nix
|
|
../../modules/users/sma.nix
|
|
|
|
# Virtualization configuration
|
|
../../modules/virtualization/incus.nix
|
|
../../modules/virtualization/libvirt.nix
|
|
../../modules/virtualization/podman.nix
|
|
];
|
|
|
|
# Boot configuration
|
|
boot.loader.grub = {
|
|
enable = true;
|
|
zfsSupport = true;
|
|
efiSupport = true;
|
|
efiInstallAsRemovable = true;
|
|
mirroredBoots = [
|
|
{
|
|
devices = ["nodev"];
|
|
path = "/boot";
|
|
}
|
|
];
|
|
}; # ZFS services for this machine
|
|
services.zfs = {
|
|
autoScrub.enable = true;
|
|
trim.enable = true;
|
|
};
|
|
# Basic system configuration
|
|
nixpkgs.config.allowUnfree = true;
|
|
system.stateVersion = "23.11"; # DO NOT CHANGE - maintains data compatibility
|
|
}
|