Merge pull request #168 from ein-shved/nix-fmt

.github/workflows/build.yml

@@ -96,8 +96,12 @@ jobs:
 
       - uses: DeterminateSystems/magic-nix-cache-action@v2
 
+      - name: Check formatting
+        run: nix fmt -- -c .
+
       - name: Build yandex-music
         run: nix build --impure .#yandex-music
+
       - name: Build yandex-music without flakes binaries
         run: nix build --impure .#yandex-music-noflakes
 

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1731533236,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -19,16 +19,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708093448,
+        "lastModified": 1741379970,
-        "narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=",
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
-        "type": "indirect"
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {

flake.nix

@@ -4,13 +4,23 @@
   inputs = {
     ymExe.url = "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.41.1.exe";
     ymExe.flake = false;
+
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
-  outputs = { self, ymExe, nixpkgs, flake-utils }:
+  outputs =
+    {
+      self,
+      ymExe,
+      nixpkgs,
+      flake-utils,
+    }:
     let
-      yandex-music-with = pkgs: pkgs.callPackage ./nix {
+      yandex-music-with =
-        inherit ymExe;
+        pkgs:
-      };
+        pkgs.callPackage ./nix {
+          inherit ymExe;
+        };
       modules = isHm: rec {
         yandex-music = {
           imports = [ (import ./nix/module.nix { inherit isHm yandex-music-with; }) ];
@@ -18,19 +28,21 @@
         default = yandex-music;
       };
     in
-    flake-utils.lib.eachDefaultSystem
+    flake-utils.lib.eachDefaultSystem (
-      (system:
+      system:
-        let
+      let
-          pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs { inherit system; };
-        in
+      in
-        {
+      {
-          packages = rec {
+        packages = rec {
-            yandex-music = yandex-music-with pkgs;
+          yandex-music = yandex-music-with pkgs;
-            yandex-music-noflakes = pkgs.callPackage ./nix { };
+          yandex-music-noflakes = pkgs.callPackage ./nix { };
-            default = yandex-music;
+          default = yandex-music;
-          };
+        };
-        }
+        formatter = pkgs.nixfmt-rfc-style;
-      ) // {
+      }
+    )
+    // {
       nixosModules = modules false;
       homeManagerModules = modules true;
 

nix/default.nix

@@ -1,22 +1,23 @@
-{ fetchurl
+{
-, stdenvNoCC
+  fetchurl,
-, lib
+  stdenvNoCC,
-, makeWrapper
+  lib,
+  makeWrapper,
 
-, p7zip
+  p7zip,
-, asar
+  asar,
-, jq
+  jq,
-, python3
+  python3,
-, electron
+  electron,
 
-, ymExe ? null
+  ymExe ? null,
-, electronArguments ? ""
+  electronArguments ? "",
-, trayEnabled ? false
+  trayEnabled ? false,
-, trayStyle ? 1
+  trayStyle ? 1,
-, trayAlways ? false
+  trayAlways ? false,
-, devTools ? false
+  devTools ? false,
-, vibeAnimationMaxFps ? 25
+  vibeAnimationMaxFps ? 25,
-, customTitleBar ? false
+  customTitleBar ? false,
 }:
 let
   inherit (lib) optionalString assertMsg;
@@ -24,8 +25,7 @@ let
 in
 assert assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be withing 1 and 3";
 assert assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0";
-stdenvNoCC.mkDerivation
+stdenvNoCC.mkDerivation {
-{
   name = "yandex-music";
   inherit (version_info.ym) version;
 
@@ -44,8 +44,8 @@ stdenvNoCC.mkDerivation
   desktopItem = ../templates/desktop;
   ymScript = ../templates/yandex-music.sh;
   src =
-    if ymExe != null
+    if ymExe != null then
-    then ymExe
+      ymExe
     else
       fetchurl {
         url = version_info.ym.exe_link;
@@ -61,18 +61,23 @@ stdenvNoCC.mkDerivation
   '';
   dontPatch = true;
 
-  config =''
+  config =
-    ELECTRON_ARGS="${electronArguments}"
+    ''
-    VIBE_ANIMATION_MAX_FPS=${toString vibeAnimationMaxFps}
+      ELECTRON_ARGS="${electronArguments}"
-  '' + optionalString trayEnabled ''
+      VIBE_ANIMATION_MAX_FPS=${toString vibeAnimationMaxFps}
-    TRAY_ENABLED=${toString trayStyle}
+    ''
-  '' + optionalString trayAlways ''
+    + optionalString trayEnabled ''
-    ALWAYS_LEAVE_TO_TRAY=1
+      TRAY_ENABLED=${toString trayStyle}
-  '' + optionalString devTools ''
+    ''
-    DEV_TOOLS=1
+    + optionalString trayAlways ''
-  '' + optionalString customTitleBar ''
+      ALWAYS_LEAVE_TO_TRAY=1
-    CUSTOM_TITLE_BAR=1
+    ''
-  '';
+    + optionalString devTools ''
+      DEV_TOOLS=1
+    ''
+    + optionalString customTitleBar ''
+      CUSTOM_TITLE_BAR=1
+    '';
 
   installPhase = ''
     mkdir -p "$out/share/nodejs"
@@ -101,7 +106,10 @@ stdenvNoCC.mkDerivation
     homepage = "https://music.yandex.ru/";
     downloadPage = "https://music.yandex.ru/download/";
     license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = [
       {
         name = "Yury Shvedov";

nix/module.nix

@@ -1,19 +1,27 @@
-{ yandex-music-with
+{
-, isHm ? false
+  yandex-music-with,
+  isHm ? false,
+}:
+{
+  lib,
+  pkgs,
+  config,
+  ...
 }:
-{ lib, pkgs, config, ... }:
 let
   cfg = config.programs.yandex-music;
 
 in
 {
-  imports = [{
+  imports = [
-    nixpkgs.overlays = [
+    {
-      (final: prev: {
+      nixpkgs.overlays = [
-        yandex-music = yandex-music-with prev;
+        (final: prev: {
-      })
+          yandex-music = yandex-music-with prev;
-    ];
+        })
-  }];
+      ];
+    }
+  ];
 
   options = {
     programs.yandex-music = {