Replace exa with eza

Override inputs to keep number of transitive inputs small
This commit is contained in:
Tim Schubert 2023-09-26 18:07:54 +02:00
parent 703c86352a
commit 719c251d6e
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
4 changed files with 114 additions and 18 deletions

100
flake.lock generated
View file

@ -26,7 +26,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1694435990, "lastModified": 1694435990,
@ -42,6 +44,38 @@
"type": "github" "type": "github"
} }
}, },
"eza": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"naersk": [
"naersk"
],
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": [
"rust-overlay"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1695708797,
"narHash": "sha256-XTlIx8Qmp9g2yOm+uONwUWYgeaxCY8xOVKqdcec0Z2w=",
"owner": "eza-community",
"repo": "eza",
"rev": "cdf22c57c58c234257176c3a0ec0d6423b787716",
"type": "github"
},
"original": {
"owner": "eza-community",
"repo": "eza",
"type": "github"
}
},
"flake-registry": { "flake-registry": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -60,7 +94,9 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -142,7 +178,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": [
"rust-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1695053459, "lastModified": 1695053459,
@ -158,6 +196,26 @@
"type": "github" "type": "github"
} }
}, },
"naersk": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1694081375,
"narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=",
"owner": "nix-community",
"repo": "naersk",
"rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1693701915, "lastModified": 1693701915,
@ -254,34 +312,37 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"devshell": "devshell", "devshell": "devshell",
"eza": "eza",
"flake-registry": "flake-registry", "flake-registry": "flake-registry",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"homePage": "homePage", "homePage": "homePage",
"jujutsu": "jujutsu", "jujutsu": "jujutsu",
"naersk": "naersk",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"recipemd": "recipemd" "recipemd": "recipemd",
"rust-overlay": "rust-overlay",
"systems": "systems",
"treefmt-nix": "treefmt-nix"
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"jujutsu",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"jujutsu",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1691719735, "lastModified": 1695694299,
"narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=", "narHash": "sha256-0CucEiOZzOVHwmGDJKNXLj7aDYOqbRtqChp9nbGrh18=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf", "rev": "c89a55d2d91cf55234466934b25deeffa365188a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,18 +366,23 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1695290086,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-ol6licpIAzc9oMsEai/9YZhgSMcrnlnD/3ulMLGNKL0=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "e951529be2e7c669487de78f5aef8597bbae5fca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
} }

View file

@ -3,7 +3,10 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils = {
url = "github:numtide/flake-utils";
inputs.systems.follows = "systems";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -25,6 +28,7 @@
devshell = { devshell = {
url = "github:numtide/devshell"; url = "github:numtide/devshell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.systems.follows = "systems";
}; };
nixos-generators = { nixos-generators = {
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
@ -34,10 +38,33 @@
url = "github:NixOS/flake-registry"; url = "github:NixOS/flake-registry";
flake = false; flake = false;
}; };
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
naersk = {
url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs";
};
eza = {
url = "github:eza-community/eza";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
inputs.rust-overlay.follows = "rust-overlay";
inputs.naersk.follows = "naersk";
inputs.treefmt-nix.follows = "treefmt-nix";
};
jujutsu = { jujutsu = {
url = "github:martinvonz/jj"; url = "github:martinvonz/jj";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
inputs.rust-overlay.follows = "rust-overlay";
};
systems.url = "github:nix-systems/default";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };

View file

@ -1,5 +1,6 @@
{ self { self
, agenix , agenix
, eza
, nixpkgs , nixpkgs
, home-manager , home-manager
, homePage , homePage
@ -10,6 +11,7 @@
let let
more-packages = system: { more-packages = system: {
more-packages = final: prev: { more-packages = final: prev: {
exa = inputs.eza.packages.${system}.default;
recipemd = inputs.recipemd.packages.${system}.recipemd; recipemd = inputs.recipemd.packages.${system}.recipemd;
jujutsu = inputs.jujutsu.packages.${system}.jujutsu; jujutsu = inputs.jujutsu.packages.${system}.jujutsu;
}; };

View file

@ -10,6 +10,7 @@
, agenix , agenix
, devshell , devshell
, jujutsu , jujutsu
, eza
, ... , ...
} @ inputs: } @ inputs:
(flake-utils.lib.eachDefaultSystem (system: (flake-utils.lib.eachDefaultSystem (system: