diff --git a/Makefile b/Makefile index 6bc2cd5..e9bc762 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: default all home nixos vm update clean +.PHONY: default all home nixos update clean default: all @@ -10,9 +10,6 @@ home: nixos: doas nixos-rebuild switch --flake ./. -vm: - nixos-rebuild build-vm --flake ./.#vm - update: nix flake update diff --git a/nixos/configs/default.nix b/nixos/configs/default.nix index d4837d2..e6b1ca5 100644 --- a/nixos/configs/default.nix +++ b/nixos/configs/default.nix @@ -44,15 +44,5 @@ in }; modules = minimal ++ [ inputs.musnix.nixosModules.musnix ] ++ (with nixosModules; [ music ]); }); - vm = withSystem system (ctx@{ config, inputs', ... }: - inputs.nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs inputs'; - packages = config.packages; - }; - modules = [ - inputs.hosts.nixosModule - ] ++ (with nixosModules; [ vm base security testUser ]); - }); }; } diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 0cc7adb..70e4596 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -269,41 +269,5 @@ top@{ moduleWithSystem, ... }: { ollama.enable = true; }; }); - vm = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: { - nixpkgs.hostPlatform = "x86_64-linux"; - virtualisation.vmVariant = { - # following configuration is added only when building VM with build-vm - virtualisation = { - memorySize = 8192; - cores = 4; - resolution = { - x = 1920; - y = 1080; - }; - diskImage = "$HOME/doc/vm.qcow2"; - qemu = { - options = [ "-vga qxl" "-spice port=5900,addr=127.0.0.1,disable-ticketing=on" ]; - }; - }; - services = { - displayManager.sddm.enable = true; - xserver = { - enable = true; - desktopManager.xfce.enable = true; - videoDrivers = [ "qxl" ]; - }; - spice-autorandr.enable = true; - spice-vdagentd.enable = true; - spice-webdavd.enable = true; - }; - environment = { - systemPackages = with pkgs; [ - xorg.xf86videoqxl - tor-browser - gnupg - ]; - }; - }; - }); }; }