From 8d32e1a3773b931f64f4e962e4b72dd66ed908d9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 18 Nov 2025 21:51:29 +0100 Subject: [PATCH] breaking changes --- hardware/gpu/intel.nix | 7 +++---- hardware/gpu/rocm.nix | 2 -- profiles/base/default.nix | 6 ++++-- profiles/nix-ld.nix | 7 +++---- profiles/shell.nix | 2 +- users/pbsds/home/profiles/shell.nix | 2 +- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/hardware/gpu/intel.nix b/hardware/gpu/intel.nix index 248d836..9469fe5 100644 --- a/hardware/gpu/intel.nix +++ b/hardware/gpu/intel.nix @@ -5,10 +5,9 @@ let intel-media-driver # not added due to collision # https://github.com/NixOS/nixos-hardware/issues/1170 - #(if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") - # then vaapiIntel - # else intel-vaapi-driver) - vaapiVdpau + (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") + then vaapiIntel + else intel-vaapi-driver) libvdpau-va-gl intel-ocl intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in) diff --git a/hardware/gpu/rocm.nix b/hardware/gpu/rocm.nix index 18dedb4..0a77349 100644 --- a/hardware/gpu/rocm.nix +++ b/hardware/gpu/rocm.nix @@ -27,8 +27,6 @@ services.ollama.acceleration = lib.mkDefault "rocm"; hardware.amdgpu.opencl.enable = lib.mkDefault true; - #hardware.amdgpu.amdvlk.enable = lib.mkDefault true; - #hardware.amdgpu.amdvlk.support32Bit.enable = lib.mkDefault true; # https://libreddit.noximilien.pbsds.net/r/archlinux/comments/nih9c9/amdgpu_vs_modesetting_in_current_510_kernels_xorg/ services.xserver.videoDrivers = [ "amdgpu" ]; # use gpu, adaptive sync and and hardware page flipping diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 1d3364a..ba546d3 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -119,8 +119,10 @@ noto-fonts # includes Cousine noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji - noto-fonts-extra + #noto-fonts-emoji # removed + noto-fonts-color-emoji + #noto-fonts-extra + noto-fonts ]; services.fail2ban = { diff --git a/profiles/nix-ld.nix b/profiles/nix-ld.nix index 8d852fa..197ab76 100644 --- a/profiles/nix-ld.nix +++ b/profiles/nix-ld.nix @@ -1,15 +1,14 @@ { pkgs, ... }: -# TODO: https://github.com/antithesishq/madness ? - # TODO: # this is what i currently do to use conda/pypi with nix-ld: -# export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:/run/opengl-driver/lib:/run/opengl-driver-32/lib +# export LD_LIBRARY_PATH="$NIX_LD_LIBRARY_PATH:/run/opengl-driver/lib:/run/opengl-driver-32/lib" # can i somehow add /run/opengl-driver/lib:/run/opengl-driver-32/lib to $NIX_LD_LIBRARY_PATH? will it work? +# instead of rebooting, you can source /etc/set-environment to get $NIX_LD_LIBRARY_PATH into your environment + { programs.nix-ld.enable = true; - programs.nix-ld.package = pkgs.nix-ld-rs or pkgs.unstable.nix-ld-rs or pkgs.nix-ld; programs.nix-ld.libraries = with pkgs; [ acl diff --git a/profiles/shell.nix b/profiles/shell.nix index c39a3a7..a4d06c2 100644 --- a/profiles/shell.nix +++ b/profiles/shell.nix @@ -64,7 +64,7 @@ htmlq # mprocs systemctl-tui - du-dust # du alternative + dust # du alternative ncdu # Disk usage analyzer with an ncurses interface # dialog # TODO: remove? # visidata diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index a985752..812f50d 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -237,7 +237,7 @@ in systemctl-tui # sysz duf # df alternative - #du-dust # better du + #dust # better du ncdu # du tui hexyl # better hexdump #xplr # tui file explorer