aboutsummaryrefslogtreecommitdiff
path: root/conf.d
diff options
context:
space:
mode:
authorDeposite Pirate2025-05-10 21:51:35 +0200
committerDeposite Pirate2025-05-10 21:51:35 +0200
commit1e3513d8df87f321d96225782435e3f092dcdbb2 (patch)
treecf30ac113dc8027f55cdfc2201728a4c93cc5153 /conf.d
parent1d72a5c95927cbc42c246b16763ec5b2fa91e6b3 (diff)
parent0753487fc7fd66aad328ae4ced53e86d3c7c4ebc (diff)
Merge branch 'main' of https://scm.midgard.lan/dpirate/fish
Diffstat (limited to 'conf.d')
-rw-r--r--conf.d/04editor.fish10
-rw-r--r--conf.d/05browser.fish4
2 files changed, 6 insertions, 8 deletions
diff --git a/conf.d/04editor.fish b/conf.d/04editor.fish
index 5477860..140740e 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
@@ -61,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"
@@ -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
diff --git a/conf.d/05browser.fish b/conf.d/05browser.fish
index f83f978..a5482d4 100644
--- a/conf.d/05browser.fish
+++ b/conf.d/05browser.fish
@@ -20,7 +20,7 @@ if status is-interactive; and not fish_is_root_user
if test -n "$WAYLAND_DISPLAY"; or test -n "$DISPLAY"; or test (uname) = 'Darwin'
# Graphical browsers to look for by order of preference
- set -f xbrowsers 'librewolf' 'firefox'
+ set -f xbrowsers 'librewolf' 'firefox' 'brave' 'palemoon' 'dillo'
set -f found_xbrowser (find_prog $xbrowsers)
if test -n "$found_xbrowser"
@@ -32,7 +32,7 @@ if status is-interactive; and not fish_is_root_user
end
# Console gopher browser to look for by order of preference
- set -f gbrowsers 'ncgopher'
+ set -f gbrowsers 'gopherus' 'ncgopher'
set -f found_gbrowser (find_prog $gbrowsers)
if test -n "$found_gbrowser"