diff --git a/flake.lock b/flake.lock index cf47d56..b1f06f6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1760462439, + "narHash": "sha256-bks3rTsKGlqehk4l7rViIg2lBnUsY6we22O+ecRZB/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "990e5ce6791ff1f497a61280a82eb66e3789e0e9", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1760284886, + "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 2f9bb81..4328e00 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -237,6 +237,7 @@ in # $ nix search wget environment.systemPackages = with pkgs; [ freerdp # connect to KDE remotely w/RDP instead (KDE 6.1 servers)...seems it's still an xwindows client that's most tested. 🤮 + openh264 # rather, this is the client library dos2unix # convert file line endings dnsmasq # temporarily allowed for connection sharing ansible # automation/software-defined-configuration tool @@ -383,11 +384,11 @@ in #services.rustdesk-server.openFirewall = false; # RX 6700 XT setup hardware.graphics.extraPackages = [ - pkgs.amdvlk + #pkgs.amdvlk - replaced by RADV (enabled by default) pkgs.libcap pkgs.libva pkgs.mesa - pkgs.rocmPackages.clr.icd + #pkgs.rocmPackages.clr.icd ...no idea if this is causing the rocm-related build fail. #pkgs.pcre2 #pkgs.libselinux #pkgs.rocmPackages.rocblas @@ -397,17 +398,19 @@ in #pkgs.rocmPackages.rocm-device-libs #pkgs.rocmPackages.rpp ]; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; # To enable Vulkan support for 32-bit applications, also add: - hardware.graphics.extraPackages32 = [ - pkgs.driversi686Linux.amdvlk - ]; + #hardware.graphics.extraPackages32 = [ + # pkgs.driversi686Linux.amdvlk - replaced by RADV..hopefully also 32-bit enabled by default. + #]; hardware.amdgpu.opencl.enable = true; services.ollama = { enable = true; - acceleration = "rocm"; + #acceleration = "rocm"; hipblaslt not compiling at present environmentVariables = { HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore OLLAMA_LOAD_TIMEOUT = "2m"; # Reduce load timeout (from 5 min)...if it's that big, forget it.