Merge remote-tracking branch 'enklave/master'

12 files changed, 0 insertions, 415 deletions

diff --git a/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix
deleted file mode 100644
index 05815e132..000000000
--- a/jeschli/2configs/own-pkgs/audio-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "audio-fingerprint-defender-${version}";
-    version = "0.1.3";
-
-    extid = "@audio-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3363623/audiocontext_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "0yfk5vqwjg4g25c98psj56sw3kv8imxav3nss4hbibflgla1h5pb";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Audio context fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/audiocontext-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix
deleted file mode 100644
index 21b4b3f97..000000000
--- a/jeschli/2configs/own-pkgs/canvas-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "canvas-fingerprint-defender-${version}";
-    version = "0.1.5";
-
-    extid = "@canvas-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362272/canvas_fingerprint_defender-${version}-an+fx.xpi?src=recommended";
-      sha256 = "1hg00zsrw7ij7bc222j83g2wm3ml1aj34zg5im1802cjq4qqvbld";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Canvas fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/webgl-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/dark-reader/default.nix b/jeschli/2configs/own-pkgs/dark-reader/default.nix
deleted file mode 100644
index 44f4f9054..000000000
--- a/jeschli/2configs/own-pkgs/dark-reader/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "dark-reader-${version}";
-    version = "4.8.1";
-
-    extid = "addon@darkreader.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3404143/dark_reader-${version}-an+fx.xpi";
-      sha256 = "0ic0i56jhmxymvy68bs5hqcjvdvw3vks5r58i2ygmpsm190rlldb";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
-    homepage = https://github.com/darkreader/darkreader;
-    license = licenses.mit;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix
deleted file mode 100644
index 26751beef..000000000
--- a/jeschli/2configs/own-pkgs/font-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "font-fingerprint-defender-${version}";
-    version = "0.1.0";
-
-    extid = "@font-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3387637/font_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "1aidkvisnx6qd7hn2x756rvzmbnaz6laqbwq0j5yd86g1kc56dr0";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Font fingerprint defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/font-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/hopper/default.nix b/jeschli/2configs/own-pkgs/hopper/default.nix
deleted file mode 100644
index 569fc6aaf..000000000
--- a/jeschli/2configs/own-pkgs/hopper/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, pkgs, makeWrapper, lib }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname    = "hopper";
-  version = "4.5.16";
-  rev = "v${lib.versions.major version}";
-
-  src = fetchurl {
-    url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
-    sha256 = "0gjnn7f6ibfx46k4bbj8ra7k04s0mrpq7316brgzks6x5yd1m584";
-  };
-
-  sourceRoot = ".";
-
-  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
-libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2.out qt5.qtbase zlib  xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib
-  ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-     mkdir -p $out/bin
-     mkdir -p $out/lib
-     mkdir -p $out/share
-     cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
-     cp -r $sourceRoot/opt/hopper-${rev}/lib $out
-     cp -r $sourceRoot/usr/share $out/share
-    patchelf \
-    --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
-    $out/bin/hopper
-    # Details: https://nixos.wiki/wiki/Qt
-     wrapProgram $out/bin/hopper \
-    --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
-    --suffix QT_PLUGIN_PATH : ${pkgs.qt5.qtbase}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins
-  '';
-
-  meta = {
-    homepage = "https://www.hopperapp.com/index.html";
-    description = "A macOS and Linux Disassembler";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.luis ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/https-everywhere/default.nix b/jeschli/2configs/own-pkgs/https-everywhere/default.nix
deleted file mode 100644
index 66fede43c..000000000
--- a/jeschli/2configs/own-pkgs/https-everywhere/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "https-everywhere-${version}";
-    version = "2019.6.27";
-
-    extid = "https-everywhere@eff.org";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3060290/https_everywhere-${version}-an+fx.xpi";
-      sha256 = "0743lhn9phn7n6c0886h9ddn1n8vhzbl0vrw177zs43995aj3frp";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-
-      '';
-
-  meta = {
-    description = "Https everywhere browser addon";
-    homepage = https://www.eff.org/https-everywhere;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/pyocclient/default.nix b/jeschli/2configs/own-pkgs/pyocclient/default.nix
deleted file mode 100644
index cd91f6171..000000000
--- a/jeschli/2configs/own-pkgs/pyocclient/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, python37Packages  }:
-
-python37Packages.buildPythonPackage rec {
-  pname = "pyocclient";
-  version = "0.4";
-
-  src = python37Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "19k3slrk2idixsdw61in9a3jxglvkigkn5kvwl37lj8hrwr4yq6q";
-  };
-
-  doCheck = false;
-
-  propagatedBuildInputs = with python37Packages; [
-    requests
-    six
-    ];
-
-  meta = with lib; {
-    homepage = https://github.com/owncloud/pyocclient/;
-    description = "Nextcloud / Owncloud library for python";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
-  };
-
-}
diff --git a/jeschli/2configs/own-pkgs/rmount/default.nix b/jeschli/2configs/own-pkgs/rmount/default.nix
deleted file mode 100644
index 22631f420..000000000
--- a/jeschli/2configs/own-pkgs/rmount/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, makeWrapper, lib, pkgs ? import <nixpkgs> {} }:
-with pkgs;
-
-stdenv.mkDerivation rec {
-  name    = "rmount-${version}";
-  version = "1.0.1";
-  rev = "v${version}";
-
-  src = fetchgit {
-    rev = "9df124780d2e66f01c70afaecf92090669c5ffb6";
-    url    = "https://github.com/Luis-Hebendanz/rmount";
-    sha256 = "0ydb6sspfnfa3y6gg1r8sk4r58il6636lpqwb2rw7dzmb4b8hpd2";
-  };
-
-  buildInputs = [ stdenv makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-    cp ${src}/rmount.man $out/share/man/man1/rmount.1
-    cp ${src}/rmount.bash $out/bin/rmount-noenv
-    cp ${src}/config.json $out/share/config.json
-    chmod +x $out/bin/rmount-noenv
-
-    makeWrapper $out/bin/rmount-noenv $out/bin/rmount \
-    --prefix PATH : ${lib.makeBinPath [ nmap jq cifs-utils sshfs ]}
-  '';
-
-  meta = {
-      homepage = "https://github.com/Luis-Hebendanz/rmount";
-      description = "Remote mount utility which parses a json file";
-      license = stdenv.lib.licenses.mit;
-    };
-}
diff --git a/jeschli/2configs/own-pkgs/ublock-origin/default.nix b/jeschli/2configs/own-pkgs/ublock-origin/default.nix
deleted file mode 100644
index 002fa3efc..000000000
--- a/jeschli/2configs/own-pkgs/ublock-origin/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl  }:
-
-stdenv.mkDerivation rec {
-    pname = "ublock-origin-${version}";
-    version = "1.21.2";
-
-    extid = "uBlock0@raymondhill.net";
-    signed = true;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3361355/ublock_origin-${version}-an+fx.xpi";
-      sha256 = "0ypdq3z61mrymknl37qlq6379bx9f2fsgbgr0czbhqs9f2vwszkc";
-    };
-
-    phases = [ "installPhase" ];
-
-    installPhase = ''
-      install -D ${src} "$out/${extid}.xpi"
-      '';
-
-  meta = with stdenv.lib; {
-    description = "ublock origin firefox browser addon";
-    homepage = https://github.com/gorhill/uBlock;
-    license = licenses.gpl3;
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix b/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix
deleted file mode 100644
index c96f11129..000000000
--- a/jeschli/2configs/own-pkgs/user-agent-switcher/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "user-agent-switcher-${version}";
-    version = "0.3.2";
-
-    extid = "@user-agent-switcher";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3370255/user_agent_switcher_and_manager-${version}-an+fx.xpi";
-      sha256 = "0lrw1xf6fsxr47bifkayfxpysv8s2p9ghmbmw2s7ymhrgy42i6v5";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "User agent switcher";
-    homepage = https://add0n.com/useragent-switcher.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix b/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix
deleted file mode 100644
index 4e608d182..000000000
--- a/jeschli/2configs/own-pkgs/webgl-fingerprint-defender/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, unzip, jq, zip  }:
-
-stdenv.mkDerivation rec {
-    pname = "webgl-fingerprint-defender-${version}";
-    version = "0.1.2";
-
-    extid = "@webgl-fingerprint-defender";
-    signed = false;
-
-    src = fetchurl {
-      url = "https://addons.mozilla.org/firefox/downloads/file/3362869/webgl_fingerprint_defender-${version}-an+fx.xpi";
-      sha256 = "06hfr5hxr4qw0jx6i9fi9gdk5211z08brnvqj2jlmpyc3dwl4pif";
-    };
-
-    phases = [ "buildPhase" ];
-
-    buildInputs = [ zip unzip jq ];
-
-    buildPhase = ''
-      mkdir -p $out/${extid}
-      unzip ${src} -d $out/${extid}
-      NEW_MANIFEST=$(jq '. + {"applications": { "gecko": { "id": "${extid}" }}}' $out/${extid}/manifest.json)
-      echo "$NEW_MANIFEST" > $out/${extid}/manifest.json
-      cd $out/${extid}
-      zip -r -FS $out/${extid}.xpi *
-      rm -r $out/${extid}
-      '';
-
-  meta = with stdenv.lib; {
-    description = "Canvas defender firefox browser addon";
-    homepage = https://mybrowseraddon.com/webgl-defender.html;
-    license = {
-      fullName = "Mozilla Public License Version 2.0";
-      shortName = "moz2";
-      spdxId = "mozilla-2.0";
-      url = "https://www.mozilla.org/en-US/MPL/2.0/"; };
-    maintainers = [];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/jeschli/2configs/own-pkgs/wl-clipboard/default.nix b/jeschli/2configs/own-pkgs/wl-clipboard/default.nix
deleted file mode 100644
index 349d910da..000000000
--- a/jeschli/2configs/own-pkgs/wl-clipboard/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, wayland, wayland-protocols }:
-
-stdenv.mkDerivation rec {
-  pname = "wl-clipboard";
-  version = "2.0.0";
-
-  src = fetchFromGitHub {
-    owner = "bugaevc";
-    repo = "wl-clipboard";
-    rev = "v${version}";
-    sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
-  };
-
-  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
-  buildInputs = [ wayland ];
-
-  meta = with stdenv.lib; {
-    description = "Command-line copy/paste utilities for Wayland";
-    homepage = https://github.com/bugaevc/wl-clipboard;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.linux;
-  };
-}