From c67bb287a82984fa2c41bf6be4abe27cce5ae337 Mon Sep 17 00:00:00 2001 From: Dmitriy Holkin Date: Wed, 5 Feb 2020 05:00:50 +0400 Subject: [PATCH] change i3lock-fancy to i3lock-fancy-rapid --- modules/applications/i3lock-fancy-rapid.nix | 25 ++++++++++++++ modules/applications/i3lock-fancy.nix | 37 --------------------- modules/applications/packages.nix | 3 +- modules/packages.nix | 2 +- modules/workspace/i3/default.nix | 2 +- nix/sources.json | 12 +++++++ 6 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 modules/applications/i3lock-fancy-rapid.nix delete mode 100644 modules/applications/i3lock-fancy.nix diff --git a/modules/applications/i3lock-fancy-rapid.nix b/modules/applications/i3lock-fancy-rapid.nix new file mode 100644 index 0000000..3071d8e --- /dev/null +++ b/modules/applications/i3lock-fancy-rapid.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, i3lock, xorg, imports }: +stdenv.mkDerivation rec { + name = "i3lock-fancy-rapid"; + src = imports.i3lock-fancy-rapid; + # src = fetchFromGitHub { + # owner = "yvbbrjdr"; + # repo = "i3lock-fancy-rapid"; + # rev = "c67f09bc8a48798c7c820d7d4749240b10865ce0"; + # sha256 = "0jhvlj6v6wx70239pgkjxd42z1s2bzfg886ra6n1rzsdclf4rkc6"; + # }; + buildInputs = [ i3lock xorg.libX11 ]; + + installPhase = '' + mkdir -p $out/bin + cp i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid + ''; + + meta = with stdenv.lib; { + description = "A faster implementation of i3lock-fancy. It is blazing fast and provides a fully configurable box blur. It uses linear-time box blur and accelerates using OpenMP."; + homepage = https://github.com/yvbbrjdr/i3lock-fancy-rapid; + maintainers = with maintainers; [ ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/modules/applications/i3lock-fancy.nix b/modules/applications/i3lock-fancy.nix deleted file mode 100644 index 1b1d47e..0000000 --- a/modules/applications/i3lock-fancy.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchFromGitHub, coreutils, i3lock-color, getopt, fontconfig, ffmpeg_4, xorg }: - -stdenv.mkDerivation rec { - rev = "c8f648c5e35178dd39ecc83094bf921752b7878b"; - name = "i3lock-fancy-ffmpeg_rev${builtins.substring 0 7 rev}"; - src = fetchFromGitHub { - owner = "rinfiyks"; - repo = "i3lock-fancy"; - inherit rev; - sha256 = "1pdvzi5d9p2r5md2g289j95333nkpb3ah3si91c5f6350swd8jmz"; - }; - buildInputs = [ i3lock-color xorg.xrandr ffmpeg_4 coreutils getopt fontconfig ]; - patchPhase = '' - sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy - sed -i -e "s|(xrandr)|(${xorg.xrandr}/bin/xrandr)|" i3lock-fancy - sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy - sed -i -e "s|i3lock -i |${i3lock-color}/bin/i3lock-color -i |" i3lock-fancy - sed -i -e 's|lock_file="/usr/share/i3lock-fancy/lock.png"|lock_file="'$out'/share/i3lock-fancy/icons/lock.png"|' i3lock-fancy - sed -i -e "s|getopt |${getopt}/bin/getopt |" i3lock-fancy - sed -i -e "s|fc-match |${fontconfig.bin}/bin/fc-match |" i3lock-fancy - sed -i -e "s|fc-list |${fontconfig.bin}/bin/fc-list |" i3lock-fancy - sed -i -e "s|ffmpeg -f |${ffmpeg_4}/bin/ffmpeg -f |" i3lock-fancy - rm Makefile - ''; - installPhase = '' - mkdir -p $out/bin $out/share/i3lock-fancy/icons - cp i3lock-fancy $out/bin/i3lock-fancy - cp icons/lock*.png $out/share/i3lock-fancy/icons - ''; - meta = with stdenv.lib; { - description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; - homepage = https://github.com/meskarune/i3lock-fancy; - maintainers = with maintainers; [ ]; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 0e8f9ee..767f9b0 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -28,7 +28,7 @@ in { lxqt.pavucontrol-qt bibata-cursors - i3lock-fancy + i3lock-fancy-rapid # mullvad-vpn # Samba support @@ -36,6 +36,7 @@ in { # Utils pciutils usbutils + nix-prefetch-git hdparm vdpauinfo libva-utils diff --git a/modules/packages.nix b/modules/packages.nix index 105fa3d..ac385e6 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -12,7 +12,7 @@ in { pkgs, config, lib, ... }: { wg-conf = pkgs.callPackage ./applications/wg-conf.nix { }; - i3lock-fancy = pkgs.callPackage ./applications/i3lock-fancy.nix { }; + i3lock-fancy-rapid = pkgs.callPackage ./applications/i3lock-fancy-rapid.nix { }; git-with-libsecret = super.git.override { withLibsecret = true; }; diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix index 9eb6d68..78200a9 100644 --- a/modules/workspace/i3/default.nix +++ b/modules/workspace/i3/default.nix @@ -156,7 +156,7 @@ in { "${modifier}+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv"; "${modifier}+Shift+y" = "exec ${pkgs.youtube-to-mpv}/bin/yt-mpv --no-video"; - "${modifier}+Shift+l" = "exec ${pkgs.i3lock-fancy}/bin/i3lock-fancy -f Roboto-Medium"; + "${modifier}+Shift+l" = "exec ${pkgs.i3lock-fancy-rapid}/bin/i3lock-fancy-rapid 8 3"; "${modifier}+Print" = script "screenshot" "${pkgs.maim}/bin/maim ~/Pictures/$(date +%s).png"; diff --git a/nix/sources.json b/nix/sources.json index f00a32a..7df7c77 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -23,6 +23,18 @@ "url": "https://github.com/rycee/home-manager/archive/6cc4fd6ede4909226cb81d3475834251ed1b7210.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, + "i3lock-fancy-rapid": { + "branch": "master", + "description": "A faster implementation of i3lock-fancy.", + "homepage": null, + "owner": "yvbbrjdr", + "repo": "i3lock-fancy-rapid", + "rev": "c67f09bc8a48798c7c820d7d4749240b10865ce0", + "sha256": "0jhvlj6v6wx70239pgkjxd42z1s2bzfg886ra6n1rzsdclf4rkc6", + "type": "tarball", + "url": "https://github.com/yvbbrjdr/i3lock-fancy-rapid/archive/c67f09bc8a48798c7c820d7d4749240b10865ce0.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "materia-theme": { "branch": "master", "description": "A Material Design theme for GNOME/GTK based desktop environments",