diff --git a/flake.lock b/flake.lock index dc98940..b273d22 100644 --- a/flake.lock +++ b/flake.lock @@ -186,6 +186,31 @@ "url": "ssh://gitea@git.dtth.ch/nki/phanpy" } }, + "eza": { + "inputs": { + "flake-utils": "flake-utils_4", + "naersk": "naersk", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1694713496, + "narHash": "sha256-vgjoDmWtLMP/dpBeydgBNZjSQRuvv0Fm/PcKKAIoIdc=", + "owner": "eza-community", + "repo": "eza", + "rev": "6c61d1443755a458d802c9639ca83bc4ad64971a", + "type": "github" + }, + "original": { + "owner": "eza-community", + "ref": "v0.12.0", + "repo": "eza", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -403,6 +428,21 @@ "type": "github" } }, + "flake-utils_10": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_2": { "inputs": { "systems": "systems_2" @@ -444,11 +484,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -476,6 +516,42 @@ } }, "flake-utils_6": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -490,22 +566,7 @@ "type": "github" } }, - "flake-utils_7": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { + "flake-utils_9": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -674,12 +735,12 @@ "crane": "crane_3", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_4" }, "locked": { "lastModified": 1682802423, @@ -698,7 +759,7 @@ }, "mpd-mpris": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -718,6 +779,24 @@ } }, "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1694081375, + "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=", + "owner": "nix-community", + "repo": "naersk", + "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { "inputs": { "nixpkgs": [ "rnix-lsp", @@ -738,7 +817,7 @@ "type": "github" } }, - "naersk_2": { + "naersk_3": { "inputs": { "nixpkgs": [ "youmubot", @@ -765,7 +844,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_5" }, "locked": { "lastModified": 1694226967, @@ -847,6 +926,38 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1656753965, + "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1676300157, @@ -913,27 +1024,40 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1694753796, - "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", - "type": "github" + "lastModified": 1688231357, + "narHash": "sha256-ZOn16X5jZ6X5ror58gOJAxPfFLAQhZJ6nOUeS4tfFwo=", + "path": "/nix/store/aw6kmwd8a02n2c1wysrfk2q31brlmqdz-source", + "rev": "645ff62e09d294a30de823cb568e9c6d68e92606", + "type": "path" }, "original": { - "owner": "nixos", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs_7": { "locked": { - "lastModified": 1656753965, - "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { @@ -943,13 +1067,13 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { - "lastModified": 1685533922, - "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", + "lastModified": 1694753796, + "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", + "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", "type": "github" }, "original": { @@ -1007,8 +1131,8 @@ }, "rnix-lsp": { "inputs": { - "naersk": "naersk", - "nixpkgs": "nixpkgs_7", + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_10", "utils": "utils_2" }, "locked": { @@ -1033,14 +1157,15 @@ "darwin": "darwin", "deploy-rs": "deploy-rs", "dtth-phanpy": "dtth-phanpy", - "flake-utils": "flake-utils_4", + "eza": "eza", + "flake-utils": "flake-utils_6", "home-manager": "home-manager", "kak-lsp": "kak-lsp", "kakoune": "kakoune", "lanzaboote": "lanzaboote", "mpd-mpris": "mpd-mpris", "nixos-m1": "nixos-m1", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rnix-lsp": "rnix-lsp", @@ -1120,6 +1245,25 @@ } }, "rust-overlay_3": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1694484610, + "narHash": "sha256-aeSDkp7fkAqtVjW3QUn7vq7BKNlFul/BiGgdv7rK+mA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c5b977a7e6a295697fa1f9c42174fd6313b38df4", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "flake-utils": [ "lanzaboote", @@ -1144,7 +1288,7 @@ "type": "github" } }, - "rust-overlay_4": { + "rust-overlay_5": { "flake": false, "locked": { "lastModified": 1686795910, @@ -1162,7 +1306,7 @@ }, "secrets": { "inputs": { - "flake-utils": "flake-utils_7" + "flake-utils": "flake-utils_9" }, "locked": { "lastModified": 1693981285, @@ -1297,6 +1441,54 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "lastModified": 1693817438, + "narHash": "sha256-fg3+n4Ky1gCzDtPm0MomMTFw0YkH05Y8ojy5t7bkfHg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "b8d3a059f5487d6767d07c3716386753e3132d9f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1667395993, @@ -1329,9 +1521,9 @@ }, "youmubot": { "inputs": { - "flake-utils": "flake-utils_8", - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_8" + "flake-utils": "flake-utils_10", + "naersk": "naersk_3", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1687432552, diff --git a/flake.nix b/flake.nix index 3f54cb6..faa76c5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,8 @@ url = gitlab:famedly/conduit/v0.6.0; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + eza.url = github:eza-community/eza/v0.12.0; + eza.inputs.nixpkgs.follows = "nixpkgs"; # --- Sources kakoune.url = github:mawww/kakoune; diff --git a/overlay.nix b/overlay.nix index 97d42b8..4181785 100644 --- a/overlay.nix +++ b/overlay.nix @@ -30,6 +30,11 @@ let deploy-rs = inputs.deploy-rs.packages.default; dtth-phanpy = inputs.dtth-phanpy.packages.${final.system}.default; matrix-conduit = inputs.conduit.packages.${final.system}.default; + exa = inputs.eza.packages.${final.system}.default.overrideAttrs (attrs: { + postInstall = attrs.postInstall + '' + ln -sv $out/bin/eza $out/bin/exa + ''; + }); # A list of source-style inputs. sources = final.lib.attrsets.filterAttrs (name: f: !(builtins.hasAttr "outputs" f)) inputs;