From 93cf989e0c812d73a2a507dc650e8e8a96ef20c6 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 7 Jan 2025 00:23:12 +0000 Subject: [PATCH] docs: update toplogy systems --- docs/src/config/layout.md | 4 ++-- modules/flake/programs/topology/output.nix | 11 ++++++++++- systems/default.nix | 21 ++++++++------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/docs/src/config/layout.md b/docs/src/config/layout.md index 84186e3c1..7799b88bc 100644 --- a/docs/src/config/layout.md +++ b/docs/src/config/layout.md @@ -6,9 +6,9 @@ - 🐉 [Hydra](https:/github.com/isabelroses/dotfiles/tree/main/systems/hydra/) A super mid spec laptop - ⚸ [Lilith](https:/github.com/isabelroses/dotfiles/tree/main/systems/lilith/) A NixOS ISO image that can be quickly deployed and accessed via ssh - ⚖️ [minerva](https:/github.com/isabelroses/dotfiles/tree/main/systems/minerva/) A server configuration for some of my infrastructure - - 𖤍 [Valkyrie](https:/github.com/isabelroses/dotfiles/tree/main/systems/valkyrie/) A WSL2 host, designed to be a development environment on Windows + - 𖤍 [Valkyrie](https:/github.com/isabelroses/dotfiles/tree/main/systems/valkyrie/) A WSL2 system, designed to be a development environment on Windows - 💮 [Tatsumaki](https:/github.com/isabelroses/dotfiles/tree/main/systems/tatsumaki/) A MacBook Air, configured to last a whole day of university - - ✨ [wisp](https:/github.com/isabelroses/dotfiles/tree/main/systems/wisp/) A WSL2 host, on cottage + - ✨ [wisp](https:/github.com/isabelroses/dotfiles/tree/main/systems/wisp/) A WSL2 system, on cottage - 🔌 [modules](https:/github.com/isabelroses/dotfiles/tree/main/modules/) - [base](https:/github.com/isabelroses/dotfiles/tree/main/modules/base/) The base configuration settings, which are common between all systems - [darwin](https:/github.com/isabelroses/dotfiles/tree/main/modules/darwin/) Pre-made modules for exclusively darwin systems diff --git a/modules/flake/programs/topology/output.nix b/modules/flake/programs/topology/output.nix index 27db36c96..b57e94511 100644 --- a/modules/flake/programs/topology/output.nix +++ b/modules/flake/programs/topology/output.nix @@ -86,11 +86,20 @@ in minerva.hardware.info = "A server for some of my infrastructure"; valkyrie = { - hardware.info = "WSL2 host, devenv on Windows"; + hardware.info = "WSL2 system, devenv on Windows"; guestType = "wsl"; parent = "amaterasu"; }; + + cottage.hardware.info = "A laptop for my partner"; + + wisp = { + hardware.info = "A WSL2 system, on cottage"; + + guestType = "wsl"; + parent = "cottage"; + }; }; networks = { diff --git a/systems/default.nix b/systems/default.nix index 1e3db80a3..a83619e5a 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -9,18 +9,8 @@ let # hardware profiles laptop = profilesPath + /laptop; # for laptop type configurations desktop = profilesPath + /desktop; # for desktop type configurations - - # for server type configurations - server = [ - headless - (profilesPath + /server) - ]; - - # for wsl systems - wsl = [ - headless - (profilesPath + /wsl) - ]; + server = profilesPath + /server; # for server type configurations + wsl = profilesPath + /wsl; # for wsl systems # meta profiles graphical = profilesPath + /graphical; # for systems that have a graphical interface @@ -74,11 +64,15 @@ in valkyrie.modules = [ wsl + headless ]; minerva = { deployable = true; - modules = [ server ]; + modules = [ + server + headless + ]; }; lilith = { @@ -94,6 +88,7 @@ in wisp.modules = [ wsl + headless ]; }; };