From f60c797b092f1b41c00ea66024ffce3927d69ac2 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sun, 26 Dec 2021 02:20:55 +0800 Subject: [PATCH] repo: cleanup part 2 --- derivations/spotify-adblock.nix | 29 ----- derivations/spotify-wrapped.nix | 5 - derivations/taiwins.nix | 64 ---------- derivations/wip/ncmpcpp-artwork.nix | 57 --------- derivations/wip/neovide.nix | 30 ----- derivations/wip/spotify-adblock.nix | 29 ----- derivations/wip/wdpass.nix | 24 ---- overlays/2bwm.nix | 14 --- overlays/disabled/discord-canary.nix | 37 ------ overlays/disabled/iosevka.nix | 48 -------- overlays/patches/twobwm_autostart.patch | 124 -------------------- overlays/patches/twobwm_optimizations.patch | 13 -- overlays/polybar.nix | 12 -- 13 files changed, 486 deletions(-) delete mode 100644 derivations/spotify-adblock.nix delete mode 100644 derivations/spotify-wrapped.nix delete mode 100644 derivations/taiwins.nix delete mode 100644 derivations/wip/ncmpcpp-artwork.nix delete mode 100644 derivations/wip/neovide.nix delete mode 100644 derivations/wip/spotify-adblock.nix delete mode 100644 derivations/wip/wdpass.nix delete mode 100644 overlays/2bwm.nix delete mode 100644 overlays/disabled/discord-canary.nix delete mode 100644 overlays/disabled/iosevka.nix delete mode 100644 overlays/patches/twobwm_autostart.patch delete mode 100644 overlays/patches/twobwm_optimizations.patch delete mode 100644 overlays/polybar.nix diff --git a/derivations/spotify-adblock.nix b/derivations/spotify-adblock.nix deleted file mode 100644 index 3ec8a6e..0000000 --- a/derivations/spotify-adblock.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl }: - -let - version = "1.4"; -in -fetchurl rec { - name = "spotify-adblock-${version}"; - - url = "https://github.com/abba23/spotify-adblock-linux/releases/download/v${version}/spotify-adblock.so"; - - sha256 = "sha256-MOjQGCaBQcXT/x9m7tO0oBjtpEumHaypGAX/wFt+H/w="; - - downloadToTemp = true; - - recursiveHash = true; - - postFetch = '' - mkdir -p $out/lib - mv $downloadedFile $out/lib/spotify-adblock.so - ''; - - meta = with lib; { - homepage = "https://github.com/abba23/spotify-adblock-linux"; - description = "Spotify adblocker for linux"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; - }; -} diff --git a/derivations/spotify-wrapped.nix b/derivations/spotify-wrapped.nix deleted file mode 100644 index 6794970..0000000 --- a/derivations/spotify-wrapped.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, writeShellScriptBin, spotify, spotify-adblock }: - -writeShellScriptBin "spotify-wrapped" '' - LD_PRELOAD=${spotify-adblock}/lib/spotify-adblock.so ${spotify}/bin/spotify -'' diff --git a/derivations/taiwins.nix b/derivations/taiwins.nix deleted file mode 100644 index 0ce3694..0000000 --- a/derivations/taiwins.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, meson -, ninja -, pkg-config -, wayland -, cairo -, dbus -, fontconfig -, freetype -, libdrm -, libinput -, libGL -, libGLU -, librsvg -, libX11 -, libxcb -, libxkbcommon -, linux-pam -, lua5_3 -, mesa -, wayland-protocols -, xwayland -, pam -, pixman -}: - -stdenv.mkDerivation rec { - pname = "taiwins"; - version = "unstable-2021-06-07"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "6b669f8770fefb1da5114471b02c54e3dcb69539"; - sha256 = "sha256-ANzQkKEf2/tBuMBl10WWlMGIwa84C+GR8mihqqpLbO4="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ meson ninja pkg-config lua5_3 wayland ]; - - buildInputs = [ - cairo - dbus - fontconfig - freetype - libdrm - libinput - libGL - libGLU - librsvg - libX11 - libxcb - libxkbcommon - linux-pam - lua5_3 - mesa - wayland-protocols - xwayland - pam - pixman - ]; -} diff --git a/derivations/wip/ncmpcpp-artwork.nix b/derivations/wip/ncmpcpp-artwork.nix deleted file mode 100644 index 157170d..0000000 --- a/derivations/wip/ncmpcpp-artwork.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkgs }: - -stdenv.mkDerivation rec { - name = "ncmpcpp-artwork"; - - src = fetchFromGitHub { - owner = "evanc577"; - repo = "ncmpcpp"; - rev = "artwork-mpd"; - sha256 = "sha256-qyJsDLUCe7epVXWmqkZH/UOCafWdp6zuoMDRYyfyQ6Q="; - }; - - configureFlags = [ - "BOOST_LIB_SUFFIX=" - "--enable-outputs" - "--enable-visualizer" - "--with-fftw" - "--with-taglib" - "--enable-artwork" - ]; - - nativeBuildInputs = with pkgs; [ - autoconf - automake - libtool - pkg-config - ]; - - buildInputs = with pkgs; [ - boost - mpd_clientlib - ncurses - readline - libiconv - icu - curl - fftw - taglib - ueberzug - ]; - - preBuild = '' - ./autogen.sh - ./configure - ''; - - installFlags = [ "DESTDIR=$(out)" "PREFIX=/bin" ]; - - meta = with lib; { - description = "A featureful ncurses based MPD client inspired by ncmpc (with artwork support)"; - homepage = "https://rybczak.net/ncmpcpp/"; - changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fortuneteller2k ]; - platforms = platforms.all; - }; -} diff --git a/derivations/wip/neovide.nix b/derivations/wip/neovide.nix deleted file mode 100644 index 7b9429f..0000000 --- a/derivations/wip/neovide.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, cmake, curl, expat, freetype, openssl, pkg-config }: - -rustPlatform.buildRustPackage rec { - pname = "neovide"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "Kethku"; - repo = pname; - rev = version; - sha256 = "sha256-NajO3mPPmdgQbYwS8wXKpLJVXsZ8gG71SQdWB4CGVPY="; - }; - - nativeBuildInputs = [ cmake pkg-config curl ]; - - buildInputs = [ - openssl - expat - freetype - ]; - - cargoSha256 = "sha256-NQrslwqacXIx4jZRs6kAX2gkUyhrMZo+jFLr6z3Aj/Y="; - - meta = with lib; { - description = "No Nonsense Neovim Client in Rust"; - homepage = "https://github.com/Kethku/neovide"; - maintainers = with maintainers; [ fortuneteller2k ]; - license = licenses.mit; - }; -} diff --git a/derivations/wip/spotify-adblock.nix b/derivations/wip/spotify-adblock.nix deleted file mode 100644 index f21c98e..0000000 --- a/derivations/wip/spotify-adblock.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchurl }: - -let - version = "1.0.0"; -in -fetchurl rec { - name = "spotify-adblock-${version}"; - - url = "https://github.com/abba23/spotify-adblock-linux/releases/download/v${version}/spotify-adblock.so"; - - sha256 = "sha256-MOjQGCaBQcXT/x9m7tO0oBjtpEumHaypGAX/wFt+H/w="; - - downloadToTemp = true; - - recursiveHash = true; - - postFetch = '' - mkdir -p $out/lib - mv $downloadedFile $out/lib/spotify-adblock.so - ''; - - meta = with lib; { - homepage = "https://github.com/abba23/spotify-adblock"; - description = "Spotify adblocker for linux"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; - }; -} diff --git a/derivations/wip/wdpass.nix b/derivations/wip/wdpass.nix deleted file mode 100644 index f9c981c..0000000 --- a/derivations/wip/wdpass.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, python38Packages, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "wdpass"; - version = "0.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = lib.fakeSha256; - }; - - doCheck = false; - - propagatedBuildInputs = with python38Packages; [ - - ]; - - meta = with lib; { - description = "WD Passport Ultra Linux Utilities (using Python 3)"; - homepage = "https://github.com/7aman/wdpass"; - license = license.mit; - maintainers = with maintainers; [ fortuneteller2k ]; - }; -} diff --git a/overlays/2bwm.nix b/overlays/2bwm.nix deleted file mode 100644 index 4559c0b..0000000 --- a/overlays/2bwm.nix +++ /dev/null @@ -1,14 +0,0 @@ -final: prev: { - _2bwm = prev._2bwm.overrideAttrs (old: { - src = prev.twobwm-src; - - # libX11 is a dependency of twobwm_config.patch - buildInputs = (old.buildInputs or [ ]) ++ [ prev.xorg.libX11 ]; - - patches = [ - ./patches/twobwm_autostart.patch - ./patches/twobwm_config.patch - ./patches/twobwm_optimizations.patch - ]; - }); -} diff --git a/overlays/disabled/discord-canary.nix b/overlays/disabled/discord-canary.nix deleted file mode 100644 index df439f1..0000000 --- a/overlays/disabled/discord-canary.nix +++ /dev/null @@ -1,37 +0,0 @@ -final: prev: { - discord-canary = prev.discord-canary.overrideAttrs (old: rec { - powercord = prev.stdenv.mkDerivation rec { - pname = "powercord"; - version = "v2"; - - src = prev.fetchFromGitHub { - owner = "powercord-org"; - repo = pname; - rev = version; - sha256 = "sha256-kFf3U7BJAOrRTHemxAqVfFnLxXZqMQYd+IRxPoVNgvQ="; - }; - - nativeBuildInputs = with prev; [ discord-canary nodePackages.npm ]; - - buildPhase = - "${prev.nodePackages.npm}/bin/npm i"; # FIXME: do I disable nix.useSandbox? - - installPhase = - "substituteInPlace injectors/linux.js --replace /opt/DiscordCanary ${prev.discord-canary}/opt/DiscordCanary"; - - meta = with prev.lib; { - description = - "A lightweight Discord client mod focused on simplicity and performance"; - homepage = "https://powercord.dev"; - licenses = licenses.mit; - maintainers = with maintainers; [ fortuneteller2k ]; - }; - }; - - buildInputs = (old.buildInputs or [ ]) ++ [ prev.nodePackages.npm ]; - installPhase = old.installPhase + '' - cd ${powercord} - ${prev.nodePackages.npm}/bin/npm run plug - ''; - }); -} diff --git a/overlays/disabled/iosevka.nix b/overlays/disabled/iosevka.nix deleted file mode 100644 index 15b1b33..0000000 --- a/overlays/disabled/iosevka.nix +++ /dev/null @@ -1,48 +0,0 @@ -final: prev: { - iosevka-ft = prev.iosevka.override { - privateBuildPlan = '' - [buildPlans.iosevka-ft] - family = "Iosevka FT" - spacing = "fontconfig-mono" - serifs = "sans" - no-cv-ss = false - export-glyph-names = true - - [buildPlans.iosevka-ft.variants] - inherits = "ss14" - - [buildPlans.iosevka-ft.variants.design] - capital-r = "curly" - g = "single-storey-serifless" - k = "curly-serifless" - q = "earless-corner" - y = "cursive" - lower-alpha = "crossing" - lower-lambda = "straight-turn" - cyrl-ka = "curly-serifless" - cyrl-capital-u = "cursive" - three = "twoarcs" - four = "closed" - six = "closed-contour" - seven = "straight-serifless" - eight = "crossing-asymmetric" - nine = "closed-contour" - underscore = "above-baseline" - caret = "high" - paren = "normal" - at = "fourfold" - ascii-single-quote = "raised-comma" - ascii-grave = "raised-turn-comma" - question = "smooth" - - [buildPlans.iosevka-ft.variants.italic] - a = "double-storey-serifless" - f = "serifless" - - [buildPlans.iosevka-ft.ligations] - inherits = "dlig" - ''; - - set = "ft"; - }; -} diff --git a/overlays/patches/twobwm_autostart.patch b/overlays/patches/twobwm_autostart.patch deleted file mode 100644 index 2b50f18..0000000 --- a/overlays/patches/twobwm_autostart.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/2bwm.c b/2bwm.c -index 28f05ad..ffb4c7b 100644 ---- a/2bwm.c -+++ b/2bwm.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -57,6 +58,7 @@ static const char *atomnames[NB_ATOMS][1] = { - xcb_atom_t ATOM[NB_ATOMS]; - ///---Functions prototypes---/// - static void run(void); -+static void runautostart(void); - static bool setup(int); - static void install_sig_handlers(void); - static void start(const Arg *); -@@ -156,6 +158,10 @@ static void getmonsize(int8_t, int16_t *, int16_t *, uint16_t *, uint16_t *,cons - static void noborder(int16_t *,struct client *, bool); - static void movepointerback(const int16_t, const int16_t, const struct client *); - static void snapwindow(struct client *); -+static const char autostartblocksh[] = "autostart_blocking.sh"; -+static const char autostartsh[] = "autostart.sh"; -+static const char twobwmdir[] = "2bwm"; -+static const char localshare[] = ".local/share"; - #include "config.h" - - ///---Function bodies---/// -@@ -3105,6 +3111,83 @@ run(void) - } - } - -+void -+runautostart(void) -+{ -+ char *pathpfx; -+ char *path; -+ char *xdgdatahome; -+ char *home; -+ struct stat sb; -+ -+ /* highly unlikely that this will happen */ -+ if ((home = getenv("HOME")) == NULL) -+ return; -+ -+ /* if $XDG_DATA_HOME is set and not empty, use $XDG_DATA_HOME/2bwm, -+ * otherwise use ~/.local/share/2bwm as autostart script directory -+ */ -+ xdgdatahome = getenv("XDG_DATA_HOME"); -+ if (xdgdatahome != NULL && *xdgdatahome != '\0') { -+ /* space for path segments, separators and nul */ -+ pathpfx = calloc(1, strlen(xdgdatahome) + strlen(twobwmdir) + 2); -+ -+ if (sprintf(pathpfx, "%s/%s", xdgdatahome, twobwmdir) <= 0) { -+ free(pathpfx); -+ return; -+ } -+ } else { -+ /* space for path segments, separators and nul */ -+ pathpfx = calloc(1, strlen(home) + strlen(localshare) -+ + strlen(twobwmdir) + 3); -+ -+ if (sprintf(pathpfx, "%s/%s/%s", home, localshare, twobwmdir) < 0) { -+ free(pathpfx); -+ return; -+ } -+ } -+ -+ /* check if the autostart script directory exists */ -+ if (! (stat(pathpfx, &sb) == 0 && S_ISDIR(sb.st_mode))) { -+ /* the XDG conformant path does not exist or is no directory -+ * so we try ~/.2bwm instead -+ */ -+ char *pathpfx_new = realloc(pathpfx, strlen(home) + strlen(twobwmdir) + 3); -+ if(pathpfx_new == NULL) { -+ free(pathpfx); -+ return; -+ } -+ pathpfx = pathpfx_new; -+ -+ if (sprintf(pathpfx, "%s/.%s", home, twobwmdir) <= 0) { -+ free(pathpfx); -+ return; -+ } -+ } -+ -+ /* try the blocking script first */ -+ path = calloc(1, strlen(pathpfx) + strlen(autostartblocksh) + 2); -+ if (sprintf(path, "%s/%s", pathpfx, autostartblocksh) <= 0) { -+ free(path); -+ free(pathpfx); -+ } -+ -+ if (access(path, X_OK) == 0) -+ system(path); -+ -+ /* now the non-blocking script */ -+ if (sprintf(path, "%s/%s", pathpfx, autostartsh) <= 0) { -+ free(path); -+ free(pathpfx); -+ } -+ -+ if (access(path, X_OK) == 0) -+ system(strcat(path, " &")); -+ -+ free(pathpfx); -+ free(path); -+} -+ - /* Get a defined atom from the X server. */ - xcb_atom_t - getatom(const char *atom_name) -@@ -3310,6 +3393,8 @@ setup(int scrno) - events[XCB_BUTTON_PRESS] = buttonpress; - events[XCB_CLIENT_MESSAGE] = clientmessage; - -+ runautostart(); -+ - return true; - } - diff --git a/overlays/patches/twobwm_optimizations.patch b/overlays/patches/twobwm_optimizations.patch deleted file mode 100644 index bc962ad..0000000 --- a/overlays/patches/twobwm_optimizations.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index a060092..24c9a45 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,7 @@ X11_INCLUDE?=/usr/local/include - DIST=2bwm-$(VERSION) - SRC=2bwm.c list.h hidden.c config.h - DISTFILES=Makefile README.md TODO 2bwm.man $(SRC) --CFLAGS+=-Os -s -I${X11_INCLUDE} -I/usr/X11R6/include \ -+CFLAGS+=-O3 -flto -s -I${X11_INCLUDE} -I/usr/X11R6/include \ - -DTWOBWM_PATH=\"${TWOBWM_PATH}\" - - LDFLAGS+=-L${PREFIX}/${LIB_SUFFIX} -L/usr/X11R6/lib -lX11 -lxcb -lxcb-randr \ diff --git a/overlays/polybar.nix b/overlays/polybar.nix deleted file mode 100644 index 64249f6..0000000 --- a/overlays/polybar.nix +++ /dev/null @@ -1,12 +0,0 @@ -final: prev: { - polybar = prev.polybar.override { - i3Support = false; - i3GapsSupport = false; - alsaSupport = false; - iwSupport = false; - githubSupport = false; - mpdSupport = true; - nlSupport = true; - pulseSupport = true; - }; -}