1
0
mirror of https://github.com/kmein/niveum synced 2026-03-19 03:21:10 +01:00

fix(packages): move to overlays

This commit is contained in:
Kierán Meinhardt
2019-11-09 16:33:59 +01:00
parent e296de9ed1
commit d6dd9f82c4
25 changed files with 55 additions and 93 deletions

View File

@@ -1,14 +0,0 @@
{ mkDerivation, base, fetchgit, hspec, QuickCheck, stdenv, text }:
mkDerivation {
pname = "blessings";
version = "2.2.0";
src = fetchgit {
url = "https://cgit.krebsco.de/blessings";
sha256 = "1pb56dgf3jj2kq3cbbppwzyg3ccgqy9xara62hkjwyxzdx20clk1";
rev = "d94712a015636efe7ec79bc0a2eec6739d0be779";
fetchSubmodules = true;
};
libraryHaskellDepends = [ base text ];
testHaskellDepends = [ base hspec QuickCheck ];
license = stdenv.lib.licenses.mit;
}

View File

@@ -1,26 +0,0 @@
{ writeShellScriptBin, font }:
writeShellScriptBin "font-size" ''
set -efu
# set_font NORMAL_FONT BOLD_FONT
set_font() {
printf '\033]710;%s\007' "$1"
printf '\033]711;%s\007' "$2"
}
case ''${1-} in
'''|0|--reset)
set_font \
"xft:${font.name}:size=${toString font.size}" \
"xft:${font.name}:size=${toString font.size}:bold" \
;;
[2-9]|[1-9][0-9]|[1-9][0-9][0-9])
set_font \
"xft:${font.name}:size=$1" \
"xft:${font.name}:size=$1:bold" \
;;
*)
echo "$0: bad argument: $1" >&2
exit 1
esac
''

View File

@@ -1,12 +1,12 @@
{ write, lib, fzf, writers, findutils, procps, gnused, gawk, ripgrep }:
{ lib, fzf, writers, findutils, procps, gnused, gawk, ripgrep, symlinkJoin }:
let
wrappers.fe = writers.writeBash "fe" ''
wrappers.fe = writers.writeBashBin "fe" ''
export PATH=$PATH:${fzf}/bin
IFS=$'\n' files=($(fzf-tmux --query="$1" --multi --select-1 --exit-0))
[[ -n "$files" ]] && ''${EDITOR:-vim} "''${files[@]}"
'';
wrappers.fkill = writers.writeDash "fkill" ''
wrappers.fkill = writers.writeDashBin "fkill" ''
export PATH=$PATH:${procps}/bin:${gawk}/bin:${gnused}/bin:${fzf}/bin:${findutils}/bin
if [ "$UID" != "0" ]; then
@@ -20,7 +20,7 @@ let
echo $pid | xargs kill -''${1:-9}
fi
'';
wrappers.vg = writers.writeBash "vg" ''
wrappers.vg = writers.writeBashBin "vg" ''
export PATH=$PATH:${ripgrep}/bin:${fzf}/bin:${gawk}/bin
file="$(rg "$@" | fzf -0 -1 | awk -F: '{print $1}')"
@@ -30,4 +30,7 @@ let
''${EDITOR:-vim} "$file"
fi
'';
in write "fzf-wrappers" (lib.mapAttrs' (name: link: lib.nameValuePair "/bin/${name}" {inherit link;}) wrappers)
in symlinkJoin {
name = "fzf-wrappers";
paths = lib.attrVals wrappers;
}

View File

@@ -5,19 +5,24 @@ let
url = "http://www.greekfontsociety-gfs.gr/_assets/fonts/${name}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile "**/*otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "*.otf" -d $out/share/fonts/opentype
unzip -j $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
'';
};
in symlinkJoin {
name = "gfs-fonts";
paths = lib.mapAttrsToList gfs-font {
GFS_Artemisia = "1q39086pr2jhv118fjfv6l1li6japv4pdjnhh1scqw06mqrmydf4";
GFS_Baskerville = "07gx5b9b43zv74d2lay37sajd4ba2wqn3b7xzvyhn265ds9x7cxk";
GFS_Bodoni = "0jhl0728ikzha1krm01sk52nz3jzibidwmyvgidg61d87l8nbf2p";
GFS_Bodoni_Classic = "06jw2irskn75s50mgwkx08rzwqi82gpc6lgjsimsi8p81566gfrh";
GFS_Complutum = "1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl";
GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm";
GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c";
GFS_Didot_Display = "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2";
GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w";
GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9";
GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3";
GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d";

View File

@@ -0,0 +1,34 @@
{ pkgs, ... }:
{
autorenkalender = pkgs.callPackage ./autorenkalender.nix {};
bvg = pkgs.callPackage ./bvg.nix {};
daybook = pkgs.callPackage ./daybook.nix {};
depp = pkgs.callPackage ./depp.nix {};
dirmir = pkgs.callPackage ./dirmir.nix {};
favicon = pkgs.callPackage ./favicon.nix {};
genius = pkgs.callPackage ./genius.nix {};
instaget = pkgs.callPackage ./instaget.nix {};
literature-quote = pkgs.callPackage ./literature-quote.nix {};
man-pdf = pkgs.callPackage ./man-pdf.nix {};
n = pkgs.callPackage ./n.nix {};
nav = pkgs.callPackage ./nav.nix {};
odyssey = pkgs.callPackage ./odyssey.nix {};
tolino-screensaver = pkgs.callPackage ./tolino-screensaver.nix {};
wttr = pkgs.callPackage ./wttr.nix {};
slide =
let slide-package = pkgs.fetchFromGitHub {
owner = "kmein";
repo = "slide";
rev = "0470583d22212745eab4f46076267addf4d2346c";
sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh";
};
in pkgs.callPackage slide-package {};
mnemosyne =
let mnemosyne-package = pkgs.fetchFromGitHub {
repo = "mnemosyne";
owner = "kmein";
rev = "6bfa13c88db176af80be90840ff03573d67d679f";
sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca";
};
in pkgs.haskellPackages.callPackage mnemosyne-package {};
}