diff --git a/flake.lock b/flake.lock index 522cad1..2839e8d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "advisory-db": { - "flake": false, - "locked": { - "lastModified": 1702116332, - "narHash": "sha256-Qzx1cRU8QnCmbEp0LJFoEzm7tetiNTc+wRTJTzPo2ko=", - "owner": "rustsec", - "repo": "advisory-db", - "rev": "6ef1d1fd84c57e46253ff16bf7379c115e1062eb", - "type": "github" - }, - "original": { - "owner": "rustsec", - "repo": "advisory-db", - "type": "github" - } - }, "agenix": { "inputs": { "darwin": "darwin", @@ -84,57 +68,6 @@ "type": "github" } }, - "eza": { - "inputs": { - "advisory-db": "advisory-db", - "flake-utils": [ - "flake-utils" - ], - "naersk": [ - "naersk" - ], - "nixpkgs": [ - "nixpkgs" - ], - "powertest": "powertest", - "pre-commit-hooks": "pre-commit-hooks", - "rust-overlay": [ - "rust-overlay" - ], - "treefmt-nix": [ - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1703136511, - "narHash": "sha256-XGOCw+GOJhuGEADyKqJxJhEgSyEIkudH2+GC5oLmDsQ=", - "owner": "eza-community", - "repo": "eza", - "rev": "cd4038726c695ca7bbfa71ff230804cc24d3dddf", - "type": "github" - }, - "original": { - "owner": "eza-community", - "repo": "eza", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-registry": { "flake": false, "locked": { @@ -152,24 +85,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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_2": { "inputs": { "systems": [ "systems" @@ -189,28 +104,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "eza", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -269,32 +162,6 @@ "type": "github" } }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1703344967, - "narHash": "sha256-tfaeCftcPun0E2nwppI70+PC4sJnuuHk+dVWZxwOxzc=", - "owner": "martinvonz", - "repo": "jj", - "rev": "320d15412b0326b96e69e00421e465f6bb9b49b8", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -383,78 +250,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "powertest": { - "inputs": { - "flake-utils": "flake-utils", - "naersk": [ - "eza", - "naersk" - ], - "nixpkgs": [ - "eza", - "nixpkgs" - ], - "rust-overlay": [ - "eza", - "rust-overlay" - ], - "treefmt-nix": [ - "eza", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1700124898, - "narHash": "sha256-+5jKG/KmYOopvHwBAGu5iPVFqoug16Bkyk/InwB40tc=", - "type": "tarball", - "url": "http://rime.cx/v1/github/eza-community/powertest.tar.gz" - }, - "original": { - "type": "tarball", - "url": "http://rime.cx/v1/github/eza-community/powertest.tar.gz" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "eza", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "eza", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", - "type": "tarball", - "url": "http://rime.cx/v1/github/semnix/pre-commit-hooks.nix.tar.gz" - }, - "original": { - "type": "tarball", - "url": "http://rime.cx/v1/github/semnix/pre-commit-hooks.nix.tar.gz" - } - }, "recipemd": { "inputs": { "flake-utils": [ @@ -483,19 +278,17 @@ "inputs": { "agenix": "agenix", "devshell": "devshell", - "eza": "eza", "flake-registry": "flake-registry", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "home-manager": "home-manager_2", "homePage": "homePage", - "jujutsu": "jujutsu", "naersk": "naersk", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "recipemd": "recipemd", "rust-overlay": "rust-overlay", - "systems": "systems_2", + "systems": "systems", "treefmt-nix": "treefmt-nix" } }, @@ -537,21 +330,6 @@ "type": "github" } }, - "systems_2": { - "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": [ diff --git a/flake.nix b/flake.nix index ee4b473..d6800c3 100644 --- a/flake.nix +++ b/flake.nix @@ -47,20 +47,6 @@ 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"; diff --git a/home/modules/fish.nix b/home/modules/fish.nix index e10f6b2..6a852bd 100644 --- a/home/modules/fish.nix +++ b/home/modules/fish.nix @@ -80,6 +80,6 @@ in }; }; - home.packages = [ pkgs.exa ]; + home.packages = [ pkgs.eza ]; }; } diff --git a/home/modules/zsh.nix b/home/modules/zsh.nix index 1f88e8e..187822c 100644 --- a/home/modules/zsh.nix +++ b/home/modules/zsh.nix @@ -72,7 +72,7 @@ in home.packages = with pkgs; [ fzf - exa + eza zsh-git-prompt tmux ]; diff --git a/home/pkgs.nix b/home/pkgs.nix index 910ceb1..b09030f 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -25,7 +25,6 @@ with pkgs; [ element-desktop evince evolution - exa ffmpeg file fx # themable json viewer diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 1c1728c..48d6a2e 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -10,9 +10,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 8c0d9ac..16715d2 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,8 +9,6 @@ , recipemd , agenix , devshell -, jujutsu -, eza , ... } @ inputs: (flake-utils.lib.eachDefaultSystem (system: