diff --git a/flake.nix b/flake.nix index 159a5f8..48dbe40 100644 --- a/flake.nix +++ b/flake.nix @@ -94,8 +94,8 @@ # Use a dummy hardware config for VM fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; boot.loader.grub.device = "/dev/vda"; - boot.initrd.kernelModules = [ "virtio_gpu" ]; - boot.kernelParams = [ "video=1280x800" ]; + boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_blk" "virtio_gpu" ]; + boot.kernelParams = nixpkgs.lib.mkForce [ "video=1280x800" "splash" "boot.shell_on_fail" ]; # Ensure the user has the right groups for graphical environment users.users.nixos = { @@ -129,8 +129,8 @@ # Use a dummy hardware config for VM fileSystems."/" = { device = "/dev/disk/by-label/nixos"; }; boot.loader.grub.device = "/dev/vda"; - boot.initrd.kernelModules = [ "virtio_gpu" ]; - boot.kernelParams = [ "video=1280x800" ]; + boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_blk" "virtio_gpu" ]; + boot.kernelParams = nixpkgs.lib.mkForce [ "video=1280x800" "splash" "boot.shell_on_fail" ]; # Setup default user for testing users.users.nomarchy = { diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix index 39dbe28..d2ead34 100644 --- a/modules/home/hyprland.nix +++ b/modules/home/hyprland.nix @@ -1,13 +1,22 @@ { config, pkgs, lib, ... }: let - activeWallpaper = config.nomarchy.wallpaper; + activeWallpaper = if config.nomarchy.wallpaper != "" then + config.nomarchy.wallpaper + else "${../../assets/themes/catppuccin/backgrounds/1-totoro.png}"; hyprlandState = config.nomarchy.hyprland; in { + home.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + }; + wayland.windowManager.hyprland = { enable = true; settings = { + "cursor" = { + "no_hardware_cursors" = true; + }; "general" = { "gaps_in" = hyprlandState.gaps_in; "gaps_out" = hyprlandState.gaps_out;