
- Move network-congenital-optimist.nix to machines/congenital-optimist/ - Move network-sleeper-service.nix to machines/sleeper-service/ - Update import paths in machine configurations - Clean up modules/network/common.nix to remove SSH duplication - Consolidate SSH configuration in modules/security/ssh-keys.nix - Remove machine-specific networking from shared common module This improves dependency tracking by co-locating machine-specific network configurations with their respective machines.
61 lines
1.3 KiB
Nix
61 lines
1.3 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
inputs,
|
|
unstable,
|
|
...
|
|
}: {
|
|
imports = [
|
|
./hardware-configuration.nix
|
|
./network-congenital-optimist.nix
|
|
|
|
# Security modules
|
|
../../modules/security/ssh-keys.nix
|
|
|
|
# System modules
|
|
../../modules/system/fonts.nix
|
|
../../modules/system/applications.nix
|
|
|
|
# Hardware modules
|
|
../../modules/hardware/amd-workstation.nix
|
|
|
|
# Desktop environments
|
|
../../modules/desktop/common.nix
|
|
../../modules/desktop/gnome.nix
|
|
../../modules/desktop/cosmic.nix
|
|
../../modules/desktop/sway.nix
|
|
|
|
# Development tools
|
|
../../modules/development/tools.nix
|
|
|
|
# User configuration
|
|
../../modules/users/geir.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
|
|
}
|