From c8f9d65f2d3514446d9be556fa686a65938aeef6 Mon Sep 17 00:00:00 2001 From: Yuri Tatishchev Date: Mon, 13 Jan 2025 16:12:57 -0800 Subject: [PATCH] vm: move proxmox specific configuration into hosts/vm/proxmox.nix --- flake.nix | 1 + hosts/vm/default.nix | 22 +++------------------- hosts/vm/proxmox.nix | 11 +++++++++++ 3 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 hosts/vm/proxmox.nix diff --git a/flake.nix b/flake.nix index 30d4263..9492059 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ modules = [ ./modules ./hosts/common.nix + ./hosts/vm/proxmox.nix ./hosts/vm ]; format = "proxmox"; diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index f43e9b3..2a28789 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -9,15 +9,7 @@ [ # Include the results of the hardware scan. # ./hardware-configuration-vm.nix ]; - mods.kb-input.enable = true; - -# boot.kernelParams = [ "console=tty0" ]; - proxmox.qemuConf.bios = "ovmf"; - proxmox.qemuExtraConf = { - machine = "q35"; -# efidisk0 = "local-lvm:vm-9999-disk-1"; - cpu = "host"; - }; + mods.kb-input.enable = false; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -28,7 +20,6 @@ "sysrq_always_enabled=1" ]; -# boot.loader.timeout = lib.mkForce 3; boot.loader.systemd-boot.configurationLimit = 5; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12; boot.extraModulePackages = with config.boot.kernelPackages; [ zfs ]; @@ -58,7 +49,7 @@ # VM services services.cloud-init.enable = true; - services.cloud-init.network.enable = false; +# services.cloud-init.network.enable = false; services.qemuGuest.enable = true; services.spice-vdagentd.enable = true; services.openssh.enable = true; @@ -89,7 +80,6 @@ programs.firefox.enable = true; programs.fish.enable = true; programs.git.enable = true; - programs.lazygit.enable = true; programs.neovim.enable = true; programs.bat.enable = true; @@ -112,9 +102,7 @@ ]; environment.systemPackages = with pkgs; [ - darkman dust - efibootmgr eza fastfetch fd @@ -123,18 +111,14 @@ kdePackages.filelight kdePackages.kate kdePackages.yakuake - gnumake - helix - mediainfo + ldns micro mpv ripgrep starship tealdeer - tela-circle-icon-theme waypipe whois - yt-dlp zfs ]; diff --git a/hosts/vm/proxmox.nix b/hosts/vm/proxmox.nix new file mode 100644 index 0000000..fbdabea --- /dev/null +++ b/hosts/vm/proxmox.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ +# boot.kernelParams = [ "console=tty0" ]; + proxmox.qemuConf.bios = "ovmf"; + proxmox.qemuExtraConf = { + machine = "q35"; +# efidisk0 = "local-lvm:vm-9999-disk-1"; + cpu = "host"; + }; +}