diff options
-rw-r--r-- | karabiner/.config/karabiner/karabiner.json | 2 | ||||
-rw-r--r-- | nix/.config/nixpkgs/config.nix | 2 | ||||
-rw-r--r-- | nix/.config/nixpkgs/zr.nix | 42 |
3 files changed, 45 insertions, 1 deletions
diff --git a/karabiner/.config/karabiner/karabiner.json b/karabiner/.config/karabiner/karabiner.json index 8faf2cca..15ee8f14 100644 --- a/karabiner/.config/karabiner/karabiner.json +++ b/karabiner/.config/karabiner/karabiner.json @@ -21,7 +21,7 @@ "product_id": 602, "vendor_id": 1452 }, - "ignore": false, + "ignore": true, "keyboard_type": 41 }, { diff --git a/nix/.config/nixpkgs/config.nix b/nix/.config/nixpkgs/config.nix index dc4e40a2..aa0112ec 100644 --- a/nix/.config/nixpkgs/config.nix +++ b/nix/.config/nixpkgs/config.nix @@ -6,6 +6,8 @@ emacs = if stdenv.isDarwin then emacs25Macport else emacs; }; nodejs = pkgs.nodejs-8_x; + + zr = super.callPackage ./zr.nix {}; }; allowUnfree = true; diff --git a/nix/.config/nixpkgs/zr.nix b/nix/.config/nixpkgs/zr.nix new file mode 100644 index 00000000..1ef3e328 --- /dev/null +++ b/nix/.config/nixpkgs/zr.nix @@ -0,0 +1,42 @@ +{ + fetchFromGitHub, + darwin, + stdenv, + rustPlatform, + cmake, + curl, + libiconv, + openssl, + zlib +}: +with rustPlatform; + +buildRustPackage rec { + name = "zr-${version}"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "jedahan"; + repo = "zr"; + rev = "${version}"; + sha256 = "07kb8bk2zri1087dp3pk2zpqjy8rd40nw931z6nnm230ygq481zm"; + }; + + buildInputs = [ cmake curl openssl zlib libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Security ]); + + cargoDepsHook = stdenv.lib.optionals stdenv.isDarwin '' + export OPENSSL_DIR=${openssl} + export OPENSSL_LIB_DIR=${openssl.out}/lib + export OPENSSL_INCLUDE_DIR=${openssl.dev}/include + ''; + + depsSha256 = "0cjnqilsb9la28b65j1w1n8gdr49b1d9m3z7wsl4q2w3qc42ad52"; + + meta = with stdenv.lib; { + description = "zsh plugin manager written in rust"; + homepage = https://github.com/jedahan/zr; + license = with licenses; [ unfree ]; + platforms = platforms.all; + }; +} |