diff --git a/pkgs/default.nix b/pkgs/default.nix index 2c576e5..7293be9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -19,14 +19,17 @@ self: super: # Bug fixes: kitty07 = super.callPackage ./kitty {}; + + scientifica-font = super.callPackage ./scientifica-font {}; + ripmime = super.ripmime.override { stdenv = super.overrideCC super.stdenv super.gcc6; }; spotify = super.spotify.overrideDerivation ( old: { src = super.fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.72.117.g6bd7cc73-35_amd64.deb"; - sha256 = "0yicwvg6jx8r657ff53326akq3g4ayiinlracjw5jrcs8x9whjap"; + url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_1.0.77.338.g758ebd78-41_amd64.deb"; + sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; }; }); nixops = super.nixops.overrideDerivation ( diff --git a/pkgs/scientifica-font/default.nix b/pkgs/scientifica-font/default.nix new file mode 100644 index 0000000..5159f23 --- /dev/null +++ b/pkgs/scientifica-font/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation rec { + name = "scientifica-1.0"; + + src = fetchgit { + url = "https://github.com/NerdyPepper/scientifica"; + rev = "e197c4757bda669268cbd61a315e6a463a9b28d8"; + sha256 = "0fhf27z50v8s3g84vbdy4ys2ka1ag6wzipbgcmimm56kzvr4i493"; + }; + + nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ]; + buildPhase = '' + mv regular/*bdf . + mv bold/*bdf . + + for i in *.bdf; do + bdftopcf -o ''${i/bdf/pcf} $i + done + + gzip -n *.pcf + ''; + + installPhase = '' + fontDir="$out/share/fonts/misc" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = "Tall, condensed, bitmap font for geeks"; + homepage = https://github.com/NerdyPepper/scientifica; + license = lib.licences.ofl; + maintainers = [ maintainers.jpotier ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index a18f633..acb2207 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -123,8 +123,10 @@ let syntax enable if has('gui_running') " When gui is running, it pretty much sets its own colors - set background=light - set guifont=Inconsolata\ 16 + set background=dark + set guifont="Iosevka Term 10" + set notitle + set guioptions=a else " If we're in a terminal, then we stay default, terminal will choose " which colors it likes.