diff --git a/_sources/generated.json b/_sources/generated.json index 2b9a49f..15e0eca 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -208,5 +208,20 @@ "url": "https://thunderstore.io/package/download/blacks7ar/VikingsDoSwim/1.3.8/" }, "version": "1.3.8" + }, + "vesktop.micfix": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "vesktop.micfix", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-eNOKW43LQdJp2GFHqe3RxAhMwkNulrotIOMByosen84=", + "type": "url", + "url": "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch" + }, + "version": "1.0.1" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 202c630..90419fd 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -121,4 +121,12 @@ sha256 = "sha256-QCEYnx0I6onWEAJy851wS0WdC35L18DyJL1wAAwHFaU="; }; }; + "vesktop.micfix" = { + pname = "vesktop.micfix"; + version = "1.0.1"; + src = fetchurl { + url = "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch"; + sha256 = "sha256-eNOKW43LQdJp2GFHqe3RxAhMwkNulrotIOMByosen84="; + }; + }; } diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix index 3f84ec0..170857b 100644 --- a/modules/home/desktop/social.nix +++ b/modules/home/desktop/social.nix @@ -1,12 +1,7 @@ -{ pkgs, lib, config, ... }: +{ pkgs, lib, config, sources, ... }: let vesktop-nogain = (pkgs.vesktop.overrideAttrs (previousAttrs: { - patches = previousAttrs.patches ++ [ - (builtins.fetchurl { - url = "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch"; - sha256 = "1klz3s5wl0g340nvm5kf8g14q264s7nsjiv1v1lx4hfbimdqmlvq"; - }) - ]; + patches = previousAttrs.patches ++ [ sources."vesktop.micfix".src ]; })); in { options.mods.social.enable = diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 425f790..be3c0bb 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -1,29 +1,4 @@ -{ pkgs, lib, config, ... }: -let - wgsl_analyzer = with pkgs; - stdenv.mkDerivation rec { - pname = "wgsl_analyzer"; - version = "0.8.1"; - - src = fetchurl { - url = - "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/download/v${version}/${pname}-linux-x64"; - hash = "sha256-WRc9fHUw9/KHD5BzUX3nd+0sRkc7i8axsXhHUZFOUeY="; - }; - - nativeBuildInputs = [ autoPatchelfHook ]; - - buildInputs = [ openssl zlib ]; - - sourceRoot = "."; - phases = [ "installPhase" "patchPhase" ]; - installPhase = '' - mkdir -p $out/bin - cp $src $out/bin/${pname} - chmod +x $out/bin/${pname} - ''; - }; -in { +{ pkgs, lib, config, ... }: { options.mods.terminal.development.enable = lib.mkEnableOption "enables cli editor"; @@ -38,7 +13,7 @@ in { # Shaders glsl_analyzer - # wgsl_analyzer + wgsl-analyzer # Python black @@ -79,7 +54,7 @@ in { languages.language-server = { glsl.command = "${pkgs.glsl_analyzer}/bin/glsl_analyzer"; - wgsl.command = "${wgsl_analyzer}/bin/wgsl_analyzer"; + wgsl.command = "${pkgs.wgsl-analyzer}/bin/wgsl_analyzer"; }; languages.language = [ diff --git a/nvfetcher.toml b/nvfetcher.toml index 1c299bb..dc06315 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,3 +1,7 @@ +["vesktop.micfix"] +src.manual = "1.0.1" +fetch.url = "https://codeberg.org/muon/gists/raw/branch/main/micfix.patch" + ["valheim.jotunn"] src.webpage = "https://thunderstore.io/c/valheim/p/ValheimModding/Jotunn/" src.regex = "v(\\d+\\.\\d+\\.\\d+)"