From 2c18824cea812ede3c94776825bdc652b343b1c5 Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Sun, 19 Mar 2023 09:40:46 -0700 Subject: [PATCH] Added exa config Updated lockfile to use an updated version of the exa module in home-manager. --- flake.lock | 24 ++++++++++++------------ modules/tools/exa/default.nix | 25 +++++++++++++++++++++++++ modules/tools/zsh/default.nix | 2 +- systems/x86_64-vm/virt/default.nix | 1 + 4 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 modules/tools/exa/default.nix diff --git a/flake.lock b/flake.lock index 21c4dde..394efa7 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675935446, - "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", + "lastModified": 1679067095, + "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", + "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "type": "github" }, "original": { @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1677928408, - "narHash": "sha256-Rus3DPKieGuG4UHdMCCFpKdH8Z2TrobciBLHr4FDAzM=", + "lastModified": 1678351966, + "narHash": "sha256-tRFEU0lu3imZb3dtELBY+UbEhWXbb0xlBrsIlpICb+A=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "46158ecda28c81b9150f75c8bce8821d375c1230", + "rev": "0c043999b16caba6fb571af2d228775729829943", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1676202775, - "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=", + "lastModified": 1679081381, + "narHash": "sha256-n4+SbrVohxbgbmOTkodfxc3d8W38OfKowD6YNA8j27o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d917136f550a8c36efb1724390c7245105f79023", + "rev": "b573a7f69484a7d213680abb70b4f95bdc28eee5", "type": "github" }, "original": { @@ -155,11 +155,11 @@ }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { diff --git a/modules/tools/exa/default.nix b/modules/tools/exa/default.nix new file mode 100644 index 0000000..f2b1170 --- /dev/null +++ b/modules/tools/exa/default.nix @@ -0,0 +1,25 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.aa.tools.exa; +in { + options.aa.tools.exa = with types; { + enable = mkEnableOption "exa"; + }; + + config = mkIf cfg.enable { + aa.home.extraOptions = { + programs.exa = { + enable = true; + icons = true; + git = true; + enableAliases = true; + }; + }; + }; +} diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix index 9229aae..0a95e6b 100644 --- a/modules/tools/zsh/default.nix +++ b/modules/tools/zsh/default.nix @@ -29,7 +29,7 @@ in { bindkey '^E' end-of-line bindkey '^R' history-incremental-search-backward alias view="vim -R $1" - alias ls=lsd + # alias ls=lsd alias l='ls -la' ''; diff --git a/systems/x86_64-vm/virt/default.nix b/systems/x86_64-vm/virt/default.nix index 7f7d462..f502751 100644 --- a/systems/x86_64-vm/virt/default.nix +++ b/systems/x86_64-vm/virt/default.nix @@ -20,6 +20,7 @@ with lib; { suites.desktop.enable = true; tools.git.enable = true; tools.zsh.enable = true; + tools.exa.enable = true; apps.neovim.enable = true; apps.tmux.enable = true; };