+6 -5

nix/.config/nixpkgs/darwin/configuration.nix

reviewed

··· 3 3 { 4 4 nixpkgs.config.allowUnfree = true; 5 5 nixpkgs.overlays = [ 6 6 - (import ../overlays/neovim-nightly.nix) 7 7 - (import ../overlays/ctags.nix) 6 6 + (import <neovim-nightly>) 8 7 (import ../overlays/encpipe.nix) 9 8 (import ../overlays/fonts.nix) 10 9 (import ../overlays/git-riff.nix) ··· 26 25 # $ nix-env -qaP | grep wget 27 26 environment.systemPackages = with pkgs; [ 28 27 _1password 28 28 + age 29 29 bat 30 30 comby 31 31 coreutils 32 32 + curlie 32 33 direnv 33 34 nix-direnv 34 35 entr ··· 42 43 gitAndTools.hub 43 44 gitAndTools.tig 44 45 git 46 46 + gh 45 47 # git-riff 46 48 gnupg 47 47 - httpie 48 49 imagemagick 49 50 jq 50 51 lnav ··· 103 104 enable = true; 104 105 }; 105 106 106 106 - nix.package = pkgs.nixStable; 107 107 + nix.package = pkgs.nixFlakes; 107 108 # nix.useSandbox = true; 108 109 nix.sandboxPaths = [ 109 110 "/System/Library/Frameworks" ··· 120 121 keep-outputs = true 121 122 keep-derivations = true 122 123 123 123 - # experimental-features = nix-command flakes 124 124 + experimental-features = nix-command flakes 124 125 ''; 125 126 126 127 # Used for backwards compatibility, please read the changelog before changing.

+2 -3

nix/.config/nixpkgs/overlays/comby.nix

reviewed

··· 25 25 mv comby-$version-x86_64-macos $out/bin/comby 26 26 ''; 27 27 28 28 - postFixup = 29 29 - let libpath = lib.makeLibraryPath [ pcre ]; 30 30 - in '' 28 28 + postFixup = let libpath = lib.makeLibraryPath [ pcre ]; 29 29 + in '' 31 30 install_name_tool -change /usr/local/opt/pcre/lib/libpcre.1.dylib ${libpath}/libpcre.1.dylib $out/bin/comby 32 31 ''; 33 32 };

-21

nix/.config/nixpkgs/overlays/ctags.nix

reviewed

··· 1 1 - self: super: 2 2 - 3 3 - let 4 4 - universal-ctags = (super.universal-ctags.overrideAttrs(oldAttrs: { 5 5 - version = "unstable-2020-08-07"; 6 6 - 7 7 - doCheck = false; 8 8 - 9 9 - src = super.fetchFromGitHub { 10 10 - owner = "universal-ctags"; 11 11 - repo = "ctags"; 12 12 - rev = "f2245092348e38f02cbfa5ede44bcbc37a336501"; 13 13 - sha256 = "05ypqvx5xizygba93gv8ab9crv3kklghy7bq5g8ck23p6l985ch3"; 14 14 - }; 15 15 - })).override { 16 16 - pythonPackages = super.python3.pkgs; 17 17 - }; 18 18 - in 19 19 - { 20 20 - inherit universal-ctags; 21 21 - }

-1

nix/.config/nixpkgs/overlays/erlang.nix

reviewed

··· 1 1 - import <nix-elixir>

-7

nix/.config/nixpkgs/overlays/erlang/overlay.json

reviewed

··· 1 1 - { 2 2 - "owner": "hauleth", 3 3 - "repo": "nix-elixir", 4 4 - "rev": "9cbd7d740dc54f67a9a423d9a49689829183ddf9", 5 5 - "sha256": "ELtYgbce+tZCnNjr/BddHfKu+PCAFfuFG3qyJ9eTgS4=", 6 6 - "fetchSubmodules": true 7 7 - }

-1

nix/.config/nixpkgs/overlays/neovim-nightly.nix

reviewed

··· 1 1 - import <neovim-nightly>

-12

nix/.config/nixpkgs/overlays/tokei.nix

reviewed

··· 1 1 - self: super: 2 2 - 3 3 - with super; 4 4 - 5 5 - { 6 6 - tokei = tokei.overrideDerivation (cfg: { 7 7 - buildInputs = cfg.buildInputs ++ (stdenv.lib.optionals stdenv.isDarwin [ 8 8 - self.libiconv 9 9 - self.darwin.apple_sdk.frameworks.Security 10 10 - ]); 11 11 - }); 12 12 - }

+22

nix/.config/nixpkgs/overlays/zig-bin.nix

reviewed

··· 1 1 + final: prev: 2 2 + 3 3 + { 4 4 + zig-bin = prev.stdenv.mkDerivation rec { 5 5 + pname = "zig"; 6 6 + version = "0.7.1"; 7 7 + 8 8 + src = prev.fetchurl { 9 9 + url = "https://ziglang.org/download/0.7.1/zig-macos-x86_64-${version}.tar.xz"; 10 10 + sha256 = "06f57cg121civy397b8yy3m2a19k6d73z6g3cz7z12lpc9sv2p44"; 11 11 + }; 12 12 + 13 13 + dontBuild = true; 14 14 + 15 15 + installPhase = '' 16 16 + mkdir -p $out/bin 17 17 + ls -la 18 18 + mv zig $out/bin/zig 19 19 + mv lib $out/lib 20 20 + ''; 21 21 + }; 22 22 + }