diff --git a/flake.lock b/flake.lock index 34f28ec..8b39c83 100644 --- a/flake.lock +++ b/flake.lock @@ -26,7 +26,9 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1694435990, @@ -42,6 +44,38 @@ "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": false, "locked": { @@ -60,7 +94,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1694529238, @@ -142,7 +178,9 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1695053459, @@ -158,6 +196,26 @@ "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": { "locked": { "lastModified": 1693701915, @@ -254,34 +312,37 @@ "inputs": { "agenix": "agenix", "devshell": "devshell", + "eza": "eza", "flake-registry": "flake-registry", "flake-utils": "flake-utils", "home-manager": "home-manager", "homePage": "homePage", "jujutsu": "jujutsu", + "naersk": "naersk", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "recipemd": "recipemd" + "recipemd": "recipemd", + "rust-overlay": "rust-overlay", + "systems": "systems", + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { "inputs": { "flake-utils": [ - "jujutsu", "flake-utils" ], "nixpkgs": [ - "jujutsu", "nixpkgs" ] }, "locked": { - "lastModified": 1691719735, - "narHash": "sha256-GhPn5EIhGt7aFwgC6RELZJC7mUIol9O0k7Dsf2Hu0AM=", + "lastModified": 1695694299, + "narHash": "sha256-0CucEiOZzOVHwmGDJKNXLj7aDYOqbRtqChp9nbGrh18=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ac9d8b2e9acc153145e6fa3c78f9ba458ae517bf", + "rev": "c89a55d2d91cf55234466934b25deeffa365188a", "type": "github" }, "original": { @@ -305,18 +366,23 @@ "type": "github" } }, - "systems_2": { + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1695290086, + "narHash": "sha256-ol6licpIAzc9oMsEai/9YZhgSMcrnlnD/3ulMLGNKL0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "e951529be2e7c669487de78f5aef8597bbae5fca", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } } diff --git a/flake.nix b/flake.nix index 070c654..038f146 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,10 @@ inputs = { 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 = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -25,6 +28,7 @@ devshell = { url = "github:numtide/devshell"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.systems.follows = "systems"; }; nixos-generators = { url = "github:nix-community/nixos-generators"; @@ -34,10 +38,33 @@ url = "github:NixOS/flake-registry"; 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 = { url = "github:martinvonz/jj"; inputs.nixpkgs.follows = "nixpkgs"; 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"; }; }; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index d88868c..1e1fa1e 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -1,5 +1,6 @@ { self , agenix +, eza , nixpkgs , home-manager , homePage @@ -10,6 +11,7 @@ let more-packages = system: { more-packages = final: prev: { + exa = inputs.eza.packages.${system}.default; recipemd = inputs.recipemd.packages.${system}.recipemd; jujutsu = inputs.jujutsu.packages.${system}.jujutsu; }; diff --git a/outputs.nix b/outputs.nix index 94979f0..4783575 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,6 +10,7 @@ , agenix , devshell , jujutsu +, eza , ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: