From cc5bd4b3c80546cf380740a39314be69415c3b93 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Thu, 13 Aug 2026 16:44:41 -0300 Subject: [PATCH] refactor(hosts): rename system-manager to ubuntu The tree is heavily Ubuntu-coupled: masking netplan's generator and Ubuntu's own wpa_supplicant units, apt packages in cloud-init, /etc/dbus-1 policy. Assisted-by: pi (claude-opus-5) --- README.md | 5 +++-- flake.nix | 2 +- hosts/{system-manager => ubuntu}/common/global/default.nix | 0 hosts/{system-manager => ubuntu}/common/global/greetd.nix | 0 hosts/{system-manager => ubuntu}/common/global/network.nix | 0 hosts/{system-manager => ubuntu}/common/global/nix.nix | 0 hosts/{system-manager => ubuntu}/common/global/pam.nix | 0 hosts/{system-manager => ubuntu}/common/global/sops.nix | 0 .../{system-manager => ubuntu}/common/optional/wireless.nix | 0 .../common/users/gabriel/default.nix | 0 hosts/{system-manager => ubuntu}/electra/cloud-init.yaml | 2 +- hosts/{system-manager => ubuntu}/electra/default.nix | 0 12 files changed, 5 insertions(+), 4 deletions(-) rename hosts/{system-manager => ubuntu}/common/global/default.nix (100%) rename hosts/{system-manager => ubuntu}/common/global/greetd.nix (100%) rename hosts/{system-manager => ubuntu}/common/global/network.nix (100%) rename hosts/{system-manager => ubuntu}/common/global/nix.nix (100%) rename hosts/{system-manager => ubuntu}/common/global/pam.nix (100%) rename hosts/{system-manager => ubuntu}/common/global/sops.nix (100%) rename hosts/{system-manager => ubuntu}/common/optional/wireless.nix (100%) rename hosts/{system-manager => ubuntu}/common/users/gabriel/default.nix (100%) rename hosts/{system-manager => ubuntu}/electra/cloud-init.yaml (97%) rename hosts/{system-manager => ubuntu}/electra/default.nix (100%) diff --git a/README.md b/README.md index d215a18c..a7e7d0a1 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@ Looking for something simpler to start out with flakes? Try [my starter config r ## Repository layout ```text -hosts/nixos/ per-machine NixOS configurations (atlas, alcyone, ...) -hosts/system-manager/ configurations for non-NixOS Linux systems +hosts/nixos/ per-machine NixOS configurations (atlas, alcyone, ...) +hosts/ubuntu/ system-manager configurations for Ubuntu machines +hosts/common/ configuration shared between both home/ home-manager configuration (feature-flagged) modules/ reusable nixos/ and home-manager/ modules overlays/, pkgs/ package overlays and custom packages (including wallpapers) diff --git a/flake.nix b/flake.nix index 9499a661..051ff9fe 100644 --- a/flake.nix +++ b/flake.nix @@ -162,7 +162,7 @@ }; systemConfigs.electra = system-manager.lib.makeSystemConfig { - modules = [./hosts/system-manager/electra]; + modules = [./hosts/ubuntu/electra]; overlays = builtins.attrValues outputs.overlays; specialArgs = { inherit inputs outputs; diff --git a/hosts/system-manager/common/global/default.nix b/hosts/ubuntu/common/global/default.nix similarity index 100% rename from hosts/system-manager/common/global/default.nix rename to hosts/ubuntu/common/global/default.nix diff --git a/hosts/system-manager/common/global/greetd.nix b/hosts/ubuntu/common/global/greetd.nix similarity index 100% rename from hosts/system-manager/common/global/greetd.nix rename to hosts/ubuntu/common/global/greetd.nix diff --git a/hosts/system-manager/common/global/network.nix b/hosts/ubuntu/common/global/network.nix similarity index 100% rename from hosts/system-manager/common/global/network.nix rename to hosts/ubuntu/common/global/network.nix diff --git a/hosts/system-manager/common/global/nix.nix b/hosts/ubuntu/common/global/nix.nix similarity index 100% rename from hosts/system-manager/common/global/nix.nix rename to hosts/ubuntu/common/global/nix.nix diff --git a/hosts/system-manager/common/global/pam.nix b/hosts/ubuntu/common/global/pam.nix similarity index 100% rename from hosts/system-manager/common/global/pam.nix rename to hosts/ubuntu/common/global/pam.nix diff --git a/hosts/system-manager/common/global/sops.nix b/hosts/ubuntu/common/global/sops.nix similarity index 100% rename from hosts/system-manager/common/global/sops.nix rename to hosts/ubuntu/common/global/sops.nix diff --git a/hosts/system-manager/common/optional/wireless.nix b/hosts/ubuntu/common/optional/wireless.nix similarity index 100% rename from hosts/system-manager/common/optional/wireless.nix rename to hosts/ubuntu/common/optional/wireless.nix diff --git a/hosts/system-manager/common/users/gabriel/default.nix b/hosts/ubuntu/common/users/gabriel/default.nix similarity index 100% rename from hosts/system-manager/common/users/gabriel/default.nix rename to hosts/ubuntu/common/users/gabriel/default.nix diff --git a/hosts/system-manager/electra/cloud-init.yaml b/hosts/ubuntu/electra/cloud-init.yaml similarity index 97% rename from hosts/system-manager/electra/cloud-init.yaml rename to hosts/ubuntu/electra/cloud-init.yaml index 02cd5731..67fcc463 100644 --- a/hosts/system-manager/electra/cloud-init.yaml +++ b/hosts/ubuntu/electra/cloud-init.yaml @@ -40,7 +40,7 @@ autoinstall: # The installer's netplan wifi config is load-bearing for exactly one # boot: the bootstrap below needs the network before system-manager # exists to configure it. Once activated, system-manager owns - # /etc/systemd/network and wpa_supplicant (see hosts/system-manager/ + # /etc/systemd/network and wpa_supplicant (see hosts/ubuntu/ # common/optional/network.nix), and netplan's generator is masked. # Stop cloud-init from re-rendering network config on later boots. - | diff --git a/hosts/system-manager/electra/default.nix b/hosts/ubuntu/electra/default.nix similarity index 100% rename from hosts/system-manager/electra/default.nix rename to hosts/ubuntu/electra/default.nix