From 690b8fa544574ae11082b2ce2a6778e042553183 Mon Sep 17 00:00:00 2001 From: illustris Date: Sat, 14 Sep 2024 08:22:44 +0530 Subject: [PATCH] use open nvidia drivers --- configuration.nix | 9 +++++---- flake.lock | 24 ++++++++++++------------ hardware-configuration.nix | 7 ++++--- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/configuration.nix b/configuration.nix index bfc0553..b2bf0bf 100644 --- a/configuration.nix +++ b/configuration.nix @@ -50,7 +50,8 @@ latencytop linuxPackages.perf lsof mosh ncdu neofetch nethogs networkmanager nfs-utils - nix-du nix-prefetch-git nix-tree + nix-du + nix-prefetch-git nix-tree nnn openvpn p7zip pciutils powertop pv @@ -217,7 +218,7 @@ users.users = let ghKeys = pkgs.fetchurl { - hash = "sha256-Ue0orizAxflXASj3C4+UJ6mcJUmzeSiipls+7D2CKqE="; + hash = "sha256-1hn4+7A3C5awBJX6668apL9SYbPTkkwNyFMy7ELDkYA="; url = "https://github.com/illustris.keys"; }; in { @@ -234,14 +235,14 @@ virtualisation = { # containers.cdi.dynamic.nvidia.enable = true; docker = { - enable = false; + enable = true; enableNvidia = true; # extraOptions = "--storage-opt dm.basesize=20G"; storageDriver = "overlay2"; daemon.settings.bip = "192.168.9.0/22"; }; libvirtd.enable = false; - podman.enable = true; + podman.enable = false; }; xdg.portal.enable = true; diff --git a/flake.lock b/flake.lock index c9826ca..ee0f2ee 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1721859466, - "narHash": "sha256-SDLXa2YZiQpsgxPJanbsBETI9LWEHaw+ZgCn0Jb2/HI=", + "lastModified": 1726218497, + "narHash": "sha256-DJs3tdgFukOHdoGdEAm6iQJXZCV4vdDudqNVqShKezQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "e37c395b486aa4fde1dbffd57de6ed5c22eb6495", + "rev": "595f8cf9bda4b7858866be10385bf201d54bd72d", "type": "gitlab" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1726222338, + "narHash": "sha256-KuA8ciNR8qCF3dQaCaeh0JWyQUgEwkwDHr/f49Q5/e8=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "503af483e1b328691ea3a434d331995595fb2e3d", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1721520570, - "narHash": "sha256-kGrNorYY9G9Twu3dSPpQZNWU3uMYBGlcmk50Qvq5VAg=", + "lastModified": 1725754199, + "narHash": "sha256-GXJompyW8pTDp9UVdiRVtVLmeDwX0WQo8pdhnBawETc=", "owner": "illustris", "repo": "flake", - "rev": "15192cc24d00be4b31df37f4f304a4811fc78d44", + "rev": "b7c9f5ecce388b1640581ccc1db75b601e797f6d", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1726062873, + "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "type": "github" }, "original": { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 7cc615e..9d0c5b9 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -13,9 +13,7 @@ availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "sr_mod" "virtio_blk" "nvme" ]; kernelModules = [ ]; }; - kernelModules = [ "v4l2loopback" ]; kernelParams = [ "mitigations=off" "nvidia_drm.fbdev=1" ]; - extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; }; fileSystems = { @@ -74,7 +72,10 @@ firmware = with pkgs; [ linux-firmware ]; bluetooth.enable = true; # needed by hyperland - nvidia.modesetting.enable = true; + nvidia = { + modesetting.enable = true; + open = true; + }; nvidia-container-toolkit.enable = true; opengl.enable = true; };