diff --git a/flake.lock b/flake.lock index 5eaf643..29f862b 100755 --- a/flake.lock +++ b/flake.lock @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1755625756, - "narHash": "sha256-t57ayMEdV9g1aCfHzoQjHj1Fh3LDeyblceADm2hsLHM=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd026d86420781e84d0732f2fa28e1c051117b59", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1755504238, - "narHash": "sha256-mw7q5DPdmz/1au8mY0u1DztRgVyJToGJfJszxjKSNes=", + "lastModified": 1755678220, + "narHash": "sha256-Yvmm03o7Z7gTAOfCnIetHomaDDJVBdLBPHD9dZ5kUcc=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "354ed498c9628f32383c3bf5b6668a17cdd72a28", + "rev": "25122ee37b0c1f22b07c9fe5f970a7487093a4c0", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755268003, - "narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=", + "lastModified": 1755736253, + "narHash": "sha256-jlIQRypNhB1PcB1BE+expE4xZeJxzoAGr1iUbHQta8s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32f313e49e42f715491e1ea7b306a87c16fe0388", + "rev": "596312aae91421d6923f18cecce934a7d3bfd6b8", "type": "github" }, "original": { @@ -274,6 +274,22 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1755877640, + "narHash": "sha256-z4PuqvFZIsKsY8tkpgw+4+wQ59O75qYtinbhcpU1+cU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3f078e495f172be43ae7379f006bbe300cca4158", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_2", @@ -282,11 +298,11 @@ ] }, "locked": { - "lastModified": 1755621960, - "narHash": "sha256-gPReKgHYrlS4HvT7VHho7OzEHDel0ftp579hg42uvjA=", + "lastModified": 1755877557, + "narHash": "sha256-AjUqNCIgjQKfhvH+HUXZQLlSDiRTFQPSPN8Ws/O7mVQ=", "owner": "nix-community", "repo": "NUR", - "rev": "da0127fe69456adfee373d5671401e16f502ff00", + "rev": "332abf45be8133422a97e134b35782400ffc65bd", "type": "github" }, "original": { @@ -353,6 +369,7 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", "nixpkgs-last-unstable": "nixpkgs-last-unstable", + "nixpkgs-master": "nixpkgs-master", "nur": "nur", "nypkgs": "nypkgs", "plasma-manager": "plasma-manager", diff --git a/flake.nix b/flake.nix index eb30cfd..9548a50 100755 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f"; # 6027c30c8e9810896b92429f0092f624f7b1aace #nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - #nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # e63467437ce61d8d9a36e09254e8d07b472da0c6 # 72353fc1fa61189fb76133d50c519e871c858c39 # 5b38c7435fb1112a8b36b1652286996a7998c5b5 + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # e63467437ce61d8d9a36e09254e8d07b472da0c6 # 72353fc1fa61189fb76133d50c519e871c858c39 # 5b38c7435fb1112a8b36b1652286996a7998c5b5 #nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; #nixpkgs-fingerprint.url = "github:NixOS/nixpkgs/nixos-24.11"; #nixos.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/nixosConfigurations/hosts/wsl.nix b/nixosConfigurations/hosts/wsl.nix index 1ff50c5..429a397 100755 --- a/nixosConfigurations/hosts/wsl.nix +++ b/nixosConfigurations/hosts/wsl.nix @@ -36,9 +36,6 @@ let amdgpu.amdvlk.enable = true; }; - nixpkgs.config.rocmSupport = true; - nixpkgs.config.cudaSupport = false; - networking = { firewall.enable = false; hostName = xlib.device.hostname; diff --git a/nixosModules/software/whisper.nix b/nixosModules/software/whisper.nix index 8dd7095..b1e26c4 100755 --- a/nixosModules/software/whisper.nix +++ b/nixosModules/software/whisper.nix @@ -3,11 +3,22 @@ lib, pkgs, xlib, + inputs, ... }: +let + work = import inputs.nixpkgs-master { system = "x86_64-linux"; }; +in { environment.systemPackages = [ - pkgs.openai-whisper + work.openai-whisper + + # (work.openai-whisper.override { + # torch = pkgs.python313Packages.torch-bin; # Используй бинарный torch с ROCm, чтобы обойти сборочную хуйню + # }) ]; - #hardware.graphics.extraPackages = with pkgs.rocmPackages; [ clr clr.icd ]; + # systemd.tmpfiles.rules = ["L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"]; + # hardware.graphics.extraPackages = with pkgs.rocmPackages; [ clr clr.icd ]; + + nixpkgs.config.rocmSupport = true; }