From 97b12c483120129fb5a457bd9bcdfed13ba17b6b Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 21 Jun 2024 07:23:28 +0200 Subject: Desktop updates --- host/Rory-desktop/configuration.nix | 9 +++++---- host/Rory-desktop/ollama.nix | 12 ++++++++++++ modules/packages/overlays/rocm-gfx1102.nix | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 modules/packages/overlays/rocm-gfx1102.nix diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index ed4f501..fddff11 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -17,7 +17,7 @@ ./optional/gui/x11.nix ./optional/gui/wayland.nix - ./printing.nix + #./printing.nix ./ollama.nix ]; @@ -84,6 +84,7 @@ extraConfig = '' MaxAuthTries 32 ''; + settings.PermitRootLogin = "yes"; }; pipewire = { enable = true; @@ -125,8 +126,8 @@ # - Languages #dotnet-sdk_7 - #dotnet-sdk_8 - (callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; }) + dotnet-sdk_8 + #(callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; }) #games osu-lazer-bin @@ -140,7 +141,7 @@ cinnamon.nemo gnome.file-roller firefox-bin - ungoogled-chromium #needed for Rider in order to debug WASM + #ungoogled-chromium #needed for Rider in order to debug WASM #yuzu-early-access wineWowPackages.unstableFull diff --git a/host/Rory-desktop/ollama.nix b/host/Rory-desktop/ollama.nix index 1770ede..233ea1f 100755 --- a/host/Rory-desktop/ollama.nix +++ b/host/Rory-desktop/ollama.nix @@ -3,6 +3,18 @@ { # systemd.tmpfiles.rules = [ "d /data/ollama 0750 ostgres postgres" ]; + #overlays + nixpkgs.overlays = [ + (final: old: { + rocmPackages = old.rocmPackages // { + rocblas = (old.rocmPackages.rocblas.overrideAttrs (oldAttrs: { + gpuTargets = [ "gfx1102" ]; + })); + }; + } + ) + ]; + services.ollama = { enable = true; home = "/data/ollama/home"; diff --git a/modules/packages/overlays/rocm-gfx1102.nix b/modules/packages/overlays/rocm-gfx1102.nix new file mode 100644 index 0000000..f5c650e --- /dev/null +++ b/modules/packages/overlays/rocm-gfx1102.nix @@ -0,0 +1,14 @@ +#{ pkgs, ... }: +#{ +# nixpkgs.overlays = [ +# (final: old: { +# rocmPackages = old.rocmPackages.override { +# rocblas = (old.rocmPackages.rocblas.overrideAttrs (oldAttrs: { +# gpuTargets = [ "gfx1102" ]; +# })); +# }; +# } +# ) +# ]; +#} +# \ No newline at end of file -- cgit 1.4.1