From 4eb3d5d3b110f7d0db129f736980c4c1904f678d Mon Sep 17 00:00:00 2001 From: tdro Date: Wed, 4 Oct 2023 20:56:03 -0400 Subject: .config/nixpkgs: Sync to 23.05 Shed unneeded package definitions --- .config/nixpkgs/config.nix | 56 ++++++++++------------ .config/nixpkgs/packages/csstidy/default.nix | 6 ++- .config/nixpkgs/packages/edl/default.nix | 46 ------------------ .config/nixpkgs/packages/gnaural/default.nix | 29 ----------- .config/nixpkgs/packages/hugo/default.nix | 26 ---------- .../nerdfonts-dejavu-sans-mono/default.nix | 16 ++----- .config/nixpkgs/packages/nwg-look/default.nix | 33 ------------- .config/nixpkgs/packages/skeema/default.nix | 23 --------- .config/nixpkgs/packages/sqldef/default.nix | 23 --------- .config/nixpkgs/packages/wf-shell/default.nix | 12 ++--- .config/nixpkgs/packages/x11vnc/default.nix | 43 ----------------- .config/nixpkgs/packages/xprintidle/default.nix | 25 ---------- .config/nixpkgs/packages/youtube-dl/default.nix | 35 -------------- .config/skippy-xd/skippy-xd.rc | 1 + .local/bin/say | 5 +- 15 files changed, 45 insertions(+), 334 deletions(-) delete mode 100644 .config/nixpkgs/packages/edl/default.nix delete mode 100644 .config/nixpkgs/packages/gnaural/default.nix delete mode 100644 .config/nixpkgs/packages/hugo/default.nix delete mode 100644 .config/nixpkgs/packages/nwg-look/default.nix delete mode 100644 .config/nixpkgs/packages/skeema/default.nix delete mode 100644 .config/nixpkgs/packages/sqldef/default.nix delete mode 100644 .config/nixpkgs/packages/x11vnc/default.nix delete mode 100644 .config/nixpkgs/packages/xprintidle/default.nix delete mode 100644 .config/nixpkgs/packages/youtube-dl/default.nix diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix index e226de8..69feb8f 100644 --- a/.config/nixpkgs/config.nix +++ b/.config/nixpkgs/config.nix @@ -2,13 +2,17 @@ let pkgs = import { }; - stable = import (builtins.fetchTarball { + previous = import (builtins.fetchTarball { url = "https://releases.nixos.org/nixos/22.11/nixos-22.11.466.596a8e828c5/nixexprs.tar.xz"; sha256 = "1367bad5zz0mfm4czb6p0s0ni38f0x1ffh02z76rx4nranipqbgg"; }) { }; + stable = import (builtins.fetchTarball { + url = "https://releases.nixos.org/nixos/23.05/nixos-23.05.861.d3bb401dcfc/nixexprs.tar.xz"; + sha256 = "1b9871if05n92r6acmy46jn6kj583wflp0sgrgfmfmkj3xxsd2i0"; }) { }; + unstable = import (builtins.fetchTarball { - url = "https://releases.nixos.org/nixos/unstable/nixos-23.11pre516114.d680ded26da5/nixexprs.tar.xz"; - sha256 = "13cnlhpp3v7jay4jxyyy2d4kxw4ngpz3m00rhj3vlhvf7jl7hr48"; }) { }; + url = "https://releases.nixos.org/nixos/unstable/nixos-23.11pre530560.f5892ddac112/nixexprs.tar.xz"; + sha256 = "0i4hycnrl8m38gyk5qv76wr8zkwd0g9swgwhwhaczrfczskpms31"; }) { }; in @@ -64,17 +68,17 @@ in Terminal = pkgs.buildEnv { name = "terminal"; paths = [ - (import ./shells/larynx/shell.nix).fhs - (import ./shells/larynx-server/shell.nix).fhs (callPackage ./packages/chromexup/default.nix { }) (callPackage ./packages/emacs-batch-indent/default.nix { }) - (callPackage ./packages/hugo/default.nix { }) (callPackage ./packages/pdf2htmlex/default.nix { }) (callPackage ./packages/rxvt-unicode/default.nix { }) (callPackage ./packages/systemd2nix/default.nix { }) - (callPackage ./packages/youtube-dl/default.nix { }) (pass.withExtensions (ext: with ext; [ pass-import pass-audit pass-otp ])) + unstable.hugo + unstable.piper-tts unstable.validator-nu + unstable.vim + unstable.yt-dlp aerc alacritty alsaUtils @@ -98,7 +102,6 @@ in emacs encfs entr - exercism expect fdupes ffmpeg @@ -159,7 +162,6 @@ in vale vcal ventoy-bin - vimHugeX vnstat w3m wavemon @@ -178,9 +180,6 @@ in (callPackage ./packages/dmenu/default.nix { }) (callPackage ./packages/rofi/default.nix { }) (callPackage ./packages/sowon/default.nix { }) - (import ./shells/planner/shell.nix).package - (import ./shells/scribus/shell.nix).package - (import ./shells/tilp2/shell.nix).package (mplayer.override { v4lSupport = true; }) unstable.firefox unstable.google-chrome @@ -263,12 +262,11 @@ in Xorg = pkgs.buildEnv { name = "xorg"; paths = [ - (callPackage ./packages/x11vnc/default.nix { }) - (callPackage ./packages/xprintidle/default.nix { }) autocutsel glxinfo unclutter-xfixes wmctrl + x11vnc xbindkeys xdotool xorg.xauth @@ -288,6 +286,7 @@ in xorg.xrdb xorg.xset xorg.xsetroot + xprintidle xsel xzoom ]; @@ -305,12 +304,7 @@ in Awesome = pkgs.buildEnv { name = "awesome"; - paths = [ - ((import (builtins.fetchTarball { - url = "https://releases.nixos.org/nixos/21.11/nixos-21.11.336020.2128d0aa28e/nixexprs.tar.xz"; - sha256 = "0w8plbxms0di6gnh0k2yhj0pgxzxas7g5x0m01zjzixf16i2bapj"; - }) { }).awesome) - ]; + paths = [ awesome ]; }; Xfce = pkgs.buildEnv { @@ -364,15 +358,15 @@ in Themes = pkgs.buildEnv { name = "themes"; paths = [ - (callPackage ./packages/nwg-look/default.nix { }) - gtk3.dev glib gnome.dconf-editor gtk-engine-murrine + gtk3.dev librsvg lxappearance papirus-icon-theme qt4 + unstable.nwg-look vanilla-dmz ]; }; @@ -412,9 +406,9 @@ in Android = pkgs.buildEnv { name = "android"; paths = [ - (callPackage ./packages/edl/default.nix { }) (callPackage ./packages/mkbootfs/default.nix { }) (callPackage ./packages/mkbootimg/default.nix { }) + edl abootimg ]; }; @@ -508,7 +502,7 @@ in Haskell = pkgs.buildEnv { name = "haskell"; - paths = [ ghc ghcid haskellPackages.hlint haskellPackages.brittany ]; + paths = [ ghc ghcid haskellPackages.hlint previous.haskellPackages.brittany ]; }; Clojure = pkgs.buildEnv { @@ -523,7 +517,7 @@ in Nix = pkgs.buildEnv { name = "nix"; - paths = [ nix-index nix-linter nixfmt nixpkgs-fmt nixpkgs-lint ]; + paths = [ nix-index previous.nix-linter nixfmt nixpkgs-fmt nixpkgs-lint ]; }; Ruby = pkgs.buildEnv { @@ -573,7 +567,7 @@ in CSS = pkgs.buildEnv { name = "css"; paths = [ - (callPackage ./packages/csstidy/default.nix { }) + (previous.callPackage ./packages/csstidy/default.nix { }) nodePackages.stylelint csslint sassc @@ -583,21 +577,21 @@ in SQL = pkgs.buildEnv { name = "sql"; paths = [ - (callPackage ./packages/sqldef/default.nix { }) pgformatter skeema sqlfluff sqlint sqlite sqlitebrowser + unstable.sqldef ]; }; YAML = pkgs.buildEnv { name = "yaml"; paths = [ + (previous.callPackage ./packages/yaml2nix/default.nix { }) (callPackage ./packages/ruamel.yaml.cmd/default.nix { }) - (callPackage ./packages/yaml2nix/default.nix { }) python39Packages.yamllint yj ]; @@ -606,11 +600,10 @@ in Xorg-Aarch64 = pkgs.buildEnv { name = "xorg-aarch64"; paths = [ - (callPackage ./packages/x11vnc/default.nix { }) - (callPackage ./packages/xprintidle/default.nix { }) glxinfo unclutter-xfixes wmctrl + x11vnc xbindkeys xdotool xorg.xauth @@ -626,6 +619,7 @@ in xorg.xrdb xorg.xset xorg.xsetroot + xprintidle xsel xzoom ]; @@ -674,6 +668,7 @@ in Terminal-Aarch64 = pkgs.buildEnv { name = "terminal-aarch64"; paths = [ + unstable.vim alsaUtils fzf libnotify @@ -682,7 +677,6 @@ in rxvt-unicode skippy-xd tigervnc - vimHugeX ]; }; }; diff --git a/.config/nixpkgs/packages/csstidy/default.nix b/.config/nixpkgs/packages/csstidy/default.nix index a20123a..5ccf7ff 100644 --- a/.config/nixpkgs/packages/csstidy/default.nix +++ b/.config/nixpkgs/packages/csstidy/default.nix @@ -14,12 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ sconsPackages.scons_3_0_1 ]; preBuild = '' - sed -i "/env = Environment()/a env.Replace(CXX='${gcc}/bin/g++')" SConstruct + sed --in-place "/env = Environment()/a env.Replace(CXX='${gcc}/bin/g++')" SConstruct ''; installPhase = '' - mkdir -p $out/bin + runHook preInstall + mkdir --parents $out/bin cp release/csstidy/csstidy $out/bin + runHook postInstall ''; meta = with lib; { diff --git a/.config/nixpkgs/packages/edl/default.nix b/.config/nixpkgs/packages/edl/default.nix deleted file mode 100644 index a04ac61..0000000 --- a/.config/nixpkgs/packages/edl/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchgit, python38 }: - -python38.pkgs.buildPythonApplication rec { - - pname = "edl"; - url = "https://github.com/bkerler/edl.git"; - version = "6ca9feb8ac7b260a0395d4f51e9e91fc0feda058"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "1lpgamg6wkwpj3mxcn8nrxxw90svx5xy3kahk8rdf09ph6wlii4x"; - }; - - doCheck = false; - dontBuild = true; - format = "other"; - - propagatedBuildInputs = [ - python38.pkgs.pyusb - python38.pkgs.pyserial - python38.pkgs.docopt - python38.pkgs.pycryptodome - python38.pkgs.qrcode - ]; - - pythonEnv = python38.withPackages (ps: with ps; propagatedBuildInputs); - - installPhase = '' - runHook preInstall - mkdir --parents $out/share/edl - cp --recursive --no-target-directory ${src} $out/share/edl - makeWrapper ${pythonEnv}/bin/python $out/bin/edl --add-flags $out/share/edl/edl.py - makeWrapper ${pythonEnv}/bin/python $out/bin/edl-diag --add-flags $out/share/edl/diag.py - makeWrapper ${pythonEnv}/bin/python $out/bin/edl-tcpclient --add-flags $out/share/edl/tcpclient.py - makeWrapper ${pythonEnv}/bin/python $out/bin/edl-fhloaderparse --add-flags $out/share/edl/fhloaderparse.py - runHook postInstall - ''; - - meta = with lib; { - homepage = url; - license = licenses.mit; - platforms = platforms.linux; - description = "QC Firehose / Sahara Client / QC Diag Tools :)"; - }; -} diff --git a/.config/nixpkgs/packages/gnaural/default.nix b/.config/nixpkgs/packages/gnaural/default.nix deleted file mode 100644 index e4a3849..0000000 --- a/.config/nixpkgs/packages/gnaural/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, portaudio, libsndfile, pkg-config, gtk2, gcc48 }: - -stdenv.mkDerivation rec { - - pname = "gnaural"; - version = "20110606"; - - src = fetchurl { - url = "https://iweb.dl.sourceforge.net/project/gnaural/Gnaural/gnaural_${version}.tar.xz"; - sha256 = "1gq519c0imsh57zklyi0f8h64l3ai48lh672c834470z8c6kvbfi"; - }; - - patches = [ - (fetchurl { - name = "gnaural.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/gnaural.patch?h=gnaural"; - sha256 = "15bplxcvjml8cz7pi2fwb444fpp7ypsh279642v8s9hgl3i3jvsz"; - }) - ]; - - buildInputs = [ gcc48 portaudio pkg-config gtk2 libsndfile ]; - - meta = with lib; { - license = licenses.gpl2; - platforms = platforms.linux; - homepage = "http://gnaural.sourceforge.net/"; - description = "Auditory binaural-beat generator"; - }; -} diff --git a/.config/nixpkgs/packages/hugo/default.nix b/.config/nixpkgs/packages/hugo/default.nix deleted file mode 100644 index 1787bf2..0000000 --- a/.config/nixpkgs/packages/hugo/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildGoModule, fetchgit, installShellFiles }: - -buildGoModule rec { - pname = "hugo"; - version = "0.108.0"; - - src = fetchgit { - rev = "v${version}"; - url = "https://github.com/gohugoio/hugo.git"; - sha256 = "sha256-MbpBGqu7IwQCf9DjSfIDi25ZGJYTI6xxSk9wPWxychw="; - }; - - doCheck = false; - proxyVendor = true; - vendorSha256 = "sha256-ECA7xy7h3nkslW6bjjZWy3IxvF3Y1TTlGq8Os6R9UvA="; - - tags = [ "extended" ]; - subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; - - meta = { - license = lib.licenses.asl20; - homepage = "https://gohugo.io"; - description = "A fast and modern static website engine"; - }; -} diff --git a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix index 36f03ed..866a6af 100644 --- a/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix +++ b/.config/nixpkgs/packages/nerdfonts-dejavu-sans-mono/default.nix @@ -4,7 +4,6 @@ stdenv.mkDerivation rec { pname = "nerdfonts-dejavu-sans-mono"; version = "2.1.0"; - buildInputs = [ unzip ]; src = fetchurl { @@ -13,23 +12,18 @@ stdenv.mkDerivation rec { }; phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' unzip ${src} ''; installPhase = '' - mkdir -p $out/share/fonts/nerdfonts-dejavu-sans-mono - cp -r * $out/share/fonts/nerdfonts-dejavu-sans-mono + runHook preInstall + mkdir --parents $out/share/fonts/nerdfonts-dejavu-sans-mono + cp --recursive * $out/share/fonts/nerdfonts-dejavu-sans-mono + runHook postInstall ''; meta = with lib; { - description = '' - Nerd Fonts is a project that attempts to patch as many developer targeted - and/or used fonts as possible. The patch is to specifically add a high - number of additional glyphs from popular 'iconic fonts' such as Font - Awesome, Devicons, Octicons, and others. - ''; - homepage = "https://github.com/ryanoasis/nerd-fonts"; license = licenses.mit; platforms = platforms.all; + homepage = "https://github.com/ryanoasis/nerd-fonts"; }; } diff --git a/.config/nixpkgs/packages/nwg-look/default.nix b/.config/nixpkgs/packages/nwg-look/default.nix deleted file mode 100644 index d5ecbe3..0000000 --- a/.config/nixpkgs/packages/nwg-look/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchgit, pkg-config, go, gtk3, xcur2png, glib, cairo }: - -buildGoModule rec { - pname = "nwg-look"; - version = "0.1.4"; - - src = fetchgit { - url = "https://github.com/nwg-piotr/nwg-look"; - rev = "v${version}"; - sha256 = "sha256-ib+5dTCbZwmlD9DBw93nh9dlb/OBu2poE0CeM0ZCKXQ="; - }; - - nativeBuildInputs = [ pkg-config go ]; - buildInputs = [ gtk3 xcur2png glib cairo ]; - vendorSha256 = "sha256-XEgPeJ8zlaadl+yuAOlbzsBECs/c8cjBja+sZkTsg60="; - - postPatch = '' - substituteInPlace ./main.go --replace \ - /usr/share/${pname}/main.glade $out/share/${pname}/main.glade - ''; - - postInstall = '' - install -D --mode=444 ./stuff/main.glade $out/share/${pname}/main.glade - install -D --mode=444 ./stuff/${pname}.desktop $out/share/applications/${pname}.desktop - install -D --mode=444 ./stuff/${pname}.svg $out/share/pixmaps/${pname}.svg - ''; - - meta = with lib; { - description = "GTK3 settings editor adapted to work in the sway / wlroots environment"; - homepage = "https://github.com/nwg-piotr/nwg-look"; - license = licenses.mit; - }; -} diff --git a/.config/nixpkgs/packages/skeema/default.nix b/.config/nixpkgs/packages/skeema/default.nix deleted file mode 100644 index 9e9cee7..0000000 --- a/.config/nixpkgs/packages/skeema/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchgit, buildGoModule }: - -buildGoModule rec { - pname = "skeema"; - version = "v1.5.0"; - url = "https://github.com/skeema/skeema"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "0mrspmgiww0jlpml24r5f4ail8153f2liva88w9760fd5aky3ix3"; - }; - - vendorSha256 = null; - - doCheck = false; - - meta = with lib; { - homepage = url; - license = licenses.asl20; - description = "Schema management CLI for MySQL"; - }; -} diff --git a/.config/nixpkgs/packages/sqldef/default.nix b/.config/nixpkgs/packages/sqldef/default.nix deleted file mode 100644 index 983ea3f..0000000 --- a/.config/nixpkgs/packages/sqldef/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchgit, buildGoModule }: - -buildGoModule rec { - pname = "sqldef"; - version = "v0.8.9"; - url = "https://github.com/k0kubun/sqldef"; - - src = fetchgit { - inherit url; - rev = version; - sha256 = "1hvx05qwy2g4r1zc1k2f9xv4z815p5jh1a6g41fdlxskjl3kyyf5"; - }; - - vendorSha256 = "066184zmwdhd8dbkbmwds8aimiawfcvb8px8z1q48c949gvywlx7"; - - doCheck = false; - - meta = with lib; { - homepage = url; - license = licenses.mit; - description = "Idempotent MySQL/PostgreSQL schema management by SQL"; - }; -} diff --git a/.config/nixpkgs/packages/wf-shell/default.nix b/.config/nixpkgs/packages/wf-shell/default.nix index a7ef4a0..46448b9 100644 --- a/.config/nixpkgs/packages/wf-shell/default.nix +++ b/.config/nixpkgs/packages/wf-shell/default.nix @@ -1,28 +1,28 @@ { stdenv, lib, fetchgit, meson, ninja, pkg-config, wayland, alsa-lib, gtkmm3 -, gtk-layer-shell, pulseaudio, wayfire, wf-config }: +, gtk-layer-shell, pulseaudio, wayfire, wf-config, libdbusmenu-gtk3 }: stdenv.mkDerivation rec { pname = "wf-shell"; - version = "deffdbae2df1f4f3280e5416965b977062059b41"; + version = "9a9af00dc02780357466e27c5e77e316469e7a37"; src = fetchgit { url = "https://github.com/WayfireWM/wf-shell"; - sha256 = "sha256-eCga6ZdxqJYKc9yAI77fZUXOSaee8ijCE0XiJRJtDAg="; + sha256 = "sha256-DoGW9rCEQFDO/SJ/ZWv2SPzC/acLFnPPncs683ugEvY="; }; + mesonFlags = [ "--sysconfdir" "/etc" ]; nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ alsa-lib - gtkmm3 gtk-layer-shell + gtkmm3 + libdbusmenu-gtk3 pulseaudio wayfire wf-config ]; - mesonFlags = [ "--sysconfdir" "/etc" ]; - meta = with lib; { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; diff --git a/.config/nixpkgs/packages/x11vnc/default.nix b/.config/nixpkgs/packages/x11vnc/default.nix deleted file mode 100644 index bc941ca..0000000 --- a/.config/nixpkgs/packages/x11vnc/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchgit, openssl, zlib, libjpeg, xorg -, libvncserver, autoreconfHook, pkg-config }: - -stdenv.mkDerivation rec { - pname = "x11vnc"; - version = "f07df92816ef10b7382a542125955df7f4156a5c"; - - src = fetchgit { - url = "https://github.com/LibVNC/x11vnc"; - rev = version; - sha256 = "1vgkgcqz6fxjgdzqpnw05lg30hdczrfgyzj39z1ips9vcjpb6v8s"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - - buildInputs = [ - xorg.libXfixes - xorg.xorgproto - openssl - xorg.libXdamage - zlib - xorg.libX11 - libjpeg - xorg.libXtst - xorg.libXinerama - xorg.libXrandr - xorg.libXext - xorg.libXi - xorg.libXrender - libvncserver - ]; - - preConfigure = '' - configureFlags="--mandir=$out/share/man" - ''; - - meta = with lib; { - description = "A VNC server connected to a real X11 screen"; - homepage = "https://github.com/LibVNC/x11vnc/"; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/.config/nixpkgs/packages/xprintidle/default.nix b/.config/nixpkgs/packages/xprintidle/default.nix deleted file mode 100644 index c4cd11f..0000000 --- a/.config/nixpkgs/packages/xprintidle/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, meson -, pkg-config, ninja }: - -stdenv.mkDerivation rec { - pname = "xprintidle"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "g0hl1n"; - repo = pname; - rev = version; - sha256 = "10na3ymzfhpq800wsyd23m57ngz69nn5i10c7p9iya8hzi7cf20a"; - }; - - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ libX11 libXScrnSaver libXext ]; - - meta = with lib; { - inherit version; - description = "A command-line tool to print idle time from libXss"; - homepage = "https://github.com/g0hl1n/xprintidle"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/.config/nixpkgs/packages/youtube-dl/default.nix b/.config/nixpkgs/packages/youtube-dl/default.nix deleted file mode 100644 index 31b4aab..0000000 --- a/.config/nixpkgs/packages/youtube-dl/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, python39, ffmpeg, rtmpdump, phantomjs2, atomicparsley -, ffmpegSupport ? true, rtmpSupport ? true, phantomjsSupport ? false -, hlsEncryptedSupport ? true, withAlias ? true }: - -with python39.pkgs; - -buildPythonPackage rec { - pname = "yt-dlp"; - version = "2021.10.22"; - - src = fetchPypi { - inherit pname; - version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-okuWZr0iNBSeTajE8Wu45fdGwpQo0S7gT8HBG1JHowc="; - }; - - propagatedBuildInputs = [ websockets mutagen ] ++ lib.optional hlsEncryptedSupport pycryptodomex; - - makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optional rtmpSupport rtmpdump - ++ lib.optional phantomjsSupport phantomjs2; - in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; - - doCheck = false; - setupPyBuildFlags = [ "build_lazy_extractors" ]; - postInstall = lib.optionalString withAlias ''ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl"''; - - meta = with lib; { - license = licenses.unlicense; - homepage = "https://github.com/yt-dlp/yt-dlp/"; - changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; - description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; - }; -} diff --git a/.config/skippy-xd/skippy-xd.rc b/.config/skippy-xd/skippy-xd.rc index b2d867f..5fac657 100644 --- a/.config/skippy-xd/skippy-xd.rc +++ b/.config/skippy-xd/skippy-xd.rc @@ -20,6 +20,7 @@ clientDisplayModes = thumbnail icon filled none iconFillSpec = orig mid mid #00FFFF fillSpec = orig mid mid #FFFFFF background = +animationDuration = 0 [xinerama] showAll = true diff --git a/.local/bin/say b/.local/bin/say index cd9e07f..4537669 100755 --- a/.local/bin/say +++ b/.local/bin/say @@ -5,7 +5,10 @@ text=${1:-Nothing to say.} [ "${1-}" = "echo" ] && $0 "${2-}" "${1-}" && exit; -printf '%s' "$text" | larynx -q low > $audio +printf '%s' "$text" | + piper \ + --model "$HOME/.local/share/piper/voices/en_GB-jenny_dioco-medium.onnx" \ + --output_file $audio [ "${2-}" = "echo" ] && ffmpeg \ -- cgit v1.2.3