dotfiles

Merge branch 'main' of nonplanar.org:dotfiles

diff --git a/.config/vifm/colors/Default.vifm b/.config/vifm/colors/Default.vifm
@@ -0,0 +1,100 @@
+" You can edit this file by hand.
+" The " character at the beginning of a line comments out the line.
+" Blank lines are ignored.
+
+" The Default color scheme is used for any directory that does not have
+" a specified scheme and for parts of user interface like menus. A
+" color scheme set for a base directory will also
+" be used for the sub directories.
+
+" The standard ncurses colors are:
+" Default = -1 = None, can be used for transparency or default color
+" Black = 0
+" Red = 1
+" Green = 2
+" Yellow = 3
+" Blue = 4
+" Magenta = 5
+" Cyan = 6
+" White = 7
+
+" Light versions of colors are also available (they set bold
+" attribute in terminals with less than 16 colors):
+" LightBlack
+" LightRed
+" LightGreen
+" LightYellow
+" LightBlue
+" LightMagenta
+" LightCyan
+" LightWhite
+
+" Available attributes (some of them can be combined):
+" bold
+" underline
+" reverse or inverse
+" standout
+" italic (on unsupported systems becomes reverse)
+" combine
+" none
+
+" Vifm supports 256 colors you can use color numbers 0-255
+" (requires properly set up terminal: set your TERM environment variable
+" (directly or using resources) to some color terminal name (e.g.
+" xterm-256color) from /usr/lib/terminfo/; you can check current number
+" of colors in your terminal with tput colors command)
+
+" highlight group cterm=attrs ctermfg=foreground_color ctermbg=background_color
+
+highlight clear
+
+highlight Win cterm=none ctermfg=white ctermbg=black
+highlight Directory cterm=bold ctermfg=blue ctermbg=default
+highlight Link cterm=bold ctermfg=yellow ctermbg=default
+highlight BrokenLink cterm=bold ctermfg=red ctermbg=default
+highlight HardLink cterm=none ctermfg=yellow ctermbg=default
+highlight Socket cterm=bold ctermfg=magenta ctermbg=default
+highlight Device cterm=bold ctermfg=red ctermbg=default
+highlight Fifo cterm=bold ctermfg=cyan ctermbg=default
+highlight Executable cterm=bold ctermfg=green ctermbg=default
+highlight Selected cterm=bold ctermfg=magenta ctermbg=default
+highlight CurrLine cterm=bold,reverse,standout ctermfg=default ctermbg=default
+highlight TopLine cterm=none ctermfg=white ctermbg=black
+highlight TopLineSel cterm=bold ctermfg=black ctermbg=default
+highlight StatusLine cterm=bold ctermfg=white ctermbg=black
+highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black
+highlight CmdLine cterm=none ctermfg=white ctermbg=black
+highlight ErrorMsg cterm=none ctermfg=red ctermbg=black
+highlight Border cterm=none ctermfg=black ctermbg=black
+highlight OtherLine ctermfg=default ctermbg=default
+highlight JobLine cterm=bold,reverse,standout ctermfg=black ctermbg=white
+highlight SuggestBox cterm=bold ctermfg=default ctermbg=default
+highlight CmpMismatch cterm=bold ctermfg=white ctermbg=red
+highlight CmpUnmatched cterm=bold ctermfg=white ctermbg=green
+highlight CmpBlank ctermfg=default ctermbg=default
+highlight AuxWin ctermfg=default ctermbg=default
+highlight TabLine cterm=none ctermfg=white ctermbg=black
+highlight TabLineSel cterm=bold,reverse,standout ctermfg=default ctermbg=default
+highlight User1 ctermfg=default ctermbg=default
+highlight User2 ctermfg=default ctermbg=default
+highlight User3 ctermfg=default ctermbg=default
+highlight User4 ctermfg=default ctermbg=default
+highlight User5 ctermfg=default ctermbg=default
+highlight User6 ctermfg=default ctermbg=default
+highlight User7 ctermfg=default ctermbg=default
+highlight User8 ctermfg=default ctermbg=default
+highlight User9 ctermfg=default ctermbg=default
+highlight User10 ctermfg=default ctermbg=default
+highlight User11 ctermfg=default ctermbg=default
+highlight User12 ctermfg=default ctermbg=default
+highlight User13 ctermfg=default ctermbg=default
+highlight User14 ctermfg=default ctermbg=default
+highlight User15 ctermfg=default ctermbg=default
+highlight User16 ctermfg=default ctermbg=default
+highlight User17 ctermfg=default ctermbg=default
+highlight User18 ctermfg=default ctermbg=default
+highlight User19 ctermfg=default ctermbg=default
+highlight User20 ctermfg=default ctermbg=default
+highlight OtherWin ctermfg=default ctermbg=default
+highlight LineNr ctermfg=default ctermbg=default
+highlight OddLine ctermfg=default ctermbg=default

diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
@@ -1,17 +1,3 @@
-" vim: filetype=vifm :
-" Sample configuration file for vifm (last updated: 3 April, 2023)
-" You can edit this file by hand.
-" The " character at the beginning of a line comments out the line.
-" Blank lines are ignored.
-" The basic format for each item is shown with an example.
-
-" ------------------------------------------------------------------------------
-" Main settings
-" ------------------------------------------------------------------------------
-
-" Command used to edit files in various contexts.  The default is vim.
-" If you would like to use another vi clone such as Elvis or Vile
-" you will need to change this setting.
 if executable('vim')
     set vicmd=vim
 elseif executable('nvim')

@@ -25,18 +11,8 @@ elseif $EDITOR != ''
     let &vicmd = $EDITOR
 endif
 
-" This makes vifm perform file operations on its own instead of relying on
-" standard utilities like `cp`.  While using `cp` and alike is a more universal
-" solution, it's also much slower when processing large amounts of files and
-" doesn't support progress measuring.
 set syscalls
 
-" Trash Directory
-" The default is to move files that are deleted with dd or :d to
-" the trash directory.  If you change this you will not be able to move
-" files by deleting them and then using p to put the file in the new location.
-" I recommend not changing this until you are familiar with vifm.
-" This probably shouldn't be an option.
 set trash
 
 " What should be saved automatically on restarting vifm.  Drop "savedirs"

@@ -58,7 +34,7 @@ set undolevels=100
 
 " Use Vim's format of help file (has highlighting and "hyperlinks").
 " If you would rather use a plain text help file set novimhelp.
-set vimhelp
+set novimhelp
 
 " If you would like to run an executable file when you
 " press Enter, l or Right Arrow, set this.

@@ -99,7 +75,7 @@ if !has('win')
 endif
 
 " Set custom status line look
-set statusline="  Hint: %z%= %A %10u:%-7g %15s %20d  "
+set statusline="%A %10u:%-7g %15s %20d  "
 
 
 " ------------------------------------------------------------------------------

@@ -108,6 +84,7 @@ set statusline="  Hint: %z%= %A %10u:%-7g %15s %20d  "
 
 " :mark mark /full/directory/path [filename]
 
+mark c ~/.config/vifm/
 mark b ~/.local/bin/
 mark h ~/
 mark l ~/AppData/Local

@@ -465,7 +442,7 @@ if has('win')
     nnoremap yp :!echo %"d:gs!\!/! %i | clip<cr>
     " Yank path to current file to Windows clipboard with forward slashes
     nnoremap yf :!echo %"c:gs!\!/! %i | clip<cr>
-elseif $WAYLAND_DISPLAY
+elseif $WAYLAND_DISPLAY + ''
     if executable('wl-copy')
         " Yank current directory path into primary and selection clipboards
         nnoremap yd :!echo -n %d | wl-copy %i &&

@@ -474,7 +451,7 @@ elseif $WAYLAND_DISPLAY
         nnoremap yf :!echo -n %c:p | wl-copy %i &&
                     \ echo -n %c:p | wl-copy -p %i<cr>
     endif
-elseif $DISPLAY
+elseif $DISPLAY + ''
     if executable('xclip')
         " Yank current directory path into the clipboard
         nnoremap yd :!echo %d | xclip %i<cr>

@@ -561,12 +538,7 @@ nnoremap q :quit<cr>
 " Activate screen/tmux support
 " screen!
 
-" ------------------------------------------------------------------------------
-" Icon decorations example
-" ------------------------------------------------------------------------------
-
-" https://github.com/cirala/vifm_devicons
-colorscheme istib-solarized-dark
+colorscheme Default
 
 command create :
 \|  let $last_char = expand(system("str=\"%a\"; echo \"${str: -1}\""))

@@ -587,3 +559,5 @@ windo set viewcolumns=-85%{name},15%{size}
 set millerview
 set milleroptions+=rpreview:all
 set dotdirs-=nonrootparent
+
+only