hyprland: use shared desktop modules from GitHub
Pin illustris/flake to e09318c and consume its common Home Manager and NixOS Hyprland modules. Keep NVIDIA and monitor-specific settings, HDR controls and LG recovery in the desktop overrides. Remove the duplicated controller, panel, scripts and Waybar patches, update the regression test and documentation, and normalize Nix indentation to tabs with lib.indent for embedded scripts.
This commit is contained in:
18 files changed
+273
-1901
No files matched your search
@@ -1,59 +1,60 @@
|
||||
{ stdenv, lib, fetchurl, dpkg, patchelf, qt5, libXtst, libXext, libX11, mkDerivation, makeWrapper, libXScrnSaver, writeScript, common-updater-scripts, curl, pup }:
|
||||
|
||||
let
|
||||
version = "2.16.5.1";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
|
||||
sha256 = "1xrvyy0higc1fbc8ascpaszvg2bl6x0a35bzmdq6dkay48hnrd8b";
|
||||
} else fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
|
||||
sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii";
|
||||
};
|
||||
inherit (lib) indent;
|
||||
version = "2.16.5.1";
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_i386.deb";
|
||||
sha256 = "1xrvyy0higc1fbc8ascpaszvg2bl6x0a35bzmdq6dkay48hnrd8b";
|
||||
} else fetchurl {
|
||||
name = "rescuetime-installer.deb";
|
||||
url = "https://www.rescuetime.com/installers/rescuetime_${version}_amd64.deb";
|
||||
sha256 = "09ng0yal66d533vzfv27k9l2va03rqbqmsni43qi3hgx7w9wx5ii";
|
||||
};
|
||||
in mkDerivation rec {
|
||||
# https://www.rescuetime.com/updates/linux_release_notes.html
|
||||
inherit version;
|
||||
pname = "rescuetime";
|
||||
inherit src;
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
# avoid https://github.com/NixOS/patchelf/issues/99
|
||||
dontStrip = true;
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp usr/bin/rescuetime $out/bin
|
||||
# https://www.rescuetime.com/updates/linux_release_notes.html
|
||||
inherit version;
|
||||
pname = "rescuetime";
|
||||
inherit src;
|
||||
nativeBuildInputs = [ dpkg ];
|
||||
# avoid https://github.com/NixOS/patchelf/issues/99
|
||||
dontStrip = true;
|
||||
unpackPhase = indent ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
installPhase = indent ''
|
||||
mkdir -p $out/bin
|
||||
cp usr/bin/rescuetime $out/bin
|
||||
|
||||
${patchelf}/bin/patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \
|
||||
$out/bin/rescuetime
|
||||
'';
|
||||
${patchelf}/bin/patchelf \
|
||||
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${lib.makeLibraryPath [ qt5.qtbase libXtst libXext libX11 libXScrnSaver ]}" \
|
||||
$out/bin/rescuetime
|
||||
'';
|
||||
|
||||
passthru.updateScript = writeScript "${pname}-updater" ''
|
||||
#!${stdenv.shell}
|
||||
set -eu -o pipefail
|
||||
PATH=${lib.makeBinPath [curl pup common-updater-scripts]}:$PATH
|
||||
latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')"
|
||||
passthru.updateScript = writeScript "${pname}-updater" (indent ''
|
||||
#!${stdenv.shell}
|
||||
set -eu -o pipefail
|
||||
PATH=${lib.makeBinPath [curl pup common-updater-scripts]}:$PATH
|
||||
latestVersion="$(curl -sS https://www.rescuetime.com/release-notes/linux | pup '.release:first-of-type h2 strong text{}' | tr -d '\n')"
|
||||
|
||||
for platform in ${lib.concatStringsSep " " meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform
|
||||
update-source-version ${pname} "$latestVersion" --system=$platform
|
||||
done
|
||||
'';
|
||||
for platform in ${lib.concatStringsSep " " meta.platforms}; do
|
||||
# The script will not perform an update when the version attribute is up to date from previous platform run
|
||||
# We need to clear it before each run
|
||||
update-source-version ${pname} 0 $(yes 0 | head -64 | tr -d "\n") --system=$platform
|
||||
update-source-version ${pname} "$latestVersion" --system=$platform
|
||||
done
|
||||
'');
|
||||
|
||||
meta = with lib; {
|
||||
description = "Helps you understand your daily habits so you can focus and be more productive";
|
||||
homepage = "https://www.rescuetime.com";
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Helps you understand your daily habits so you can focus and be more productive";
|
||||
homepage = "https://www.rescuetime.com";
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user