From 519191cd9f31d1fe1c205535ddc4efe5f2e63793 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 7 Oct 2023 10:10:55 -0400 Subject: treewide!: remove flake-parts while i love flake parts, i want to keep dependencies for this project as small as possible --- pkgs/all-packages.nix | 34 ------------- pkgs/cfspeedtest.nix | 27 ----------- pkgs/cfspeedtest/default.nix | 27 +++++++++++ pkgs/check-pr.nix | 17 ------- pkgs/check-pr/default.nix | 17 +++++++ pkgs/clippy-sarif.nix | 30 ------------ pkgs/clippy-sarif/default.nix | 30 ++++++++++++ pkgs/default.nix | 40 +++++++--------- pkgs/huion.nix | 93 ------------------------------------ pkgs/huion/default.nix | 93 ++++++++++++++++++++++++++++++++++++ pkgs/klassy.nix | 48 ------------------- pkgs/klassy/default.nix | 48 +++++++++++++++++++ pkgs/mommy.nix | 45 ----------------- pkgs/mommy/default.nix | 45 +++++++++++++++++ pkgs/nixgc.nix | 22 --------- pkgs/nixgc/default.nix | 22 +++++++++ pkgs/treefetch.nix | 27 ----------- pkgs/treefetch/default.nix | 27 +++++++++++ pkgs/vim-just.nix | 15 ------ pkgs/vim-just/default.nix | 15 ++++++ pkgs/xwaylandvideobridge.nix | 52 -------------------- pkgs/xwaylandvideobridge/default.nix | 52 ++++++++++++++++++++ 22 files changed, 394 insertions(+), 432 deletions(-) delete mode 100644 pkgs/all-packages.nix delete mode 100644 pkgs/cfspeedtest.nix create mode 100644 pkgs/cfspeedtest/default.nix delete mode 100644 pkgs/check-pr.nix create mode 100644 pkgs/check-pr/default.nix delete mode 100644 pkgs/clippy-sarif.nix create mode 100644 pkgs/clippy-sarif/default.nix delete mode 100644 pkgs/huion.nix create mode 100644 pkgs/huion/default.nix delete mode 100644 pkgs/klassy.nix create mode 100644 pkgs/klassy/default.nix delete mode 100644 pkgs/mommy.nix create mode 100644 pkgs/mommy/default.nix delete mode 100644 pkgs/nixgc.nix create mode 100644 pkgs/nixgc/default.nix delete mode 100644 pkgs/treefetch.nix create mode 100644 pkgs/treefetch/default.nix delete mode 100644 pkgs/vim-just.nix create mode 100644 pkgs/vim-just/default.nix delete mode 100644 pkgs/xwaylandvideobridge.nix create mode 100644 pkgs/xwaylandvideobridge/default.nix (limited to 'pkgs') diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix deleted file mode 100644 index 3dddad5..0000000 --- a/pkgs/all-packages.nix +++ /dev/null @@ -1,34 +0,0 @@ -final: prev: let - inherit (prev) callPackage; -in { - cfspeedtest = callPackage ./cfspeedtest.nix {}; - - check-pr = callPackage ./check-pr.nix {}; - - clippy-sarif = callPackage ./clippy-sarif.nix {}; - - huion = callPackage ./huion.nix {}; - - klassy = prev.libsForQt5.callPackage ./klassy.nix {}; - - mommy = callPackage ./mommy.nix {}; - - nixgc = callPackage ./nixgc.nix {}; - - modrinth-app-unwrapped = callPackage ./modrinth-app { - inherit (final.nodePackages or prev.nodePackages) pnpm; - inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) CoreServices Security WebKit; - }; - - modrinth-app = callPackage ./modrinth-app/wrapper.nix { - inherit (final) modrinth-app-unwrapped; - }; - - treefetch = callPackage ./treefetch.nix {}; - - swhkd = callPackage ./swhkd {}; - - vim-just = callPackage ./vim-just.nix {}; - - xwaylandvideobridge = callPackage ./xwaylandvideobridge.nix {}; -} diff --git a/pkgs/cfspeedtest.nix b/pkgs/cfspeedtest.nix deleted file mode 100644 index be357c5..0000000 --- a/pkgs/cfspeedtest.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: -rustPlatform.buildRustPackage rec { - pname = "cfspeedtest"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "code-inflation"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-YF/jf1TzNW1QswNefQ4qKeXDyjFoN9/AWcjoeENCgvc="; - }; - - cargoLock = { - lockFile = "${src}/Cargo.lock"; - }; - - meta = with lib; { - homepage = "https://github.com/code-inflation/cfspeedtest"; - description = "Unofficial CLI for speed.cloudflare.com"; - license = licenses.mit; - maintainers = with maintainers; [getchoo]; - }; -} diff --git a/pkgs/cfspeedtest/default.nix b/pkgs/cfspeedtest/default.nix new file mode 100644 index 0000000..be357c5 --- /dev/null +++ b/pkgs/cfspeedtest/default.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "cfspeedtest"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "code-inflation"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YF/jf1TzNW1QswNefQ4qKeXDyjFoN9/AWcjoeENCgvc="; + }; + + cargoLock = { + lockFile = "${src}/Cargo.lock"; + }; + + meta = with lib; { + homepage = "https://github.com/code-inflation/cfspeedtest"; + description = "Unofficial CLI for speed.cloudflare.com"; + license = licenses.mit; + maintainers = with maintainers; [getchoo]; + }; +} diff --git a/pkgs/check-pr.nix b/pkgs/check-pr.nix deleted file mode 100644 index b199669..0000000 --- a/pkgs/check-pr.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - lib, - writeShellApplication, -}: -writeShellApplication { - name = "check-pr"; - text = '' - _usage=" - usage: check-pr [package] - " - - [ "$#" -lt 2 ] && echo -n "$_usage" && exit 1 - - nix run "github:$1?ref=pull/$2/head''${3:+#$3}" - ''; -} -// {meta.platforms = lib.platforms.all;} diff --git a/pkgs/check-pr/default.nix b/pkgs/check-pr/default.nix new file mode 100644 index 0000000..b199669 --- /dev/null +++ b/pkgs/check-pr/default.nix @@ -0,0 +1,17 @@ +{ + lib, + writeShellApplication, +}: +writeShellApplication { + name = "check-pr"; + text = '' + _usage=" + usage: check-pr [package] + " + + [ "$#" -lt 2 ] && echo -n "$_usage" && exit 1 + + nix run "github:$1?ref=pull/$2/head''${3:+#$3}" + ''; +} +// {meta.platforms = lib.platforms.all;} diff --git a/pkgs/clippy-sarif.nix b/pkgs/clippy-sarif.nix deleted file mode 100644 index 11a611c..0000000 --- a/pkgs/clippy-sarif.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - clippy, -}: -rustPlatform.buildRustPackage rec { - pname = "clippy-sarif"; - version = "0.4.1"; - - src = lib.cleanSource (fetchFromGitHub { - owner = "psastras"; - repo = "sarif-rs"; - rev = "${pname}-v${version}"; - hash = "sha256-TnH2GQ8uComMgeUk7i63KA3hbWC/5KuLxoRXlR8qlVs="; - }); - - cargoSha256 = "sha256-Y0n0GfUguqdTdZO6SyWNysv3IlXiKqhSiiHxxUEUZo8="; - cargoBuildFlags = ["--package ${pname}"]; - - doCheck = false; - - meta = with lib; { - description = "CLI tool to convert clippy diagnostics into SARIF"; - homepage = "https://github.com/psastras/sarif-rs"; - maintainers = with maintainers; [getchoo]; - license = licenses.mit; - inherit (clippy.meta) platforms; - }; -} diff --git a/pkgs/clippy-sarif/default.nix b/pkgs/clippy-sarif/default.nix new file mode 100644 index 0000000..11a611c --- /dev/null +++ b/pkgs/clippy-sarif/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + clippy, +}: +rustPlatform.buildRustPackage rec { + pname = "clippy-sarif"; + version = "0.4.1"; + + src = lib.cleanSource (fetchFromGitHub { + owner = "psastras"; + repo = "sarif-rs"; + rev = "${pname}-v${version}"; + hash = "sha256-TnH2GQ8uComMgeUk7i63KA3hbWC/5KuLxoRXlR8qlVs="; + }); + + cargoSha256 = "sha256-Y0n0GfUguqdTdZO6SyWNysv3IlXiKqhSiiHxxUEUZo8="; + cargoBuildFlags = ["--package ${pname}"]; + + doCheck = false; + + meta = with lib; { + description = "CLI tool to convert clippy diagnostics into SARIF"; + homepage = "https://github.com/psastras/sarif-rs"; + maintainers = with maintainers; [getchoo]; + license = licenses.mit; + inherit (clippy.meta) platforms; + }; +} diff --git a/pkgs/default.nix b/pkgs/default.nix index b54c0fa..dc2f208 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,24 +1,20 @@ -{self, ...}: { - perSystem = { - lib, - pkgs, - system, - ... - }: { - packages = let - inherit (builtins) elem; - inherit (lib) filterAttrs fix; +final: prev: +with prev; let + # directories are mapped to packages here for convenience sake + shouldUse = name: type: !(lib.hasPrefix "_" name) && type == "directory"; + dir = lib.filterAttrs shouldUse (builtins.readDir ./.); + imported = lib.mapAttrs (name: _: callPackage ./${name} {}) dir; +in + imported + // { + klassy = libsForQt5.callPackage ./klassy {}; - unfiltered = fix (final: self.overlays.default final pkgs); + modrinth-app-unwrapped = callPackage ./modrinth-app { + inherit (final.nodePackages or prev.nodePackages) pnpm; + inherit ((final.darwin or prev.darwin).apple_sdk.frameworks) CoreServices Security WebKit; + }; - p = filterAttrs (_: v: - elem system (v.meta.platforms or []) && !(v.meta.broken or false)) - unfiltered; - in - p // {default = p.treefetch;}; - }; - - flake = { - overlays.default = final: prev: (import ./all-packages.nix final prev); - }; -} + modrinth-app = callPackage ./modrinth-app/wrapper.nix { + inherit (final) modrinth-app-unwrapped; + }; + } diff --git a/pkgs/huion.nix b/pkgs/huion.nix deleted file mode 100644 index 5e22340..0000000 --- a/pkgs/huion.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - lib, - stdenv, - autoPatchelfHook, - dpkg, - dbus, - fetchurl, - freetype, - fontconfig, - libusb1, - glib, - krb5, - libsForQt5, - makeWrapper, - mesa, - systemd, - xkbd, - xorg, - zlib, - ... -}: -stdenv.mkDerivation rec { - pname = "huion-g930l-driver"; - version = "15.0.0.103"; - - src = fetchurl { - url = "https://driverdl.huion.com/driver/X10_G930L_Q630M/HuionTablet_v15.0.0.103.202208301443.x86_64.deb"; - sha256 = "sha256-xOefpUj6V/XvEmtl8ETkmZgLtlHSyRzsZSZfhkQFtsg="; - }; - - sourceRoot = "."; - unpackCmd = "dpkg-deb -x $src ."; - - nativeBuildInputs = [autoPatchelfHook dpkg makeWrapper]; - buildInputs = - [ - dbus - freetype - fontconfig - libusb1 - glib - krb5 - mesa - systemd - xkbd - xorg.libX11 - xorg.libxcb - xorg.libXext - xorg.libXrandr - zlib - ] - ++ (with libsForQt5; [ - qt5.qtbase - qt5.qtgamepad - qt5.qtvirtualkeyboard - qt5.qtxmlpatterns - qt3d - qtquickcontrols - qtquickcontrols2 - ]); - - dontWrapQtApps = true; - # is this stupid? yes - # i don't care - autoPatchelfIgnoreMissingDeps = ["libQt5RemoteObjects.so.5"]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -R usr/{lib,share} $out/ - chmod -R g-w $out - chmod 755 $out/lib/huiontablet/huiontablet.sh - - makeWrapper $out/lib/huiontablet/huiontablet.sh $out/bin/huiontablet \ - "''${qtappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" - - substituteInPlace $out/share/applications/huiontablet.desktop \ - --replace /usr/lib/huiontablet/huiontablet.sh $out/bin/huiontablet \ - --replace /usr/share $out/share - ''; - - meta = { - # this probably works but it hasn't been tested much so - broken = true; - description = "huion drivers for G930L"; - homepage = "https://www.huion.com/"; - maintainers = [lib.maintainers.getchoo]; - platforms = ["x86_64-linux"]; - sourceProvenance = [lib.sourceTypes.binaryNativeCode]; - }; -} diff --git a/pkgs/huion/default.nix b/pkgs/huion/default.nix new file mode 100644 index 0000000..5e22340 --- /dev/null +++ b/pkgs/huion/default.nix @@ -0,0 +1,93 @@ +{ + lib, + stdenv, + autoPatchelfHook, + dpkg, + dbus, + fetchurl, + freetype, + fontconfig, + libusb1, + glib, + krb5, + libsForQt5, + makeWrapper, + mesa, + systemd, + xkbd, + xorg, + zlib, + ... +}: +stdenv.mkDerivation rec { + pname = "huion-g930l-driver"; + version = "15.0.0.103"; + + src = fetchurl { + url = "https://driverdl.huion.com/driver/X10_G930L_Q630M/HuionTablet_v15.0.0.103.202208301443.x86_64.deb"; + sha256 = "sha256-xOefpUj6V/XvEmtl8ETkmZgLtlHSyRzsZSZfhkQFtsg="; + }; + + sourceRoot = "."; + unpackCmd = "dpkg-deb -x $src ."; + + nativeBuildInputs = [autoPatchelfHook dpkg makeWrapper]; + buildInputs = + [ + dbus + freetype + fontconfig + libusb1 + glib + krb5 + mesa + systemd + xkbd + xorg.libX11 + xorg.libxcb + xorg.libXext + xorg.libXrandr + zlib + ] + ++ (with libsForQt5; [ + qt5.qtbase + qt5.qtgamepad + qt5.qtvirtualkeyboard + qt5.qtxmlpatterns + qt3d + qtquickcontrols + qtquickcontrols2 + ]); + + dontWrapQtApps = true; + # is this stupid? yes + # i don't care + autoPatchelfIgnoreMissingDeps = ["libQt5RemoteObjects.so.5"]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -R usr/{lib,share} $out/ + chmod -R g-w $out + chmod 755 $out/lib/huiontablet/huiontablet.sh + + makeWrapper $out/lib/huiontablet/huiontablet.sh $out/bin/huiontablet \ + "''${qtappsWrapperArgs[@]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" + + substituteInPlace $out/share/applications/huiontablet.desktop \ + --replace /usr/lib/huiontablet/huiontablet.sh $out/bin/huiontablet \ + --replace /usr/share $out/share + ''; + + meta = { + # this probably works but it hasn't been tested much so + broken = true; + description = "huion drivers for G930L"; + homepage = "https://www.huion.com/"; + maintainers = [lib.maintainers.getchoo]; + platforms = ["x86_64-linux"]; + sourceProvenance = [lib.sourceTypes.binaryNativeCode]; + }; +} diff --git a/pkgs/klassy.nix b/pkgs/klassy.nix deleted file mode 100644 index b5a5c0f..0000000 --- a/pkgs/klassy.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - ninja, - extra-cmake-modules, - kcmutils, - kdecoration, - kirigami2, - wrapQtAppsHook, -}: -stdenv.mkDerivation rec { - name = "klassy"; - version = "4.3.breeze5.27.5"; - - src = fetchFromGitHub { - owner = "paulmcauley"; - repo = "klassy"; - rev = version; - hash = "sha256-2qs30L7U5kf1Yf+4Pgsjsyaqf9iIaeuRK25Xtn47AYI="; - }; - - buildInputs = [ - kcmutils - kdecoration - kirigami2 - ]; - - nativeBuildInputs = [ - cmake - ninja - extra-cmake-modules - wrapQtAppsHook - ]; - - meta = with lib; { - description = "a highly customizable binary Window Decoration and Application Style plugin"; - longDescription = '' - Klassy is a highly customizable binary Window Decoration and Application - Style plugin for recent versions of the KDE Plasma desktop. It provides - the Klassy, Kite, Oxygen/Breeze, and Redmond icon styles. - ''; - homepage = "https://github.com/paulmcauley/klassy"; - platforms = platforms.linux; - maintainers = with maintainers; [getchoo]; - }; -} diff --git a/pkgs/klassy/default.nix b/pkgs/klassy/default.nix new file mode 100644 index 0000000..b5a5c0f --- /dev/null +++ b/pkgs/klassy/default.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + extra-cmake-modules, + kcmutils, + kdecoration, + kirigami2, + wrapQtAppsHook, +}: +stdenv.mkDerivation rec { + name = "klassy"; + version = "4.3.breeze5.27.5"; + + src = fetchFromGitHub { + owner = "paulmcauley"; + repo = "klassy"; + rev = version; + hash = "sha256-2qs30L7U5kf1Yf+4Pgsjsyaqf9iIaeuRK25Xtn47AYI="; + }; + + buildInputs = [ + kcmutils + kdecoration + kirigami2 + ]; + + nativeBuildInputs = [ + cmake + ninja + extra-cmake-modules + wrapQtAppsHook + ]; + + meta = with lib; { + description = "a highly customizable binary Window Decoration and Application Style plugin"; + longDescription = '' + Klassy is a highly customizable binary Window Decoration and Application + Style plugin for recent versions of the KDE Plasma desktop. It provides + the Klassy, Kite, Oxygen/Breeze, and Redmond icon styles. + ''; + homepage = "https://github.com/paulmcauley/klassy"; + platforms = platforms.linux; + maintainers = with maintainers; [getchoo]; + }; +} diff --git a/pkgs/mommy.nix b/pkgs/mommy.nix deleted file mode 100644 index c8938e9..0000000 --- a/pkgs/mommy.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - gnumake, - man-db, - shellspec, - ... -}: let - inherit (lib) licenses maintainers platforms; -in - stdenvNoCC.mkDerivation rec { - pname = "mommy"; - version = "1.2.4"; - - src = fetchFromGitHub { - owner = "FWDekker"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; - }; - - checkInputs = [man-db shellspec]; - nativeBuildInputs = [gnumake]; - - checkPhase = '' - make test/unit - ''; - - installPhase = '' - make prefix=$out install - ''; - - meta = { - description = "mommy's here to support you, in any shell, on any system~"; - longDescription = '' - mommy's here to support you! mommy will compliment you if things go well, - and will encourage you if things are not going so well~ - ''; - homepage = "https://github.com/FWDekker/mommy"; - license = licenses.unlicense; - maintainers = [maintainers.getchoo]; - platforms = with platforms; linux ++ darwin; - }; - } diff --git a/pkgs/mommy/default.nix b/pkgs/mommy/default.nix new file mode 100644 index 0000000..c8938e9 --- /dev/null +++ b/pkgs/mommy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gnumake, + man-db, + shellspec, + ... +}: let + inherit (lib) licenses maintainers platforms; +in + stdenvNoCC.mkDerivation rec { + pname = "mommy"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "FWDekker"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SqWhbhQeRUO0cD9Fv/nwKjTI3F0Sg2VhFZtrbyA9Wb4="; + }; + + checkInputs = [man-db shellspec]; + nativeBuildInputs = [gnumake]; + + checkPhase = '' + make test/unit + ''; + + installPhase = '' + make prefix=$out install + ''; + + meta = { + description = "mommy's here to support you, in any shell, on any system~"; + longDescription = '' + mommy's here to support you! mommy will compliment you if things go well, + and will encourage you if things are not going so well~ + ''; + homepage = "https://github.com/FWDekker/mommy"; + license = licenses.unlicense; + maintainers = [maintainers.getchoo]; + platforms = with platforms; linux ++ darwin; + }; + } diff --git a/pkgs/nixgc.nix b/pkgs/nixgc.nix deleted file mode 100644 index d13614a..0000000 --- a/pkgs/nixgc.nix +++ /dev/null @@ -1,22 +0,0 @@ -# this is a shell script that uses the new nix cli to emulate -# nix-collect-garbage -{ - lib, - writeShellApplication, - nix, - fd, -}: -writeShellApplication { - name = "nixgc"; - - runtimeInputs = [nix fd]; - - text = '' - fd . /nix/var/nix/profiles /home/*/.local/state/nix/profiles -d 3 -t symlink -E '*-link' | while read -r profile; do - nix profile wipe-history --profile "$profile" "$@" - done - ''; -} -// { - meta.platforms = lib.platforms.linux; -} diff --git a/pkgs/nixgc/default.nix b/pkgs/nixgc/default.nix new file mode 100644 index 0000000..d13614a --- /dev/null +++ b/pkgs/nixgc/default.nix @@ -0,0 +1,22 @@ +# this is a shell script that uses the new nix cli to emulate +# nix-collect-garbage +{ + lib, + writeShellApplication, + nix, + fd, +}: +writeShellApplication { + name = "nixgc"; + + runtimeInputs = [nix fd]; + + text = '' + fd . /nix/var/nix/profiles /home/*/.local/state/nix/profiles -d 3 -t symlink -E '*-link' | while read -r profile; do + nix profile wipe-history --profile "$profile" "$@" + done + ''; +} +// { + meta.platforms = lib.platforms.linux; +} diff --git a/pkgs/treefetch.nix b/pkgs/treefetch.nix deleted file mode 100644 index dd8283a..0000000 --- a/pkgs/treefetch.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: -rustPlatform.buildRustPackage { - pname = "treefetch"; - version = "unstable-2022-06-08"; - - src = fetchFromGitHub { - owner = "angelofallars"; - repo = "treefetch"; - rev = "02f65e11e1f23d5fa9e66335eb5ff4f2f6b01400"; - sha256 = "sha256-FDiulTit492KwV46A3qwjHQwzpjVJvIXTfTrMufXd5k="; - }; - - cargoSha256 = "sha256-8HJYYPBogkgEfK3kv8dFUFaqUhvgYAOrhUIyZo3bqp8="; - - meta = with lib; { - description = "A plant-based system fetch tool made with Rust."; - longDescription = "A comfy and fast system fetch tool made in Rust. Tested to be much faster than neofetch and pfetch."; - homepage = "https://github.com/angelofallars/treefetch"; - license = licenses.gpl3; - maintainers = with maintainers; [getchoo]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/treefetch/default.nix b/pkgs/treefetch/default.nix new file mode 100644 index 0000000..dd8283a --- /dev/null +++ b/pkgs/treefetch/default.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: +rustPlatform.buildRustPackage { + pname = "treefetch"; + version = "unstable-2022-06-08"; + + src = fetchFromGitHub { + owner = "angelofallars"; + repo = "treefetch"; + rev = "02f65e11e1f23d5fa9e66335eb5ff4f2f6b01400"; + sha256 = "sha256-FDiulTit492KwV46A3qwjHQwzpjVJvIXTfTrMufXd5k="; + }; + + cargoSha256 = "sha256-8HJYYPBogkgEfK3kv8dFUFaqUhvgYAOrhUIyZo3bqp8="; + + meta = with lib; { + description = "A plant-based system fetch tool made with Rust."; + longDescription = "A comfy and fast system fetch tool made in Rust. Tested to be much faster than neofetch and pfetch."; + homepage = "https://github.com/angelofallars/treefetch"; + license = licenses.gpl3; + maintainers = with maintainers; [getchoo]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/vim-just.nix b/pkgs/vim-just.nix deleted file mode 100644 index eafa434..0000000 --- a/pkgs/vim-just.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - fetchFromGitHub, - vimUtils, -}: -vimUtils.buildVimPlugin { - pname = "vim-just"; - version = "unstable-2023-08-02"; - - src = fetchFromGitHub { - owner = "NoahTheDuke"; - repo = "vim-just"; - rev = "927b41825b9cd07a40fc15b4c68635c4b36fa923"; - sha256 = "sha256-BmxYWUVBzTowH68eWNrQKV1fNN9d1hRuCnXqbEagRoY="; - }; -} diff --git a/pkgs/vim-just/default.nix b/pkgs/vim-just/default.nix new file mode 100644 index 0000000..eafa434 --- /dev/null +++ b/pkgs/vim-just/default.nix @@ -0,0 +1,15 @@ +{ + fetchFromGitHub, + vimUtils, +}: +vimUtils.buildVimPlugin { + pname = "vim-just"; + version = "unstable-2023-08-02"; + + src = fetchFromGitHub { + owner = "NoahTheDuke"; + repo = "vim-just"; + rev = "927b41825b9cd07a40fc15b4c68635c4b36fa923"; + sha256 = "sha256-BmxYWUVBzTowH68eWNrQKV1fNN9d1hRuCnXqbEagRoY="; + }; +} diff --git a/pkgs/xwaylandvideobridge.nix b/pkgs/xwaylandvideobridge.nix deleted file mode 100644 index 3c1fef9..0000000 --- a/pkgs/xwaylandvideobridge.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - cmake, - extra-cmake-modules, - fetchFromGitLab, - libsForQt5, - ninja, - pkg-config, - stdenv, - xorg, -}: -stdenv.mkDerivation rec { - pname = "xwaylandvideobridge"; - version = "unstable-2023-09-11"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "system"; - repo = pname; - rev = "b9e0c53570f55f4e8289f72ba78f3945e27e1a1a"; - sha256 = "sha256-tnWfpx/6aABe0VdIjOtx3oDL8C4uQo0yTd6VbAQT7/o="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ninja - libsForQt5.qt5.wrapQtAppsHook - pkg-config - ]; - - buildInputs = with libsForQt5; [ - kcoreaddons - kdbusaddons - ki18n - knotifications - kpipewire - kwidgetsaddons - kwindowsystem - qt5.qtquickcontrols2 - qt5.qtx11extras - xorg.libxcb - ]; - - meta = with lib; { - description = "Utility to allow streaming Wayland windows to X applications"; - homepage = "https://invent.kde.org/system/xwaylandvideobridge"; - license = licenses.gpl2Plus; - maintainer = [maintainers.getchoo]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/xwaylandvideobridge/default.nix b/pkgs/xwaylandvideobridge/default.nix new file mode 100644 index 0000000..3c1fef9 --- /dev/null +++ b/pkgs/xwaylandvideobridge/default.nix @@ -0,0 +1,52 @@ +{ + lib, + cmake, + extra-cmake-modules, + fetchFromGitLab, + libsForQt5, + ninja, + pkg-config, + stdenv, + xorg, +}: +stdenv.mkDerivation rec { + pname = "xwaylandvideobridge"; + version = "unstable-2023-09-11"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "system"; + repo = pname; + rev = "b9e0c53570f55f4e8289f72ba78f3945e27e1a1a"; + sha256 = "sha256-tnWfpx/6aABe0VdIjOtx3oDL8C4uQo0yTd6VbAQT7/o="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ninja + libsForQt5.qt5.wrapQtAppsHook + pkg-config + ]; + + buildInputs = with libsForQt5; [ + kcoreaddons + kdbusaddons + ki18n + knotifications + kpipewire + kwidgetsaddons + kwindowsystem + qt5.qtquickcontrols2 + qt5.qtx11extras + xorg.libxcb + ]; + + meta = with lib; { + description = "Utility to allow streaming Wayland windows to X applications"; + homepage = "https://invent.kde.org/system/xwaylandvideobridge"; + license = licenses.gpl2Plus; + maintainer = [maintainers.getchoo]; + platforms = platforms.linux; + }; +} -- cgit v1.2.3