diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index a728650..a6b13c5 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -24,6 +24,7 @@ in { journalctl = enabled; jq = enabled; just = enabled; + less = enabled; nh = enabled; }; } diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index a543bec..984943b 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -18,6 +18,7 @@ ./journalctl.nix ./jq.nix ./just.nix + ./less.nix ./nemo.nix ./nh.nix ./waybar.nix diff --git a/modules/home/programs/less.nix b/modules/home/programs/less.nix new file mode 100644 index 0000000..1ecc26b --- /dev/null +++ b/modules/home/programs/less.nix @@ -0,0 +1,27 @@ +{ + marleylib, + config, + osConfig, + lib, + ... +}: let + inherit (marleylib.module) mkEnableOption'; + + cfg = config.marleyos.programs.less; + osCfg = osConfig.marleyos.programs.less; +in { + options.marleyos.programs.less.enable = mkEnableOption' "less" osCfg.enable; + + config = lib.mkIf cfg.enable { + programs.less.enable = true; + + home.sessionVariables = let + osEnv = osConfig.programs.less.envVariables; + in + lib.mkIf (osEnv ? LESS) { + inherit (osEnv) LESS; + }; + + programs.lesspipe.enable = true; + }; +} diff --git a/modules/nixos/profiles.nix b/modules/nixos/profiles.nix index f6fd6dc..8951ca2 100644 --- a/modules/nixos/profiles.nix +++ b/modules/nixos/profiles.nix @@ -15,6 +15,7 @@ in { curl = enabled; fish = enabled; jq = enabled; + less = enabled; nh = enabled; }; diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix index 9516007..2f467c3 100644 --- a/modules/nixos/programs/default.nix +++ b/modules/nixos/programs/default.nix @@ -3,6 +3,7 @@ ./curl.nix ./fish.nix ./jq.nix + ./less.nix ./nh.nix ./waybar.nix ]; diff --git a/snowflake/modules/home/programs/cli/less/default.nix b/modules/nixos/programs/less.nix similarity index 54% rename from snowflake/modules/home/programs/cli/less/default.nix rename to modules/nixos/programs/less.nix index d29cb56..3b9d03d 100644 --- a/snowflake/modules/home/programs/cli/less/default.nix +++ b/modules/nixos/programs/less.nix @@ -1,6 +1,7 @@ { - lib, config, + lib, + pkgs, ... }: let cfg = config.marleyos.programs.less; @@ -8,12 +9,14 @@ in { options.marleyos.programs.less.enable = lib.mkEnableOption "less"; config = lib.mkIf cfg.enable { - programs.less.enable = true; + programs.less = { + enable = true; - home.sessionVariables = { - LESS = "-R"; + envVariables = { + LESS = "-R"; + }; + + lessopen = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; }; - - programs.lesspipe.enable = true; }; }