diff --git a/configs/default.nix b/configs/default.nix index d72328e..5c76bef 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -86,6 +86,7 @@ in overlays = [ # (import ) (import ) + (import ) (self: super: { python3Packages = super.python3Packages.override { overrides = new: old: { @@ -94,54 +95,14 @@ in sncli = new.callPackage {}; }; }; - haskellPackages = super.haskellPackages.override { - overrides = new: old: { - blessings = new.callPackage {}; - scanner = new.callPackage {}; - }; - }; writeDashBin = super.writers.writeDashBin; writeDash = super.writers.writeDash; - git-quick-stats = super.callPackage {}; iolanguage = super.callPackage {}; nix-git = super.callPackage {}; gfs-fonts = super.callPackage {}; - - kmein = { - autorenkalender = super.callPackage {}; - bvg = super.callPackage {}; - daybook = super.callPackage {}; - genius = super.callPackage {}; - instaget = super.callPackage {}; - literature-quote = super.callPackage {}; - n = super.callPackage {}; - depp = super.callPackage {}; - odyssey = super.callPackage {}; - wttr = super.callPackage {}; - nav = super.callPackage {}; - dirmir = super.callPackage {}; - favicon = super.callPackage {}; - tolino-screensaver = super.callPackage {}; - # fzf-wrappers = pkgs.callPackage {}; (broken) - slide = - let slide-package = super.fetchFromGitHub { - owner = "kmein"; - repo = "slide"; - rev = "0470583d22212745eab4f46076267addf4d2346c"; - sha256 = "0skcp3va9v4hmxy5ramghpz53gnyxv10wsacgmc2jr0v1wrqlzbh"; - }; - in super.callPackage slide-package {}; - haskellPackages.mnemosyne = - let mnemosyne-package = super.fetchFromGitHub { - repo = "mnemosyne"; - owner = "kmein"; - rev = "6bfa13c88db176af80be90840ff03573d67d679f"; - sha256 = "1rimv5c5q9602y501hbkgkfbimqnmdkcr5hp1434q06gcazhjhca"; - }; - in super.haskellPackages.callPackage mnemosyne-package {}; - }; + fzf-wrappers = super.callPackage {}; }) ]; }; diff --git a/configs/git.nix b/configs/git.nix index cbcc33f..14ac9cc 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -9,7 +9,6 @@ pkgs.gitstats pkgs.patch pkgs.patchutils - pkgs.git-quick-stats pkgs.git-preview ]; diff --git a/configs/packages/default.nix b/configs/packages/default.nix index d96b497..e66f9e8 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -100,15 +100,13 @@ (pass.withExtensions (ext: [ext.pass-otp])) fzf gnupg - kmein.haskellPackages.mnemosyne + kmein.mnemosyne kmein.favicon kmein.autorenkalender kmein.bvg kmein.daybook kmein.depp kmein.dirmir - # kmein.font-size (removed) - # kmein.fzf-wrappers (broken) kmein.genius kmein.instaget kmein.literature-quote @@ -119,6 +117,7 @@ kmein.tolino-screensaver memo nix-git + # fzf-wrappers par qrencode unstable.hugo diff --git a/configs/packages/haskell/packages.nix b/configs/packages/haskell/packages.nix index b6ccb57..b184862 100644 --- a/configs/packages/haskell/packages.nix +++ b/configs/packages/haskell/packages.nix @@ -1,7 +1,5 @@ haskellPackages: with haskellPackages; [ - blessings - scanner HTTP HUnit MissingH diff --git a/overlays/scripts.nix b/overlays/scripts.nix new file mode 100644 index 0000000..01abb9f --- /dev/null +++ b/overlays/scripts.nix @@ -0,0 +1,3 @@ +(self: super: { + kmein = import { pkgs = super; }; +}) diff --git a/packages/blessings.nix b/packages/blessings.nix deleted file mode 100644 index 9161354..0000000 --- a/packages/blessings.nix +++ /dev/null @@ -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; -} diff --git a/packages/font-size.nix b/packages/font-size.nix deleted file mode 100644 index 3143d99..0000000 --- a/packages/font-size.nix +++ /dev/null @@ -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 -'' diff --git a/packages/fzf-wrappers.nix b/packages/fzf-wrappers.nix index 07e35f7..c8f508b 100644 --- a/packages/fzf-wrappers.nix +++ b/packages/fzf-wrappers.nix @@ -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; +} diff --git a/packages/gfs-fonts.nix b/packages/gfs-fonts.nix index 0f74408..b10a5ea 100644 --- a/packages/gfs-fonts.nix +++ b/packages/gfs-fonts.nix @@ -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"; diff --git a/packages/autorenkalender.nix b/packages/scripts/autorenkalender.nix similarity index 100% rename from packages/autorenkalender.nix rename to packages/scripts/autorenkalender.nix diff --git a/packages/bvg.nix b/packages/scripts/bvg.nix similarity index 100% rename from packages/bvg.nix rename to packages/scripts/bvg.nix diff --git a/packages/daybook.nix b/packages/scripts/daybook.nix similarity index 100% rename from packages/daybook.nix rename to packages/scripts/daybook.nix diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix new file mode 100644 index 0000000..35bddfa --- /dev/null +++ b/packages/scripts/default.nix @@ -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 {}; +} diff --git a/packages/depp.nix b/packages/scripts/depp.nix similarity index 100% rename from packages/depp.nix rename to packages/scripts/depp.nix diff --git a/packages/dirmir.nix b/packages/scripts/dirmir.nix similarity index 100% rename from packages/dirmir.nix rename to packages/scripts/dirmir.nix diff --git a/packages/favicon.nix b/packages/scripts/favicon.nix similarity index 100% rename from packages/favicon.nix rename to packages/scripts/favicon.nix diff --git a/packages/genius.nix b/packages/scripts/genius.nix similarity index 100% rename from packages/genius.nix rename to packages/scripts/genius.nix diff --git a/packages/instaget.nix b/packages/scripts/instaget.nix similarity index 100% rename from packages/instaget.nix rename to packages/scripts/instaget.nix diff --git a/packages/literature-quote.nix b/packages/scripts/literature-quote.nix similarity index 100% rename from packages/literature-quote.nix rename to packages/scripts/literature-quote.nix diff --git a/packages/man-pdf.nix b/packages/scripts/man-pdf.nix similarity index 100% rename from packages/man-pdf.nix rename to packages/scripts/man-pdf.nix diff --git a/packages/n.nix b/packages/scripts/n.nix similarity index 100% rename from packages/n.nix rename to packages/scripts/n.nix diff --git a/packages/nav.nix b/packages/scripts/nav.nix similarity index 100% rename from packages/nav.nix rename to packages/scripts/nav.nix diff --git a/packages/odyssey.nix b/packages/scripts/odyssey.nix similarity index 100% rename from packages/odyssey.nix rename to packages/scripts/odyssey.nix diff --git a/packages/tolino-screensaver.nix b/packages/scripts/tolino-screensaver.nix similarity index 100% rename from packages/tolino-screensaver.nix rename to packages/scripts/tolino-screensaver.nix diff --git a/packages/wttr.nix b/packages/scripts/wttr.nix similarity index 100% rename from packages/wttr.nix rename to packages/scripts/wttr.nix