diff --git a/home/programs/packages.nix b/home/programs/packages.nix index 84bde59..4499f46 100644 --- a/home/programs/packages.nix +++ b/home/programs/packages.nix @@ -66,8 +66,8 @@ # > development < # android-studio - podman - podman-compose + docker + docker-compose seahorse platformio iwgtk diff --git a/hosts/modules/nvidia.nix b/hosts/modules/nvidia.nix index 768f63e..0aaa16f 100755 --- a/hosts/modules/nvidia.nix +++ b/hosts/modules/nvidia.nix @@ -3,25 +3,25 @@ nixpkgs.config.nvidia.acceptLicense = true; services.xserver.videoDrivers = [ "nvidia" ]; + boot = { + kernelModules = [ "nvidia-uvm" ]; + kernelParams = [ "nvidia-drm.fbdev=1" ]; + }; + hardware = { graphics = { enable = true; enable32Bit = true; extraPackages = with pkgs; [ egl-wayland - ]; - }; - - opengl = { - enable = true; - extraPackages = with pkgs; [ - vaapiVdpau - libvdpau-va-gl + vaapiVdpau + libvdpau-va-gl + nvidia-vaapi-driver ]; }; nvidia = { - package = config.boot.kernelPackages.nvidiaPackages.beta; + # package = config.boot.kernelPackages.nvidiaPackages; open = false; nvidiaSettings = true; diff --git a/hosts/modules/vm.nix b/hosts/modules/vm.nix index aedbf70..a2705bc 100644 --- a/hosts/modules/vm.nix +++ b/hosts/modules/vm.nix @@ -19,9 +19,8 @@ services.spice-vdagentd.enable = true; virtualisation = { - podman = { + docker = { enable = true; - dockerCompat = true; }; spiceUSBRedirection.enable = true; libvirtd = {