Update branch to main branch (TamtamHero#54)

* Adding @Svenum as an assignee to nix-related issues (TamtamHero#43) * Fixing adding @Svenum as an assignee to nix-related issues (TamtamHero#44) (non contributors cannot be assigned to issues) * Reload will report if config couldn't be parsed and the service keeps running. (TamtamHero#46) Authored-by: Nina Alexandra Klama <[email protected]> * Removing binary blobs from the project (TamtamHero#51) * removing binary blobs from the project. we now fetch the ectool from the gitlab artifacts and confirm the checksum. * remove bin references from README.md * extracting $TEMP_FOLDER from installEctool * Fix README spelling/grammer, fix "FrameWork" capitalization in service description (TamtamHero#52) * Review README spelling/grammar * Fix "FrameWork" capitalization in service * use ectool form nixpkgs * update flake * remove old deps * remove duplicated pkgs --------- Co-authored-by: Léopold Hubert <[email protected]> Co-authored-by: Nina Alexandra Klama <[email protected]> Co-authored-by: DeflateAwning <[email protected]>
Svenum · Aug 25, 2024 · 40f7b68 · 40f7b68
1 parent 8446f9d
commit 40f7b68
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 58 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,12 +18,6 @@
         localSystem = "x86_64-linux";
       }).pkgs.callPackage ./nix/packages/fw-fanctrl.nix {};
 
-    packages.x86_64-linux.fw-ectool = (
-      import nixpkgs {
-        currentSystem = "x86_64-linux";
-        localSystem = "x86_64-linux";
-      }).pkgs.callPackage ./nix/packages/fw-ectool.nix {};
-
     nixosModules.default = import ./nix/module.nix;
   };
 }
diff --git a/nix/module.nix b/nix/module.nix
@@ -4,7 +4,6 @@ with lib;
 with lib.types;
 let
   cfg = config.programs.fw-fanctrl;
-  fw-ectool = pkgs.callPackage ./packages/fw-ectool.nix {};
   fw-fanctrl = pkgs.callPackage ./packages/fw-fanctrl.nix {};
   defaultConfig = builtins.fromJSON (builtins.readFile ../config.json);
 in
@@ -84,9 +83,9 @@ in
 
   config = mkIf cfg.enable {
     # Install package
-    environment.systemPackages = [
+    environment.systemPackages = with pkgs; [
       fw-fanctrl
-      fw-ectool
+      ectool
     ];
 
     # Create config
@@ -102,7 +101,7 @@ in
         Type = "simple";
         Restart = "always";
         ExecStart = "${fw-fanctrl}/bin/fw-fanctrl --run --config /etc/fw-fanctrl/config.json --no-log";
-        ExecStopPost = "${fw-ectool}/bin/ectool autofanctrl";
+        ExecStopPost = "${pkgs.ectool}/bin/ectool autofanctrl";
       };
       enable = true;
       wantedBy = [ "multi-user.target" ];

diff --git a/nix/packages/fw-ectool.nix b/nix/packages/fw-ectool.nix
diff --git a/nix/packages/fw-fanctrl.nix b/nix/packages/fw-fanctrl.nix
@@ -4,7 +4,8 @@ python3Packages,
 python3,
 bash,
 callPackage,
-getopt
+getopt,
+ectool
 }:
 
 let
@@ -45,7 +46,7 @@ python3Packages.buildPythonPackage rec{
   ];
 
   propagatedBuildInputs = [
-    (callPackage ./fw-ectool.nix {})
+    ectool
   ];
 
   doCheck = false;