diff --git a/flake.nix b/flake.nix index 187124a..8e313c0 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,9 @@ # vps mups = utils.mkHost ./hosts/mups/configuration.nix; + + # vm + muvm = utils.mkHost ./hosts/muvm/configuration.nix; }; homeManagerModules.default = ./modules/home; diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index af52031..b78c5ed 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -17,12 +17,13 @@ in { mods.desktop.enable = true; mods.desktop.wayland.enable = false; mods.desktop.gaming.enable = true; + mods.boot.enable = true; mods.theme.enable = true; mods.theme.scheme = "woodland"; mods.theme.wallpaper = ./wallpaper.png; - mods.containers.steam.enable = true; + mods.containers.steam.enable = false; mods.server.media.enable = true; mods.server.astral.enable = true; mods.server.astral.autoStart = false; diff --git a/hosts/muvm/configuration.nix b/hosts/muvm/configuration.nix index c2b1b96..271b09e 100644 --- a/hosts/muvm/configuration.nix +++ b/hosts/muvm/configuration.nix @@ -10,11 +10,20 @@ in { # System mods.user.name = "muon"; - networking.hostName = "mups"; + networking.hostName = "muvm"; mods.home.file = ./home.nix; + users.users.muon.initialPassword = "changeme"; + + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + }; + # Modules mods.desktop.enable = true; + mods.boot.enable = false; mods.theme.enable = true; mods.theme.scheme = "woodland"; diff --git a/modules/nixos/core/boot.nix b/modules/nixos/core/boot.nix index 0093d77..cadc2c8 100644 --- a/modules/nixos/core/boot.nix +++ b/modules/nixos/core/boot.nix @@ -1,12 +1,21 @@ { pkgs, lib, config, ... }: { - boot.loader = lib.mkIf config.mods.xorg.enable { - timeout = 0; - efi.canTouchEfiVariables = true; - grub = { - enable = true; - efiSupport = true; - device = "nodev"; - gfxmodeEfi = config.mods.monitors.primary.config.mode; + options.mods = { + boot.enable = lib.mkEnableOption { + description = "enables grub"; + default = true; + }; + }; + + config = lib.mkIf config.mods.boot.enable { + boot.loader = lib.mkIf config.mods.xorg.enable { + timeout = 0; + efi.canTouchEfiVariables = true; + grub = { + enable = true; + efiSupport = true; + device = "nodev"; + gfxmodeEfi = config.mods.monitors.primary.config.mode; + }; }; }; }