diff --git a/bat/config b/bat/config index d940c6e..ac21fae 100644 --- a/bat/config +++ b/bat/config @@ -10,7 +10,7 @@ # terminal emulators (like tmux, by default): #--italic-text=always # ---wrap=never +#--wrap=never # Uncomment the following line to disable automatic paging: #--paging=never diff --git a/dot/file/gitconfig b/dot/file/gitconfig index f6445fd..9f622d4 100644 --- a/dot/file/gitconfig +++ b/dot/file/gitconfig @@ -28,5 +28,11 @@ [pull] ff = only -[credential] + +[color] + diff = auto + status = auto + branch = auto + ui = auto + pager = true diff --git a/dot/file/profile b/dot/file/profile index d7f4316..bfe7a07 100755 --- a/dot/file/profile +++ b/dot/file/profile @@ -84,7 +84,7 @@ fi export DEV="$HOME/dev" # CLI. - export LESS="--RAW-CONTROL-CHARS --quit-if-one-screen --clear-screen --tilde --chop-long-lines --status-column --rscroll='>'" + export LESS="" export ENV="$HOME/.shrc" export PROMPT="; " export PS1="$PROMPT" @@ -93,7 +93,7 @@ fi export VISUAL="$EDITOR" export GIT_EDITOR="$VISUAL" export PAGER=`which-first bat less more cat` - export MANPAGER="$PAGER" + export MANPAGER="`which-first less more`" export CMDHIST="$ETC/cmds" export CMDHISTMAX="100" @@ -120,6 +120,7 @@ fi # CLI. + export CLI_DMENU=`which-first fzf` export CLI_FILE_MANAGER=`which-first lf` # X/Wayland stuff. @@ -147,6 +148,7 @@ fi export XDISPLAY_REGION_SCREENSHOT='slurp | grim -g - - | wl-copy' export XVIDEO_PLAYER='mpv' export XLINK_VIDEO_PLAYER='mpv' + export XTYPE='wtype' # Android. export ANDROID_HOME="$HOME/app/android/Sdk" @@ -163,14 +165,21 @@ vedit(){ $VISUAL $@ } +# Editor. edit(){ $EDITOR $@ } +# Run pager. page() { $PAGER $@ } +# Manual find. +manf() { + man `man -k . | $CLI_DMENU -e -1 $(if test ! -z $@ ; then echo -- -q "$@" ; fi ) | awk '{print $1}'` +} + export GPG_TTY=$(tty) export SSH_TTY=$(tty) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 13e1d6e..7686f6a 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -9,3 +9,5 @@ font_size 11 disable_ligatures cursor +background_opacity 0.75 + diff --git a/lf/previewer b/lf/previewer index 06e72f2..53ac0b1 100755 --- a/lf/previewer +++ b/lf/previewer @@ -23,5 +23,9 @@ case "$(file -Lb --mime-type "$file")" in ;; esac -pistol "$file" +if which bat> /dev/null ; then + pistol "$file" | bat +else + pistol "$file" +fi diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 550bb09..57307f6 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -18,7 +18,7 @@ "on-scroll-down" : "riverctl send-layout-cmd rivertile 'main-ratio -0.05'", "on-scroll-up" : "riverctl send-layout-cmd rivertile 'main-ratio +0.05'", "on-click" : "riverctl send-layout-cmd rivertile 'main-count +1'", - "on-click-right" : "riverctl send-layout-cmd rivertile 'main-count -1'", + "on-click-right" : "riverctl send-layout-cmd rivertile 'main-count -1'" }, "privacy": { "icon-spacing": 4, @@ -46,7 +46,7 @@ "modules-left": [ "river/tags", "river/mode", - "river/window", + "river/window" ], "custom/bar" : {