project-wide: Cleanup and services + private overhaul

This commit is contained in:
kat witch 2021-04-28 04:01:11 +01:00
parent 5f2309c773
commit f4b4ab2b28
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
36 changed files with 70 additions and 408 deletions

View file

@ -7,9 +7,9 @@ let
inherit (super) dino;
};
discord = unstable.discord.override { nss = self.nss; };
discord = super.discord.override { nss = self.nss; };
ncmpcpp = unstable.ncmpcpp.override {
ncmpcpp = super.ncmpcpp.override {
visualizerSupport = true;
clockSupport = true;
};
@ -24,11 +24,7 @@ let
pkgs = self;
};
weechatScripts = super.weechatScripts // {
weechat-title = (super.callPackage ./weechat-title { });
};
screenstub = unstable.callPackage ./screenstub { };
screenstub = super.callPackage ./screenstub { };
buildFirefoxXpiAddon = { pname, version, addonId, url, sha256, meta, ... }:
pkgs.stdenv.mkDerivation {
@ -54,7 +50,7 @@ let
kat-vm = super.callPackage ./kat-vm { };
kat-glauca-dns = unstable.callPackage ./kat-glauca-dns { inherit sources; };
kat-glauca-dns = super.callPackage ./kat-glauca-dns { };
kat-website = super.callPackage ./kat-website { };
@ -65,12 +61,6 @@ let
kat-tw-export = super.callPackage ./kat-tw-export { };
kat-scrot = super.callPackage ./kat-scrot { };
linuxPackagesFor = kernel:
(super.linuxPackagesFor kernel).extend (_: ksuper: {
vendor-reset =
(super.callPackage ./vendor-reset { kernel = ksuper.kernel; }).out;
});
};
in (pkgs.extend (import (sources.arc-nixexprs + "/overlay.nix"))).extend overlay

View file

@ -1,7 +1,6 @@
{ sources, pkgs, curl, coreutils, writeShellScriptBin }:
{ pkgs, curl, coreutils, writeShellScriptBin }:
let rbw-bitw = (import sources.arc-nixexprs { inherit pkgs; }).pkgs.rbw-bitw;
in writeShellScriptBin "kat-glauca-dns" ''
writeShellScriptBin "kat-glauca-dns" ''
#!/usr/bin/env bash
set -eu

View file

@ -1,21 +0,0 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "title.py";
version = "2011-11-15";
sha256 = "1h8mxpv47q3inhynlfjm3pdjxlr2fl06z4cdhr06kpm8f7xvz56p";
src = fetchurl {
name = pname;
url = "https://weechat.org/files/scripts/title.py";
sha256 = sha256;
};
unpackPhase = "true";
installPhase = ''
install -D $src $out/share/title.py
'';
passthru.scripts = [ pname ];
}