1
0
mirror of https://github.com/kmein/niveum synced 2026-03-18 11:01:07 +01:00

chore: nixfmt

This commit is contained in:
Kierán Meinhardt
2020-06-10 17:37:25 +02:00
parent 2c3957735b
commit d8a4d4eedf
90 changed files with 1461 additions and 985 deletions

View File

@@ -1,14 +1,15 @@
{ fetchzip, symlinkJoin, lib, scardanelli ? false }:
let
gfs-font = name: sha256: fetchzip {
inherit name sha256;
url = "http://www.greekfontsociety-gfs.gr/_assets/fonts/${name}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j -o $downloadedFile "*.otf" -d $out/share/fonts/opentype
unzip -j -o $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
'';
};
gfs-font = name: sha256:
fetchzip {
inherit name sha256;
url = "http://www.greekfontsociety-gfs.gr/_assets/fonts/${name}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j -o $downloadedFile "*.otf" -d $out/share/fonts/opentype
unzip -j -o $downloadedFile "**/*.otf" -d $out/share/fonts/opentype
'';
};
in symlinkJoin {
name = "gfs-fonts";
paths = lib.mapAttrsToList gfs-font {
@@ -16,31 +17,32 @@ in symlinkJoin {
GFS_Baskerville = "07gx5b9b43zv74d2lay37sajd4ba2wqn3b7xzvyhn265ds9x7cxk";
GFS_Bodoni = "0jhl0728ikzha1krm01sk52nz3jzibidwmyvgidg61d87l8nbf2p";
GFS_Bodoni_Classic = "06jw2irskn75s50mgwkx08rzwqi82gpc6lgjsimsi8p81566gfrh";
GFS_Complutum = "1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
GFS_Complutum =
"1q7dxs2z3yrgchd2pz9h72mjrk62kdc2mmqw8kg9q76k28f8n3p0"; # -> GFSPolyglot.otf
GFS_Decker = "016v1j5n9ph4i2cpmlk26pcxhp3q2fjwlaryppd5akl84dfkpncl";
GFS_Didot = "0ysvrp527wm0wxfp6wmlgmxfx7ysr5mwpmjmqp1h605cy44jblfm";
GFS_Didot_Classic = "0n5awqksvday3l3d85yhwmbmfj9bcpxivy4wpd4zrkgl7b85af2c";
GFS_Didot_Display =
if scardanelli
then "0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7"
else "0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
GFS_Didot_Display = if scardanelli then
"0n2di2zyc76w6f8mc6hfilc2ir6igks7ldjp9fkw1gjp06330fi7"
else
"0gg5xb8jic646gz9p05ry62nk7w0k546fxp5p4vvnawmckql2dj1";
GFS_Elpis = "02l7wd3nbn1kpv7ghxh19k4dbvd49ijyxd6gq83gcr9vlmxcq2s2";
GFS_Gazis = "0x9iwj6pinaykrds0iw6552hf256d0dr41sipdb1jnnlr2d3bf9w";
GFS_Goschen = "1jvbn33wzq2yj0aygwy9pd2msg3wkmdp0npjzazadrmfjpnpkcy9";
GFS_NeoHellenic = "1ixm2frdc6i5lbn9h0h4gdsvsw2k4hny75q8ig4kgs28ac3dbzq3";
GFS_Olga = "0f05ng02na84x9x6yhskxqwxwyabjisyl8a0k3fiah60i620p39d";
GFS_Orpheus =
if scardanelli
then "18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz"
else "1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax";
GFS_Orpheus_Classic =
if scardanelli
then "1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps"
else "0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a";
GFS_Orpheus_Sans =
if scardanelli
then "02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg"
else "1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb";
GFS_Orpheus = if scardanelli then
"18n6fag4pyr8jdwnsz0vixf47jz4ym8mjmppc1w3k7v27cg1z9dz"
else
"1rvjpvk1fx55vyp3dyxcbww1a24rm7xv5faqs735yf6lqzpkqnax";
GFS_Orpheus_Classic = if scardanelli then
"1rqy1kf7slw56zfhbv264yzarjisnqbqydj4f7hghiknhnmdakps"
else
"0d2yzwg6albmgl1d0xhsfrmxj79r42wp712rpry567nv1ry42k0a";
GFS_Orpheus_Sans = if scardanelli then
"02rh7z8c3h3xyfi52rn47z4finizx636d05bg5g23v0l0mqs6nkg"
else
"1rdlm2kmkvi4y3ii68ik8k3w3183vvb3q2pnk04lbb0ggg9w5jdb";
GFS_Philostratos = "0zh3d0cn6b2fjbwnvmg379z20zh7w626w2bnj19xcazjvqkwhzx1";
GFS_Porson = "0r3snwgxkdx7h34sg3s0hr8fac3rnpllq62bk44m266hj6a80a5k";
GFS_Pyrsos = "0y0dv7y3n01bbhhnczflx1zcc7by56cffmr2xqixj2rd1nvchx0j";

View File

@@ -1,6 +1,7 @@
# { stdenv, python }:
{ pkgs ? import <nixpkgs> {} }:
with pkgs; with pkgs.python2Packages;
{ pkgs ? import <nixpkgs> { } }:
with pkgs;
with pkgs.python2Packages;
buildPythonApplication rec {
pname = "gourmet";
@@ -10,7 +11,5 @@ buildPythonApplication rec {
};
buildInputs = [ distutils_extra intltool ];
propagatedBuildInputs = [ sqlalchemy reportlab lxml ];
meta = with stenv.lib; {
maintainers = with maintainers; [ kmein ];
};
meta = with stenv.lib; { maintainers = with maintainers; [ kmein ]; };
}

View File

@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
make all
'';
meta = with stdenv.lib; {
homepage = https://iolanguage.org/;
description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
homepage = "https://iolanguage.org/";
description =
"Io programming language. Inspired by Self, Smalltalk and LISP.";
license = licenses.bsd3;
};
}

View File

@@ -1,4 +1,5 @@
{ lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls, tls ? false }:
{ lib, fetchFromGitHub, automake, autoconf, which, libtool, stdenv, gnutls
, tls ? false }:
stdenv.mkDerivation {
name = "libcoap";
src = fetchFromGitHub {
@@ -8,17 +9,10 @@ stdenv.mkDerivation {
sha256 = "1nic584jwkndg0w831h0fnxk0zx0apf2lw5md079m3di7zcxs6bw";
fetchSubmodules = true;
};
buildInputs = [
automake
autoconf
which
libtool
] ++ lib.optional tls gnutls;
buildInputs = [ automake autoconf which libtool ] ++ lib.optional tls gnutls;
preConfigure = "./autogen.sh";
configureFlags = [
"--disable-documentation"
"--disable-shared"
] ++ lib.optional tls "--enable-dtls";
configureFlags = [ "--disable-documentation" "--disable-shared" ]
++ lib.optional tls "--enable-dtls";
meta = with stdenv.lib; {
homepage = "https://github.com/obgm/libcoap";
description = "A CoAP (RFC 7252) implementation in C";

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
wrapProgram $out/bin/daybook --prefix PATH ":" ${pandoc}/bin ;
'';
meta = with stdenv.lib; {
homepage = https://github.com/kmein/daybook;
homepage = "https://github.com/kmein/daybook";
description = "A diary writing utility in sh";
license = licenses.mit;
platforms = platforms.linux;

View File

@@ -1,18 +1,20 @@
{ pkgs, lib, ... }:
let
kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
wrapScript = { packages ? [], name, script }: pkgs.writers.writeDashBin name ''
PATH=$PATH:${lib.makeBinPath (packages ++ [pkgs.coreutils pkgs.findutils])}
${script} "$@"
'';
kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> { };
wrapScript = { packages ? [ ], name, script }:
pkgs.writers.writeDashBin name ''
PATH=$PATH:${
lib.makeBinPath (packages ++ [ pkgs.coreutils pkgs.findutils ])
}
${script} "$@"
'';
voidrice = pkgs.fetchFromGitHub {
owner = "LukeSmithxyz";
repo = "voidrice";
rev = "dff66cd1efb36afd54dd6dcf2fdaa9475d5646c1";
sha256 = "19f33ins2kzgiw72d62j8zz9ai3j8m4qqfqmagxkg9yhxqkdqry7";
};
in
{
in {
instaget = wrapScript {
packages = [ pkgs.jq pkgs.curl pkgs.gnugrep ];
script = ./instaget.sh;
@@ -90,7 +92,8 @@ in
};
linkhandler = wrapScript {
packages = [ pkgs.utillinux pkgs.mpv pkgs.curl pkgs.gnused pkgs.sxiv pkgs.ts ];
packages =
[ pkgs.utillinux pkgs.mpv pkgs.curl pkgs.gnused pkgs.sxiv pkgs.ts ];
script = "${voidrice}/.local/bin/linkhandler";
name = "linkhandler";
};
@@ -124,6 +127,6 @@ in
packages = [ pkgs.xclip pkgs.scrot kpaste pkgs.libnotify pkgs.dmenu ];
};
bvg = pkgs.callPackage ./bvg.nix {};
nav = pkgs.callPackage ./nav.nix {};
bvg = pkgs.callPackage ./bvg.nix { };
nav = pkgs.callPackage ./nav.nix { };
}

View File

@@ -22,8 +22,13 @@ let
};
in writeShellScriptBin "depp" ''
if [ $# -gt 0 ]; then
git ${lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)} "$@"
git ${
lib.concatStringsSep " " (lib.attrsets.mapAttrsToList aliasFlag aliases)
} "$@"
else
printf "${lib.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: n + " " + v) aliases)}\n"
printf "${
lib.concatStringsSep "\n"
(lib.attrsets.mapAttrsToList (n: v: n + " " + v) aliases)
}\n"
fi
''

View File

@@ -4,33 +4,35 @@ let
cfg = eval.config;
eval = lib.evalModules {
modules = [ {
modules = [{
_file = toString ./klem.nix;
imports = [ (args.config or {}) ];
imports = [ (args.config or { }) ];
options = {
clipboardSelection = lib.mkOption {
default = "clipboard";
type = lib.types.enum ["primary" "secondary" "clipboard"];
type = lib.types.enum [ "primary" "secondary" "clipboard" ];
};
scripts = lib.mkOption {
default = {
pastebin = "${pkgs.curl}/bin/curl -fSs -F 'f:1=<-' ix.io";
shorten = ''${pkgs.curl}/bin/curl -fSs -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://0x0.st'';
shorten = ''
${pkgs.curl}/bin/curl -fSs -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://0x0.st'';
"replace p.r" = "${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'";
};
type = lib.types.attrs;
};
};
} ];
}];
};
scriptCase = option: script: ''
'${option}') ${toString script} ;;
'';
in
pkgs.writers.writeDashBin "klem" ''
in pkgs.writers.writeDashBin "klem" ''
${pkgs.xclip}/bin/xclip -selection ${cfg.clipboardSelection} -out \
| case $(echo "${lib.concatStringsSep "\n" (lib.attrNames cfg.scripts)}" | ${pkgs.dmenu}/bin/dmenu -i -p klem) in
| case $(echo "${
lib.concatStringsSep "\n" (lib.attrNames cfg.scripts)
}" | ${pkgs.dmenu}/bin/dmenu -i -p klem) in
${lib.concatStringsSep "\n" (lib.mapAttrsToList scriptCase cfg.scripts)}
*) ${pkgs.coreutils}/bin/cat ;;
esac \