From a263b4177a2fb1f376814fed3687c89a1dabfb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Sat, 8 Nov 2025 03:37:15 +0100 Subject: [PATCH] chore: rename hosts --- .github/README.md | 19 ++++--- files/scripts/swarsel-install.sh | 8 +-- files/scripts/swarsel-postinstall.sh | 6 +-- files/scripts/swarsel-rebuild.sh | 4 +- .../nixos/{chaostheatre => hotel}/default.nix | 4 +- .../{chaostheatre => hotel}/disk-config.nix | 0 .../hardware-configuration.nix | 0 .../{chaostheatre => hotel}/options-home.nix | 0 .../nixos/{chaostheatre => hotel}/options.nix | 0 install/installer-config.nix | 4 +- nix/topology.nix | 4 +- profiles/home/hotel/default.nix | 44 ++++++++++++++++ profiles/nixos/hotel/default.nix | 50 +++++++++++++++++++ 13 files changed, 121 insertions(+), 22 deletions(-) rename hosts/nixos/{chaostheatre => hotel}/default.nix (94%) rename hosts/nixos/{chaostheatre => hotel}/disk-config.nix (100%) rename hosts/nixos/{chaostheatre => hotel}/hardware-configuration.nix (100%) rename hosts/nixos/{chaostheatre => hotel}/options-home.nix (100%) rename hosts/nixos/{chaostheatre => hotel}/options.nix (100%) create mode 100644 profiles/home/hotel/default.nix create mode 100644 profiles/nixos/hotel/default.nix diff --git a/.github/README.md b/.github/README.md index 6a24483..798076e 100644 --- a/.github/README.md +++ b/.github/README.md @@ -66,7 +66,7 @@ nix run --experimental-features 'nix-command flakes' github:Swarsel/.dotfiles#swarsel-rebuild -- -u ``` - This will activate the `chaostheatre` configuration on your system, which is a de-facto mirror of my main configuration with secret-based settings removed. + This will activate the `hotel` configuration on your system, which is a de-facto mirror of my main configuration with secret-based settings removed. Please keep in mind that this limited installer will make local changes to the cloned repository in order to be able to install it (otherwise the builder would fail at fetching my private secrets repository). As such, this should only be used to evaluate the system - if you want to use it longterm, you will need to create a fork and make some changes. @@ -153,16 +153,21 @@ | Name | Hardware | Use | |--------------------|-----------------------------------------------------|------------------------------------------------------| |💻 **pyramid** | Framework Laptop 16, AMD 7940HS, RX 7700S, 64GB RAM | Work laptop | - |💻 **bakery** | Lenovo Ideapad 720S-13IKB | Personal lapto | - |💻 **machpizza** | MacBook Pro 2016 | MacOS sandbox | - |🖥️ **winters** | ASRock J4105-ITX, 32GB RAM | Main homeserver and data storgae | - |🖥️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | - |🖥️ **moonside** | Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Proxy for local services, some lightweight services | + |💻 **bakery** | Lenovo Ideapad 720S-13IKB | Personal laptop | + |💻 **machpizza** | MacBook Pro 2016 | MacOS reference and build sandbox | + |🏠 **treehouse** | NVIDIA DGX Spark | Workstation, AI playground and home-manager reference| + |🖥️ **winters** | ASRock J4105-ITX, 32GB RAM | Secondary homeserver and data storgae | + |🖥️ **summers** | ASUS Z10PA-D8, 2* Intel Xeon E5-2650 v4, 128GB RAM | Main homeserver running microvms, data storage | + |🖥️ **hintbooth** | HUNSN RM02, 8GB RAM | Router | + |☁️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | + |☁️ **moonside** | Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Proxy for local services, some lightweight services | + |☁️ **belchsfactory**| Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Hydra builder and nix binary cache | + |☁️ **monkeycave** | Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Gaming server | + |☁️ **eagleland** | Hetzner Cloud: CX23 | Mail server | |📱 **magicant** | Samsung Galaxy Z Flip 6 | Phone | |💿 **drugstore** | - | ISO installer configuration | |❔ **chaotheatre** | - | Demo config for checking out my configurtion | |❔ **toto** | - | Helper configuration for bootstrapping a new system | - |🏠 **treehouse** | - | Reference configuration for a home-manager only host | ## General Nix tips & useful links diff --git a/files/scripts/swarsel-install.sh b/files/scripts/swarsel-install.sh index b70faf9..c130cc6 100644 --- a/files/scripts/swarsel-install.sh +++ b/files/scripts/swarsel-install.sh @@ -1,7 +1,7 @@ set -eo pipefail -target_config="chaostheatre" -target_hostname="chaostheatre" +target_config="hotel" +target_hostname="hotel" target_user="swarsel" persist_dir="" target_disk="/dev/vda" @@ -15,7 +15,7 @@ function help_and_exit() { echo echo "ARGS:" echo " -n specify the nixos config to deploy." - echo " Default: chaostheatre" + echo " Default: hotel" echo " -d specify disk to install on." echo " Default: /dev/vda" echo " -u specify user to deploy for." @@ -152,7 +152,7 @@ if [ "$disk_encryption" -eq 1 ]; then fi green "Setting up disk ..." -if [[ $target_config == "chaostheatre" ]]; then +if [[ $target_config == "hotel" ]]; then sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/v1.10.0 -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks --arg diskDevice "$target_disk" else sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko/latest -- --mode destroy,format,mount --flake .#"$target_config" --yes-wipe-all-disks diff --git a/files/scripts/swarsel-postinstall.sh b/files/scripts/swarsel-postinstall.sh index 1e98e65..448d3d8 100644 --- a/files/scripts/swarsel-postinstall.sh +++ b/files/scripts/swarsel-postinstall.sh @@ -1,6 +1,6 @@ set -eo pipefail -target_config="chaostheatre" +target_config="hotel" target_user="swarsel" function help_and_exit() { @@ -12,8 +12,8 @@ function help_and_exit() { echo "ARGS:" echo " -d specify disk to install on." echo " -n specify the nixos config to deploy." - echo " Default: chaostheatre" - echo " Default: chaostheatre" + echo " Default: hotel" + echo " Default: hotel" echo " -u specify user to deploy for." echo " Default: swarsel" echo " -h | --help Print this help." diff --git a/files/scripts/swarsel-rebuild.sh b/files/scripts/swarsel-rebuild.sh index 7cfac1f..106ac84 100644 --- a/files/scripts/swarsel-rebuild.sh +++ b/files/scripts/swarsel-rebuild.sh @@ -1,6 +1,6 @@ set -eo pipefail -target_config="chaostheatre" +target_config="hotel" target_user="swarsel" function help_and_exit() { @@ -11,7 +11,7 @@ function help_and_exit() { echo echo "ARGS:" echo " -n specify nixos config to build." - echo " Default: chaostheatre" + echo " Default: hotel" echo " -u specify user to deploy for." echo " Default: swarsel" echo " -h | --help Print this help." diff --git a/hosts/nixos/chaostheatre/default.nix b/hosts/nixos/hotel/default.nix similarity index 94% rename from hosts/nixos/chaostheatre/default.nix rename to hosts/nixos/hotel/default.nix index d202a67..b499f10 100644 --- a/hosts/nixos/chaostheatre/default.nix +++ b/hosts/nixos/hotel/default.nix @@ -25,7 +25,7 @@ in }; networking = { - hostName = "chaostheatre"; + hostName = "hotel"; firewall.enable = true; }; @@ -47,7 +47,7 @@ in } // lib.optionalAttrs (!minimal) { swarselprofiles = { - chaostheatre = true; + hotel = true; minimal = true; }; } diff --git a/hosts/nixos/chaostheatre/disk-config.nix b/hosts/nixos/hotel/disk-config.nix similarity index 100% rename from hosts/nixos/chaostheatre/disk-config.nix rename to hosts/nixos/hotel/disk-config.nix diff --git a/hosts/nixos/chaostheatre/hardware-configuration.nix b/hosts/nixos/hotel/hardware-configuration.nix similarity index 100% rename from hosts/nixos/chaostheatre/hardware-configuration.nix rename to hosts/nixos/hotel/hardware-configuration.nix diff --git a/hosts/nixos/chaostheatre/options-home.nix b/hosts/nixos/hotel/options-home.nix similarity index 100% rename from hosts/nixos/chaostheatre/options-home.nix rename to hosts/nixos/hotel/options-home.nix diff --git a/hosts/nixos/chaostheatre/options.nix b/hosts/nixos/hotel/options.nix similarity index 100% rename from hosts/nixos/chaostheatre/options.nix rename to hosts/nixos/hotel/options.nix diff --git a/install/installer-config.nix b/install/installer-config.nix index 91e0034..3ee5c91 100644 --- a/install/installer-config.nix +++ b/install/installer-config.nix @@ -10,7 +10,7 @@ in file = { ".bash_history" = { text = '' - swarsel-install -n chaostheatre + swarsel-install -n hotel ''; }; }; @@ -27,7 +27,7 @@ in file = { ".bash_history" = { text = '' - swarsel-install -n chaostheatre + swarsel-install -n hotel ''; }; }; diff --git a/nix/topology.nix b/nix/topology.nix index 9b69f5b..372616c 100644 --- a/nix/topology.nix +++ b/nix/topology.nix @@ -37,11 +37,11 @@ (mkConnection "milkywell" "wan") (mkConnection "magicant" "wifi") (mkConnection "toto" "bootstrapper") - (mkConnection "chaostheatre" "demo host") + (mkConnection "hotel" "demo host") ]; }; - chaostheatre.interfaces."demo host" = { }; + hotel.interfaces."demo host" = { }; toto.interfaces."bootstrapper" = { }; milkywell.interfaces.wan = { }; moonside.interfaces.wan = { }; diff --git a/profiles/home/hotel/default.nix b/profiles/home/hotel/default.nix new file mode 100644 index 0000000..e6d7105 --- /dev/null +++ b/profiles/home/hotel/default.nix @@ -0,0 +1,44 @@ +{ lib, config, ... }: +{ + options.swarselprofiles.hotel = lib.mkEnableOption "is this a hotel host"; + config = lib.mkIf config.swarselprofiles.hotel { + swarselmodules = { + packages = lib.mkForce true; + ownpackages = lib.mkForce true; + general = lib.mkForce true; + nixgl = lib.mkForce true; + sops = lib.mkForce true; + yubikey = lib.mkForce false; + ssh = lib.mkForce true; + stylix = lib.mkForce true; + desktop = lib.mkForce true; + symlink = lib.mkForce true; + env = lib.mkForce false; + programs = lib.mkForce true; + nix-index = lib.mkForce true; + direnv = lib.mkForce true; + eza = lib.mkForce true; + git = lib.mkForce false; + fuzzel = lib.mkForce true; + starship = lib.mkForce true; + kitty = lib.mkForce true; + zsh = lib.mkForce true; + zellij = lib.mkForce true; + tmux = lib.mkForce true; + mail = lib.mkForce false; + emacs = lib.mkForce true; + waybar = lib.mkForce true; + firefox = lib.mkForce true; + gnome-keyring = lib.mkForce true; + kdeconnect = lib.mkForce true; + mako = lib.mkForce true; + swayosd = lib.mkForce true; + yubikeytouch = lib.mkForce true; + sway = lib.mkForce true; + kanshi = lib.mkForce true; + gpgagent = lib.mkForce true; + gammastep = lib.mkForce false; + }; + }; + +} diff --git a/profiles/nixos/hotel/default.nix b/profiles/nixos/hotel/default.nix new file mode 100644 index 0000000..7ff8794 --- /dev/null +++ b/profiles/nixos/hotel/default.nix @@ -0,0 +1,50 @@ +{ lib, config, ... }: +{ + options.swarselprofiles.hotel = lib.mkEnableOption "is this a hotel host"; + config = lib.mkIf config.swarselprofiles.hotel { + swarselmodules = { + packages = lib.mkForce true; + general = lib.mkForce true; + home-manager = lib.mkForce true; + xserver = lib.mkForce true; + users = lib.mkForce true; + sops = lib.mkForce true; + env = lib.mkForce true; + security = lib.mkForce true; + systemdTimeout = lib.mkForce true; + hardware = lib.mkForce true; + pulseaudio = lib.mkForce true; + pipewire = lib.mkForce true; + network = lib.mkForce true; + time = lib.mkForce true; + stylix = lib.mkForce true; + programs = lib.mkForce true; + zsh = lib.mkForce true; + syncthing = lib.mkForce true; + blueman = lib.mkForce true; + networkDevices = lib.mkForce true; + gvfs = lib.mkForce true; + interceptionTools = lib.mkForce true; + swayosd = lib.mkForce true; + ppd = lib.mkForce true; + yubikey = lib.mkForce false; + ledger = lib.mkForce true; + keyboards = lib.mkForce true; + login = lib.mkForce true; + nix-ld = lib.mkForce true; + impermanence = lib.mkForce true; + nvd = lib.mkForce true; + gnome-keyring = lib.mkForce true; + sway = lib.mkForce true; + xdg-portal = lib.mkForce true; + distrobox = lib.mkForce true; + appimage = lib.mkForce true; + lid = lib.mkForce true; + lowBattery = lib.mkForce true; + lanzaboote = lib.mkForce true; + autologin = lib.mkForce true; + }; + + }; + +}