diff options
| -rw-r--r-- | flake.nix | 29 | ||||
| -rw-r--r-- | machines/doretta/default.nix | 29 | ||||
| -rw-r--r-- | machines/vm/foolcreekwireless/default.nix | 41 |
3 files changed, 43 insertions, 56 deletions
@@ -197,12 +197,12 @@ # system = "x86_64-linux"; # modules = [ ./default.nix ]; # }; - foolcreekwireless = lib.nixosSystem { # vm for website - system = "x86_64-linux"; - modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreekwireless - home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } - ]; - }; + # foolcreekwireless = lib.nixosSystem { # vm for website + # system = "x86_64-linux"; + # modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreekwireless + # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } + # ]; + # }; in { inherit lib; nixosModules = import ./modules/nixos; @@ -276,11 +276,12 @@ } ]; }; - # foolcreekwireless = lib.nixosSystem { # vm for website - # modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreekwireless - # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } - # ]; - # }; + foolcreek = lib.nixosSystem { # vm for website + modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreek + microvm.nixosModules.microvm + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } + ]; + }; live = lib.nixosSystem { modules = minimalHomeManagerSettings ++ [ (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix") @@ -301,9 +302,9 @@ # vm declarations for nix flake check # foolcreek = foolcreekwireless; }; - vms = { # expose the build attribute directly - foolcreekwireless = foolcreekwireless.config.system.build.vm; - }; + # vms = { # expose the build attribute directly + # foolcreekwireless = foolcreekwireless.config.system.build.vm; + # }; homeConfigurations = { #NOTE: no worky yet # Standalone HM only # # Desktop diff --git a/machines/doretta/default.nix b/machines/doretta/default.nix index 9b16f0c..057777e 100644 --- a/machines/doretta/default.nix +++ b/machines/doretta/default.nix @@ -35,7 +35,7 @@ programs.virt-manager.enable = true; microvm.vms = { - microvm-test = { + foolcreek = { config = { microvm.shares = [{ source = "/nix/store"; @@ -46,6 +46,33 @@ }; }; }; + systemd.network = { + enable = true; + networks = { + "10-lan" = { + matchConfig.Name = ["eno1" "vm-*"]; + networkConfig = { + Bridge = "br0"; + }; + }; + "10-lan-bridge" = { + matchConfig.Name = "br0"; + networkConfig = { + Address = ["10.1.11.100/24"]; + Gateway = ["10.1.11.254"]; + DNS = ["8.8.8.8"]; + # IPv6AcceptRA = true; + }; + linkConfig.RequiredForOnline = "routable"; + }; + }; + netdevs."vr0" = { + netdevConfig = { + Name = "br0"; + Kind = "bridge"; + }; + }; + }; # Set your time zone. time.timeZone = "US/Mountain"; diff --git a/machines/vm/foolcreekwireless/default.nix b/machines/vm/foolcreekwireless/default.nix deleted file mode 100644 index a2adcf1..0000000 --- a/machines/vm/foolcreekwireless/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, pkgs, ... }: -# let -# language ; -# in -{ - imports = [ - # ./hardware-configuration.nix - - ../../../modules/nixos/nix-common.nix - ../../../modules/nixos/environment.nix - ../../../modules/nixos/system-packages.nix - - ../../../modules/users/defin.nix - ../../../modules/users/root.nix - ]; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - virtualisation.vmVariant = { - virtualisation = { - memorySize = 2048; # Use 2048 MiB memory. - cores = 1; - graphics = false; - }; - }; - - services.wordpress.sites."localhost" = { - # languages = [ pkgs.wordpressPackages.languages. ] - - }; - - networking.firewall.allowedTCPPorts = [ 22 ]; - - environment.systemPackages = with pkgs; [ - cowsay - lolcat - ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - system.stateVersion = "24.11"; -} |