From 2cd771c838f3f8738d379dc0bbe9c3f3ce787812 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Tue, 29 Mar 2022 15:29:10 +0200 Subject: [PATCH] Use less as general pager I tried nvimpager but it was a bit complex for me to re use existing Neovim settings tweak for specific usage as pager. I decided to stick with less for everything. --- home/programs/git.nix | 7 ------- home/programs/neovim.nix | 1 - home/programs/zsh.nix | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/home/programs/git.nix b/home/programs/git.nix index 03188bd..c3ddc52 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -81,13 +81,6 @@ ui = "auto"; }; - pager = { - branch = false; - show = false; - log = toString pkgs.less + "/bin/less"; - diff = toString pkgs.less + "/bin/less"; - }; - grep = { lineNumber = true; }; diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index d4fb30c..b68cc09 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -182,7 +182,6 @@ in { # TODO: Check out these plugins as additions / replacements: # - https://github.com/glacambre/firenvim Give it another try, integrates neovim into firefox - # - https://github.com/lambdalisue/vim-pager/ (try once I use neovim as pager again) # - https://github.com/sindrets/diffview.nvim/ # - https://github.com/weilbith/nvim-code-action-menu/ Check again in future, right now not of much useness on my setup. diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index e4b2b5c..9166be5 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -13,7 +13,8 @@ LANG = "en_US.UTF-8"; LANGUAGE = "en_US"; - EDITOR = "nvim"; + PAGER = "${pkgs.less}/bin/less"; + EDITOR = "${pkgs.neovim}/bin/nvim"; SHELL = "${pkgs.zsh}/bin/zsh"; LESS = "-R -J -W -i -M";