diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index d2a3879..3a7a6f2 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -36,16 +36,10 @@ # { 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) on AMD + # Direct patching for enabling for async reprojection (steamvr) boot.kernelPatches = [ { name = "amdgpu-ignore-ctx-privileges"; @@ -115,17 +109,13 @@ # variant = ""; #}; - # Enable bluetooth - hardware.bluetooth.enable = true; # enables support for Bluetooth - #hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - # Enable CUPS to print documents. # ...no. Recent security issues, prefer disabled # apps like e.g. LibreOffice can still generate pdf's (e.g. to stand in [generally] for Print to pdf) # services.printing.enable = true; # Enable sound with pipewire. - services.pulseaudio.enable = false; + hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -173,7 +163,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; @@ -227,11 +217,7 @@ rpi-imager # rasbperry pi os burner util screenkey # broadcast key presses superfile # cli file manager - mpv # movie player #obs-studio # open broadcast studio - protonup-qt # proton version installer - heroic # game launcher (GOG/Epic/Prime) - lutris # game launcher (EA/Humble/Ubi++) ]; programs.zsh.enable = true; programs.git = { @@ -300,35 +286,21 @@ # RX 6700 XT setup hardware.graphics.extraPackages = [ - 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 + pkgs.amdvlk + pkgs.libva ]; - # 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"; environmentVariables = { HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore }; - rocmOverrideGfx = "10.3.0"; + rocmOverrideGfx = "10.3.1"; }; system.activationScripts = { script.text = ''