From 1c4c434e5028854b0f9def4faeb7f8cc13449af4 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Tue, 14 May 2024 10:50:24 -0400 Subject: [PATCH] integrated vm into workflow --- README.md | 1 + justfile | 18 ++++++++++++++++-- src/system/machines/vm/system.nix | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0ea1e96..5bc2b6c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ NixOS Configurations: - desktop - wsl - server (wip) + - vm Home-Manager Configurations: - workstation diff --git a/justfile b/justfile index e4b3196..447139c 100644 --- a/justfile +++ b/justfile @@ -25,7 +25,13 @@ test SYSTEM TYPE="nixos": set -euo pipefail case "{{TYPE}}" in "nixos") - if [ "{{SYSTEM}}" = "desktop" ] || [ "{{SYSTEM}}" = "server" ] || [ "{{SYSTEM}}" = "wsl" ] || [ "{{SYSTEM}}" = "laptop" ]; then + if + [ "{{SYSTEM}}" = "desktop" ] || \ + [ "{{SYSTEM}}" = "server" ] || \ + [ "{{SYSTEM}}" = "wsl" ] || \ + [ "{{SYSTEM}}" = "vm" ] || \ + [ "{{SYSTEM}}" = "laptop" ] + then echo "Testing NixOS configuration for {{SYSTEM}}..." nix build --dry-run .#nixosConfigurations."{{SYSTEM}}".config.system.build.toplevel -L exit 0 @@ -36,6 +42,7 @@ test SYSTEM TYPE="nixos": echo " server" echo " laptop" echo " wsl" + echo " vm" exit 1 fi ;; @@ -59,7 +66,13 @@ make SYSTEM TYPE="nixos": set -euo pipefail case "{{TYPE}}" in "nixos") - if [ "{{SYSTEM}}" = "desktop" ] || [ "{{SYSTEM}}" = "server" ] || [ "{{SYSTEM}}" = "wsl" ] || [ "{{SYSTEM}}" = "laptop" ]; then + if + [ "{{SYSTEM}}" = "desktop" ] || \ + [ "{{SYSTEM}}" = "server" ] || \ + [ "{{SYSTEM}}" = "wsl" ] || \ + [ "{{SYSTEM}}" = "vm" ] || \ + [ "{{SYSTEM}}" = "laptop" ] + then echo "Hydrating resulting NixOS configuration for {{SYSTEM}}..." nix build .#nixosConfigurations."{{SYSTEM}}".config.system.build.toplevel -L exit 0 @@ -70,6 +83,7 @@ make SYSTEM TYPE="nixos": echo " server" echo " laptop" echo " wsl" + echo " vm" exit 1 fi ;; diff --git a/src/system/machines/vm/system.nix b/src/system/machines/vm/system.nix index bfa26fb..a29f208 100644 --- a/src/system/machines/vm/system.nix +++ b/src/system/machines/vm/system.nix @@ -82,7 +82,7 @@ }; networking = { - hostName = "server"; + hostName = "vm"; useDHCP = lib.mkDefault true; networkmanager.enable = true; firewall = {