diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix index 4425aa4..15d660c 100755 --- a/machine/framework/configuration.nix +++ b/machine/framework/configuration.nix @@ -4,8 +4,15 @@ let in { nixpkgs = { + overlays = [ + outputs.overlays.additions + ]; config = { allowUnfree = true; + packageOverrides = pkgs: { + intel-vaapi-driver = + pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; + }; }; }; @@ -46,7 +53,7 @@ in }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_testing; initrd.systemd.enable = true; loader = { systemd-boot.enable = true; @@ -56,10 +63,7 @@ in # nixpkgs.config = { # allowUnfree = true; - # packageOverrides = pkgs: { - # intel-vaapi-driver = - # pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; - # }; + # }; # nixpkgs.localSystem = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 3d9e23c..28faf11 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,5 @@ # Custom packages, that can be defined similarly to ones from nixpkgs # You can build them using 'nix build .#example' pkgs: { - # example = pkgs.callPackage ./example { }; + psensor = pkgs.callPackage ./psensor { }; } diff --git a/pkgs/psensor/default.nix b/pkgs/psensor/default.nix new file mode 100644 index 0000000..819d03e --- /dev/null +++ b/pkgs/psensor/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, lm_sensors +, libgtop +, libatasmart +, gtk3 +, libnotify +, udisks2 +# , libXNVCtrl +, wrapGAppsHook3 +, libappindicator +}: + +stdenv.mkDerivation rec { + pname = "psensor"; + + version = "1.2.1"; + + src = fetchurl { + url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; + sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; + }; + + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + + buildInputs = [ + lm_sensors + libgtop + libatasmart + gtk3 + libnotify + udisks2 + libappindicator + ]; + + # preConfigure = '' + # NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" + # NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" + # ''; + + meta = with lib; { + description = "Graphical hardware monitoring application for Linux"; + homepage = "https://wpitchoune.net/psensor/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; + mainProgram = "psensor"; + }; +}