From 6fde270fb8799486c47945386cd00f339069647f Mon Sep 17 00:00:00 2001 From: uku Date: Tue, 3 Sep 2024 21:28:42 +0200 Subject: [PATCH] chore: fmt --- programs/games.nix | 2 +- systems/mottarone/default.nix | 6 +++++- systems/mottarone/teams.nix | 25 +++++++++++++------------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/programs/games.nix b/programs/games.nix index a4008f2..94ae823 100644 --- a/programs/games.nix +++ b/programs/games.nix @@ -7,7 +7,7 @@ hm.home.packages = with pkgs; [ obs-studio osu-lazer-bin - + (vesktop.override {withSystemVencord = false;}) (prismlauncher.override { jdks = [temurin-bin-21 temurin-bin-17 temurin-bin-8]; diff --git a/systems/mottarone/default.nix b/systems/mottarone/default.nix index e7f9f22..eacc2db 100644 --- a/systems/mottarone/default.nix +++ b/systems/mottarone/default.nix @@ -1,4 +1,8 @@ -{lib, pkgs, ...}: { +{ + lib, + pkgs, + ... +}: { environment.systemPackages = with pkgs; [ chromium gtkterm diff --git a/systems/mottarone/teams.nix b/systems/mottarone/teams.nix index ad04527..ac60ee6 100644 --- a/systems/mottarone/teams.nix +++ b/systems/mottarone/teams.nix @@ -12,7 +12,6 @@ versionCheckHook, which, }: - buildNpmPackage rec { pname = "teams-for-linux"; version = "1.9.5"; @@ -26,10 +25,12 @@ buildNpmPackage rec { npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc="; - nativeBuildInputs = [ - makeWrapper - versionCheckHook - ] ++ lib.optionals (stdenv.isLinux) [ copyDesktopItems ]; + nativeBuildInputs = + [ + makeWrapper + versionCheckHook + ] + ++ lib.optionals (stdenv.isLinux) [copyDesktopItems]; doInstallCheck = stdenv.isLinux; @@ -74,11 +75,11 @@ buildNpmPackage rec { # Linux needs 'aplay' for notification sounds makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ - lib.makeBinPath [ - alsa-utils - which - ] - } \ + lib.makeBinPath [ + alsa-utils + which + ] + } \ --add-flags "$out/share/teams-for-linux/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" '' @@ -107,7 +108,7 @@ buildNpmPackage rec { }) ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script {}; meta = { description = "Unofficial Microsoft Teams client for Linux"; @@ -122,4 +123,4 @@ buildNpmPackage rec { ]; platforms = with lib.platforms; darwin ++ linux; }; -} \ No newline at end of file +}