From 7a6adb28ee95c6da4c151a7f2e34c55952d7223b Mon Sep 17 00:00:00 2001 From: oqyude Date: Thu, 28 Aug 2025 18:19:50 +0300 Subject: [PATCH] 123 --- homeConfigurations/home.nix | 2 ++ homeConfigurations/wsl-apps/gramps.nix | 4 +++- homeConfigurations/wsl.nix | 1 + nixosConfigurations/hosts/wsl.nix | 4 ++-- nixosModules/essentials/settings.nix | 2 +- nixosModules/software/whisper.nix | 10 +++++----- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/homeConfigurations/home.nix b/homeConfigurations/home.nix index 9083172..41356b0 100755 --- a/homeConfigurations/home.nix +++ b/homeConfigurations/home.nix @@ -9,6 +9,7 @@ let ... }: { + imports = [ (./. + "/${xlib.device.type}.nix") ]; @@ -47,6 +48,7 @@ let users."${xlib.device.username}" = homeModule; users.root = rootModule; sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ]; + extraSpecialArgs = { inherit inputs; }; }; }; in diff --git a/homeConfigurations/wsl-apps/gramps.nix b/homeConfigurations/wsl-apps/gramps.nix index 82feb98..55e8d0e 100755 --- a/homeConfigurations/wsl-apps/gramps.nix +++ b/homeConfigurations/wsl-apps/gramps.nix @@ -2,10 +2,12 @@ config, pkgs, xlib, + inputs, ... }: let grampsPath = "${xlib.dirs.wsl-storage}/gramps"; + last-stable = import inputs.nixpkgs-last-unstable { system = "x86_64-linux"; }; in { xdg = { @@ -23,6 +25,6 @@ in }; }; home.packages = [ - pkgs.gramps + last-stable.gramps ]; } diff --git a/homeConfigurations/wsl.nix b/homeConfigurations/wsl.nix index 6056940..2511a27 100755 --- a/homeConfigurations/wsl.nix +++ b/homeConfigurations/wsl.nix @@ -2,6 +2,7 @@ config, pkgs, xlib, + inputs, ... }: let diff --git a/nixosConfigurations/hosts/wsl.nix b/nixosConfigurations/hosts/wsl.nix index 429a397..89b36aa 100755 --- a/nixosConfigurations/hosts/wsl.nix +++ b/nixosConfigurations/hosts/wsl.nix @@ -32,8 +32,8 @@ let hardware = { graphics.enable = true; - amdgpu.opencl.enable = true; - amdgpu.amdvlk.enable = true; + # amdgpu.opencl.enable = true; + # amdgpu.amdvlk.enable = true; }; networking = { diff --git a/nixosModules/essentials/settings.nix b/nixosModules/essentials/settings.nix index 50fb859..82558ed 100755 --- a/nixosModules/essentials/settings.nix +++ b/nixosModules/essentials/settings.nix @@ -14,7 +14,7 @@ "https://cache.nixos.org" "https://nix-community.cachix.org" "https://nixos-cache-proxy.cofob.dev" # https://gist.github.com/cofob/9b1fd205e6d961a45c225ae9f0af1394 - "https://nixos.snix.store" # https://nixos.snix.store/ + #"https://nixos.snix.store" # https://nixos.snix.store/ ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" diff --git a/nixosModules/software/whisper.nix b/nixosModules/software/whisper.nix index b1e26c4..5542078 100755 --- a/nixosModules/software/whisper.nix +++ b/nixosModules/software/whisper.nix @@ -6,12 +6,12 @@ inputs, ... }: -let - work = import inputs.nixpkgs-master { system = "x86_64-linux"; }; -in +# let +# work = import inputs.nixpkgs-master { system = "x86_64-linux"; }; +# in { environment.systemPackages = [ - work.openai-whisper + pkgs.openai-whisper # (work.openai-whisper.override { # torch = pkgs.python313Packages.torch-bin; # Используй бинарный torch с ROCm, чтобы обойти сборочную хуйню @@ -20,5 +20,5 @@ in # systemd.tmpfiles.rules = ["L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"]; # hardware.graphics.extraPackages = with pkgs.rocmPackages; [ clr clr.icd ]; - nixpkgs.config.rocmSupport = true; + #nixpkgs.config.rocmSupport = true; }