From 12f96a8384df11f4484bb6ebfe28eb6eccc51139 Mon Sep 17 00:00:00 2001
From: Deposite Pirate
Date: Sun, 4 May 2025 16:25:27 +0200
Subject: Add vimdiff alias for nvim. Use nvim/vim for viewing manpages.

	modified:   conf.d/04editor.fish
---
 conf.d/04editor.fish | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'conf.d/04editor.fish')

diff --git a/conf.d/04editor.fish b/conf.d/04editor.fish
index 5477860..077d7a1 100644
--- a/conf.d/04editor.fish
+++ b/conf.d/04editor.fish
@@ -10,13 +10,16 @@ if status is-interactive
       case 'nvim'
         alias vi nvim
         alias vim nvim
+        alias vimdiff 'nvim -d'
         alias vicfg 'nvim ~/.config/nvim/init.lua'
         alias vipcfg 'nvim ~/.config/nvim/plugins'
+        set -x MANPAGER 'nvim +Man!'
       case 'vim'
         alias vi vim
         alias nvim vim
         alias vicfg 'vim ~/.config/vim/init.vim'
         alias vipcfg 'vim ~/.config/vim/plugins'
+        set -x MANPAGER 'vim +MANPAGER --not-a-term -'
       case 'vi'
         alias vim vi
         alias nvim vi
@@ -97,11 +100,6 @@ if status is-interactive
         alias rawpager 'more'
     end
 
-    if command -sq 'bat'; and test (uname) = 'Linux'
-      set -x MANROFFOPT '-c'
-      set -x MANPAGER 'fish -c "col -bx | bat -l man -p"'
-    end
-
     # If $PAGER is unset, set it
     if test -z "$PAGER"
       set -x PAGER $found_pager
-- 
cgit v1.3.1


From 0753487fc7fd66aad328ae4ced53e86d3c7c4ebc Mon Sep 17 00:00:00 2001
From: Deposite Pirate
Date: Sun, 4 May 2025 18:31:12 +0200
Subject: Change pager order

	modified:   conf.d/04editor.fish
---
 conf.d/04editor.fish | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf.d/04editor.fish')

diff --git a/conf.d/04editor.fish b/conf.d/04editor.fish
index 077d7a1..140740e 100644
--- a/conf.d/04editor.fish
+++ b/conf.d/04editor.fish
@@ -64,7 +64,7 @@ if status is-interactive
   alias_if mousepad xedit
 
   # Pagers to look for by order of preference
-  set -f pagers 'moar' 'less' 'most' 'more'
+  set -f pagers 'moar' 'most' 'less' 'more'
   set -f found_pager (find_prog $pagers)
 
   if test -n "$found_pager"
-- 
cgit v1.3.1