From fed569b1b6d45c69f7a9366a26042d5e36bb5f20 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Thu, 14 Sep 2023 18:19:10 -0700 Subject: [PATCH] Switched from exa to eza Exa is unmaintained --- flake.lock | 42 +++++++++++++------------- modules/suites/development/default.nix | 2 +- modules/tools/{exa => eza}/default.nix | 8 ++--- systems/x86_64-vm/virt/default.nix | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) rename modules/tools/{exa => eza}/default.nix (66%) diff --git a/flake.lock b/flake.lock index 4486886..04f3464 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1686747123, - "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", + "lastModified": 1694513707, + "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", + "rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1692763155, - "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=", + "lastModified": 1694642908, + "narHash": "sha256-0Opzs/56VW03COlVdoBrHJZGxQ7gzLDEWADnccC8ras=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a20e40acaebf067da682661aa67da8b36812606", + "rev": "b62f549653e97d78392c1e282b8ca76546a86585", "type": "github" }, "original": { @@ -135,11 +135,11 @@ }, "nixlib": { "locked": { - "lastModified": 1689469483, - "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=", + "lastModified": 1693701915, + "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c", + "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1690133435, - "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=", + "lastModified": 1693791338, + "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586", + "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", "type": "github" }, "original": { @@ -171,11 +171,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1693588489, - "narHash": "sha256-hUGiONyurfBxmTtRUttdlkdq+ml16L1MiKKAS1047OE=", + "lastModified": 1694591211, + "narHash": "sha256-NPP7XGZH+Q5ey7nE2zGLrBrzKmLYPhj8YgsTSdhH0D4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fe0ea731b84b10143fc68cd557368ac70f0fb65c", + "rev": "3ccd87fcdae4732fe33773cefa4375c641a057e7", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692734709, - "narHash": "sha256-SCFnyHCyYjwEmgUsHDDuU0TsbVMKeU1vwkR+r7uS2Rg=", + "lastModified": 1694422566, + "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b85ed9dcbf187b909ef7964774f8847d554fab3b", + "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1667153928, - "narHash": "sha256-SbXxxrxWzumig4ytez86B9FFkd9zH/qj+SSiMUwY8bI=", + "lastModified": 1692934017, + "narHash": "sha256-aj2T1ivZ21qNxguZQKyu7hvCGUAYVR2jd5iMNnM/27o=", "owner": "snowfallorg", "repo": "lib", - "rev": "1ffe7109a0aade9df745432e1f5788cf67a05a3e", + "rev": "1aae2b325fc0c5839283a0af5c247fcb596c097f", "type": "github" }, "original": { diff --git a/modules/suites/development/default.nix b/modules/suites/development/default.nix index 30bcd97..8cbfd4c 100644 --- a/modules/suites/development/default.nix +++ b/modules/suites/development/default.nix @@ -16,7 +16,7 @@ in { aa = { tools = { direnv.enable = true; - exa.enable = true; + eza.enable = true; git.enable = true; gpg.enable = true; zsh.enable = true; diff --git a/modules/tools/exa/default.nix b/modules/tools/eza/default.nix similarity index 66% rename from modules/tools/exa/default.nix rename to modules/tools/eza/default.nix index f2b1170..ac3842e 100644 --- a/modules/tools/exa/default.nix +++ b/modules/tools/eza/default.nix @@ -6,15 +6,15 @@ ... }: with lib; let - cfg = config.aa.tools.exa; + cfg = config.aa.tools.eza; in { - options.aa.tools.exa = with types; { - enable = mkEnableOption "exa"; + options.aa.tools.eza = with types; { + enable = mkEnableOption "eza"; }; config = mkIf cfg.enable { aa.home.extraOptions = { - programs.exa = { + programs.eza = { enable = true; icons = true; git = true; diff --git a/systems/x86_64-vm/virt/default.nix b/systems/x86_64-vm/virt/default.nix index f502751..199e971 100644 --- a/systems/x86_64-vm/virt/default.nix +++ b/systems/x86_64-vm/virt/default.nix @@ -20,7 +20,7 @@ with lib; { suites.desktop.enable = true; tools.git.enable = true; tools.zsh.enable = true; - tools.exa.enable = true; + tools.eza.enable = true; apps.neovim.enable = true; apps.tmux.enable = true; };