diff --git a/flake.nix b/flake.nix index b8db17b..cc4a914 100755 --- a/flake.nix +++ b/flake.nix @@ -116,6 +116,7 @@ inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default + inputs.microvm.nixosModules.host inputs.sops-nix.nixosModules.sops ]; deimos = inputs.self.lib.mkLinuxSystem [ diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 394574d..4afaaac 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -15,6 +15,8 @@ in plymouth sddm wireguard + microvm + midnight ; }; }; diff --git a/modules/nixos/guests/midnight/default.nix b/modules/nixos/guests/midnight/default.nix old mode 100644 new mode 100755 index 6a991ea..3b38842 --- a/modules/nixos/guests/midnight/default.nix +++ b/modules/nixos/guests/midnight/default.nix @@ -38,7 +38,7 @@ in config = let macAddress = "02:00:00:00:00:${macOctet}"; - workers = deviceLogic 45 4 6 6; + workers = deviceLogic 45 4 16 6; in { environment.systemPackages = [ diff --git a/profiles/user0/files/misc/justfile.nix b/profiles/user0/files/misc/justfile.nix index e07845c..0869760 100755 --- a/profiles/user0/files/misc/justfile.nix +++ b/profiles/user0/files/misc/justfile.nix @@ -14,7 +14,6 @@ let ceres = devices.ceres; eris = devices.eris; hostname = config.networking.hostName; - deviceLogic = if hostname == mars.name then deimos else mars; in { @@ -35,6 +34,12 @@ in rebuild-eris: nixos-rebuild switch --flake ~/projects/dotfiles#${eris.name} --target-host ${eris.ip.address0} --sudo --ask-sudo-password --show-trace + rebuild-mars: + nixos-rebuild switch --flake ~/projects/dotfiles#${mars.name} --target-host ${mars.ip.address0} --sudo --ask-sudo-password --show-trace + + rebuild-deimos: + nixos-rebuild switch --flake ~/projects/dotfiles#${deimos.name} --target-host ${deimos.ip.address0} --sudo --ask-sudo-password --show-trace + rebuild-lamda: nixos-rebuild switch --flake ~/projects/lamdagibson#lamdagibson --target-host denise@${lamdaIP} --sudo --ask-sudo-password --show-trace @@ -53,6 +58,9 @@ in eris: ssh ${eris.ip.address0} + deimos: + ssh ${deimos.ip.address0} + lamda: ssh denise@${lamdaIP} @@ -61,10 +69,5 @@ in forgejo: ssh root@${instances.forgejo.interface.ip} - - ${deviceLogic.name}: - ssh ${deviceLogic.ip.address0} - - ''; }