diff --git a/flake.lock b/flake.lock index d55cf14..d49fafe 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1737480538, - "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index e048d6f..766af10 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -36,10 +36,16 @@ # { device = "/dev/disk/by-uuid/xxxx"; # fsType = "etx4"; # }; + boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702"; + + # Temporarily pin to 6.12 to fix llvm/rocm build + # https://github.com/NixOS/nixpkgs/issues/368672#issuecomment-2608697421 + # boot.kernelPackages = pkgs.linuxPackages_6_12; + boot.kernelModules = [ "kvm-amd" "nct6775" ]; - # Direct patching for enabling for async reprojection (steamvr) + # Direct patching for enabling for async reprojection (steamvr) on AMD boot.kernelPatches = [ { name = "amdgpu-ignore-ctx-privileges"; @@ -167,7 +173,7 @@ # For xdebug...verify actual necessity # Have had to use this, but I think it can be disabled still - perhaps w/xdebug binding setting...don't know. - #networking.firewall.allowedTCPPorts = [ 9003 ]; + networking.firewall.allowedTCPPorts = [ 9003 ]; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -292,14 +298,28 @@ # RX 6700 XT setup hardware.graphics.extraPackages = [ - pkgs.rocmPackages.clr.icd pkgs.amdvlk + pkgs.libcap pkgs.libva + pkgs.mesa + pkgs.rocmPackages.clr.icd + #pkgs.pcre2 + #pkgs.libselinux + #pkgs.rocmPackages.rocblas + #pkgs.rocmPackages.rocm-smi + #pkgs.rocmPackages.rocminfo + #pkgs.rocmPackages.hipblas + #pkgs.rocmPackages.rocm-device-libs + #pkgs.rocmPackages.rpp ]; + # To enable Vulkan support for 32-bit applications, also add: hardware.graphics.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + + hardware.amdgpu.opencl.enable = true; + services.ollama = { enable = true; acceleration = "rocm";