diff --git a/modules/modules.nix b/modules/modules.nix index e870191ea..5393b3a52 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -79,7 +79,6 @@ let ./programs/emacs.nix ./programs/eww.nix ./programs/eza.nix - ./programs/exa.nix ./programs/feh.nix ./programs/firefox.nix ./programs/fish.nix diff --git a/modules/programs/exa.nix b/modules/programs/exa.nix deleted file mode 100644 index afe83e737..000000000 --- a/modules/programs/exa.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - meta.maintainers = [ hm.maintainers.kalhauge ]; - - options.programs.exa = { - enable = mkEnableOption "exa, a modern replacement for {command}`ls`"; - - enableAliases = mkEnableOption "recommended exa aliases (ls, ll…)"; - - extraOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--group-directories-first" "--header" ]; - description = '' - Extra command line options passed to exa. - ''; - }; - - icons = mkOption { - type = types.bool; - default = false; - description = '' - Display icons next to file names ({option}`--icons` argument). - ''; - }; - - git = mkOption { - type = types.bool; - default = false; - description = '' - List each file's Git status if tracked or ignored ({option}`--git` argument). - ''; - }; - - package = mkPackageOption pkgs "exa" { }; - }; - - config = let - cfg = config.programs.exa; - - args = escapeShellArgs (optional cfg.icons "--icons" - ++ optional cfg.git "--git" ++ cfg.extraOptions); - - aliases = { - exa = "exa ${args}"; - } // optionalAttrs cfg.enableAliases { - ls = "exa"; - ll = "exa -l"; - la = "exa -a"; - lt = "exa --tree"; - lla = "exa -la"; - }; - in mkIf cfg.enable { - home.packages = [ cfg.package ]; - - programs.bash.shellAliases = aliases; - - programs.zsh.shellAliases = aliases; - - programs.fish.shellAliases = aliases; - - programs.ion.shellAliases = aliases; - }; -} diff --git a/modules/programs/eza.nix b/modules/programs/eza.nix index 0724b92b4..a4863b72b 100644 --- a/modules/programs/eza.nix +++ b/modules/programs/eza.nix @@ -3,6 +3,11 @@ with lib; { + imports = let + mkRenamed = opt: + mkRenamedOptionModule [ "programs" "exa" opt ] [ "programs" "eza" opt ]; + in map mkRenamed [ "enable" "enableAliases" "extraOptions" "icons" "git" ]; + meta.maintainers = [ maintainers.cafkafk ]; options.programs.eza = {