diff --git a/flake.lock b/flake.lock index a848ba7..bf3df90 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,27 @@ "type": "gitlab" } }, + "ipmihddtemp": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1635966341, + "narHash": "sha256-Y70jZPL3/fY8SzkPnpw9Ta411zbbkJ1D3qOYJ76zuIA=", + "owner": "nyanloutre", + "repo": "ipmihddtemp", + "rev": "6fe5d14f588956dfff89716f81b8101c7a94cd6d", + "type": "gitlab" + }, + "original": { + "owner": "nyanloutre", + "ref": "master", + "repo": "ipmihddtemp", + "type": "gitlab" + } + }, "nixpkgs": { "locked": { "lastModified": 1635806954, @@ -54,6 +75,7 @@ "root": { "inputs": { "dogetipbot-telegram": "dogetipbot-telegram", + "ipmihddtemp": "ipmihddtemp", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver" diff --git a/flake.nix b/flake.nix index cbcb814..f1d0adf 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,13 @@ url = "gitlab:nyanloutre/dogetipbot-telegram/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + ipmihddtemp = { + url = "gitlab:nyanloutre/ipmihddtemp/master"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram }: { + outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, ipmihddtemp }: { nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -25,24 +29,8 @@ "${nixpkgs-unstable}/nixos/modules/services/audio/navidrome.nix" simple-nixos-mailserver.nixosModule dogetipbot-telegram.nixosModule + ipmihddtemp.nixosModule ./systems/LoutreOS/configuration.nix - ({ pkgs, ... }: { - systemd.services.ipmihddtemp = { - description = "IPMI HDD temp fan control"; - wantedBy = ["multi-user.target"]; - path = with pkgs;[ ipmitool smartmontools ]; - serviceConfig = { - ExecStart = with nixpkgs-unstable.legacyPackages.x86_64-linux; - let env = python3Packages.python.buildEnv.override { - extraLibs = with python3Packages;[ pysmart ]; - ignoreCollisions = true; - }; - in "${pkgs.writeShellScriptBin "run.sh" '' - ${env}/bin/python ${pkgs.writeScript "ipmihddtemp.py" "${builtins.readFile ./ipmihddtemp.py}"} - ''}/bin/run.sh"; - }; - }; - }) ]; }; diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index 5c03619..ac1a373 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -676,6 +676,8 @@ in dogetipbot-telegram.enable = true; + ipmihddtemp.enable = true; + # systemd.services.minecraft-overviewer = # let # clientJar = pkgs.fetchurl {