Merge branch 'main' into automatic-update

jpetrucciani · Jan 11, 2025 · 675f370 · 675f370
2 parents 53640d1 + 2dad8d1
commit 675f370
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/hosts/milkyway/configuration.nix b/hosts/milkyway/configuration.nix
@@ -3,14 +3,12 @@ let
   hostname = "milkyway";
   common = import ../common.nix { inherit config flake machine-name pkgs; };
   cuda = pkgs.cudaPackages.cudatoolkit;
-  cudaTarget = "cuda114";
-  WSL_MAGIC = "/usr/lib/wsl/lib";
   CUDA_PATH = cuda.outPath;
   CUDA_LDPATH = "${
       lib.concatStringsSep ":" [
-        WSL_MAGIC
+        pkgs.hax.nvidiaLdPath
         "/run/opengl-drivers/lib"
-        "/run/opengl-drivers-32/lib"
+        # "/run/opengl-drivers-32/lib"
         "${cuda}/lib"
         "${pkgs.cudaPackages.cudnn}/lib"
       ]
@@ -26,6 +24,7 @@ in
   ];
 
   boot.tmp.useTmpfs = true;
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
   environment = {
     etc."nixpkgs-path".source = common.pkgs.path;
@@ -41,8 +40,6 @@ in
       _CUDA_PATH = CUDA_PATH;
       _CUDA_LDPATH = CUDA_LDPATH;
       XLA_FLAGS = "--xla_gpu_cuda_data_dir=${CUDA_PATH}";
-      XLA_TARGET = cudaTarget;
-      EXLA_TARGET = cudaTarget;
     };
   };
   # fonts.packages = with pkgs; [

diff --git a/mods/final.nix b/mods/final.nix
@@ -286,4 +286,5 @@ in
     '';
   };
 
+  openai-whisper-cpp-cuda = prev.openai-whisper-cpp.override { cudaSupport = true; };
 }
diff --git a/mods/pog/helm.nix b/mods/pog/helm.nix
@@ -116,11 +116,11 @@ rec {
     chart_url = "https://github.com/goauthentik/helm/releases/download/authentik-{1}/authentik-{1}.tgz";
   };
 
-  chart_scan_datadog = _chart_scan {
-    name = "datadog";
-    base_url = "https://helm.datadoghq.com";
-    chart_url = "https://github.com/DataDog/helm-charts/releases/download/datadog-{1}/datadog-{1}.tgz";
-  };
+  # chart_scan_datadog = _chart_scan {
+  #   name = "datadog";
+  #   base_url = "https://helm.datadoghq.com";
+  #   chart_url = "https://github.com/DataDog/helm-charts/releases/download/datadog-{1}/datadog-{1}.tgz";
+  # };
 
   chart_scan_fleet = _chart_scan {
     name = "fleet";
@@ -300,11 +300,11 @@ rec {
     chart_url = "https://github.com/makeplane/helm-charts/releases/download/${name}-{1}/${name}-{1}.tgz";
   };
 
-  chart_scan_quickwit = _chart_scan rec {
-    name = "quickwit";
-    base_url = "https://helm.quickwit.io";
-    chart_url = "https://github.com/quickwit-oss/helm-charts/releases/download/${name}-{1}/${name}-{1}.tgz";
-  };
+  # chart_scan_quickwit = _chart_scan rec {
+  #   name = "quickwit";
+  #   base_url = "https://helm.quickwit.io";
+  #   chart_url = "https://github.com/quickwit-oss/helm-charts/releases/download/${name}-{1}/${name}-{1}.tgz";
+  # };
 
   chart_scan_dask-kubernetes-operator = _chart_scan rec {
     name = "dask-kubernetes-operator";
@@ -338,12 +338,17 @@ rec {
     chart_url = "https://github.com/awslabs/mountpoint-s3-csi-driver/releases/download/helm-chart-aws-mountpoint-s3-csi-driver-{1}/aws-mountpoint-s3-csi-driver-{1}.tgz";
   };
 
+  chart_scan_odoo = _chart_scan {
+    name = "odoo";
+    base_url = "https://imio.github.io/helm-charts";
+    chart_url = "https://imio.github.io/helm-charts/odoo/odoo-{1}.tgz";
+  };
+
   helm_pog_scripts = [
     chart_scan_argo-cd
     chart_scan_authentik
     chart_scan_aws_mountpoint-s3-csi-driver
     chart_scan_dask-kubernetes-operator
-    chart_scan_datadog
     chart_scan_external-secrets
     chart_scan_fission
     chart_scan_fleet
@@ -360,6 +365,7 @@ rec {
     chart_scan_mimir
     chart_scan_mongo-operator
     chart_scan_nfs
+    chart_scan_odoo
     chart_scan_oncall
     chart_scan_oneuptime
     chart_scan_open-webui
@@ -375,7 +381,6 @@ rec {
     chart_scan_prometheus-postgres-exporter
     chart_scan_prometheus-pushgateway
     chart_scan_prometheus-redis-exporter
-    chart_scan_quickwit
     chart_scan_redis-operator
     chart_scan_robusta
     chart_scan_searxng
-Original file line number
+Diff line change
@@ Expand Up / @@ -286,4 +286,5 @@ in @@
         '';
       };
+      openai-whisper-cpp-cuda = prev.openai-whisper-cpp.override { cudaSupport = true; };
     }