general improvementsHEADmaster

4 files changed, 130 insertions, 31 deletions

diff --git a/basic/.bashrc b/basic/.bashrc
index 8fde8e3..491f7c9 100644
--- a/basic/.bashrc
+++ b/basic/.bashrc
@@ -25,7 +25,7 @@ shopt -s checkwinsize
 
 # If set, the pattern "**" used in a pathname expansion context will
 # match all files and zero or more directories and subdirectories.
-#shopt -s globstar
+shopt -s globstar
 
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
@@ -88,9 +88,10 @@ fi
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
 # some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+alias ll='ls -AlFh'    # mod vimene: -a -> -A, +'-h'
+alias llr='ls -rtAlFh' # mod vimene
+alias la='ls -Ah'      # mod vimene: +'-h'
+alias l='ls -CFh'      # mod vimene: +'-h'
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
@@ -117,8 +118,24 @@ if ! shopt -oq posix; then
 fi
 
 alias s='kitty +kitten ssh'
+alias v="vim '+set noma'"
 export VISUAL='vim'
 export EDITOR="$VISUAL"
 stty -ixon
-
-neofetch # j'ai honte
+alias man='MANWIDTH=$((COLUMNS > 80 ? 80 : COLUMNS)) man'
+alias ffmpeg='ffmpeg -hide_banner'
+alias ffprobe='ffprobe -hide_banner'
+alias objdump='objdump --visualize-jumps=extended-color'
+
+vimene_bc_add_files() {
+    local -a bc_files=('-l')
+    readarray -O ${#bc_files[@]} -d '' bc_files < <(find ~/bc -name '*.bc' -type f -print0)
+    export BC_ENV_ARGS="${bc_files[@]}"
+}
+vimene_bc_add_files
+unset vimene_bc_add_files
+
+urlencode() {
+    perl -MURI::Escape -e 'print uri_escape($ARGV[0]) . "\n"' "$1"
+}
+. "$HOME/.cargo/env"
diff --git a/basic/.config/kitty/kitty.conf b/basic/.config/kitty/kitty.conf
index 0009ad6..379a8cc 100644
--- a/basic/.config/kitty/kitty.conf
+++ b/basic/.config/kitty/kitty.conf
@@ -1,7 +1,25 @@
-include                 ./theme.conf
-font_family             Fira Code
-background_opacity      0.9
-remember_window_size    no
-initial_window_width    80c
-initial_window_height   25c
-enable_audio_bell       no
+# include               ./theme.conf
+font_family           Fira Code
+# font_family           BigBlue TerminalPlus
+# font_family           Monoid
+# font_size             9.0
+background_opacity    0.9
+remember_window_size  no
+initial_window_width  80c
+initial_window_height 24c
+enable_audio_bell     no
+# cursor_trail                 1
+# cursor_trail_decay           0.1 0.2
+# cursor_trail_start_threshold 10
+
+map ctrl+left  neighboring_window left
+map ctrl+right neighboring_window right
+
+map ctrl+equal             change_font_size all 11.0
+map ctrl+shift+plus        change_font_size all +4.5
+map ctrl+shift+kp_add      change_font_size all +4.5
+map ctrl+shift+minus       change_font_size all -4.5
+map ctrl+shift+kp_subtract change_font_size all -4.5
+map f1 new_tab_with_cwd
+
+# vim: ft=kitty
diff --git a/basic/.vim_bash_aliases b/basic/.vim_bash_aliases
new file mode 100644
index 0000000..e954934
--- /dev/null
+++ b/basic/.vim_bash_aliases
@@ -0,0 +1,4 @@
+shopt -s expand_aliases
+alias co="column -t -s= -o= -l2"
+
+# vim: ft=bash
diff --git a/basic/.vimrc b/basic/.vimrc
index a70fd4a..ed6e56a 100644
--- a/basic/.vimrc
+++ b/basic/.vimrc
@@ -1,16 +1,82 @@
-set nu
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set expandtab
-set autoindent
-set modeline
-set modelines=5
-set incsearch
-set exrc
-au BufNewFile,BufRead {configure.ac,*.m4} setlocal filetype=
-au BufNewFile,BufRead {*.am}              setlocal noexpandtab 
+" vim hardcodes background color erase even if the terminfo file does
+" not contain bce. This causes incorrect background rendering when
+" using a color theme with a background color in terminals such as
+" kitty that do not support background color erase.
+let &t_ut=''
+
+" An example for a vimrc file.
+"
+" Maintainer:	The Vim Project <https://github.com/vim/vim>
+" Last Change:	2023 Aug 10
+" Former Maintainer:	Bram Moolenaar <Bram@vim.org>
+"
+" To use it, copy it to
+"	       for Unix:  ~/.vimrc
+"	      for Amiga:  s:.vimrc
+"	 for MS-Windows:  $VIM\_vimrc
+"	      for Haiku:  ~/config/settings/vim/vimrc
+"	    for OpenVMS:  sys$login:.vimrc
+
+" When started as "evim", evim.vim will already have done these settings, bail
+" out.
+if v:progname =~? "evim"
+  finish
+endif
+
+" Get the defaults that most users want.
+source $VIMRUNTIME/defaults.vim
+
+if has("vms")
+  set nobackup		" do not keep a backup file, use versions instead
+else
+  set backup		" keep a backup file (restore to previous version)
+  if has('persistent_undo')
+    set undofile	" keep an undo file (undo changes after closing)
+  endif
+endif
+
+if &t_Co > 2 || has("gui_running")
+  " Switch on highlighting the last used search pattern.
+  set hlsearch
+endif
+
+" Put these in an autocmd group, so that we can delete them easily.
+augroup vimrcEx
+  au!
 
+  " For all text files set 'textwidth' to 78 characters.
+  autocmd FileType text setlocal textwidth=78
+augroup END
+
+" Add optional packages.
+"
+" The matchit plugin makes the % command work better, but it is not backwards
+" compatible.
+" The ! means the package won't be loaded right away but when plugins are
+" loaded during initialization.
+if has('syntax') && has('eval')
+  packadd! matchit
+endif
+
+" vimene
+set nu rnu ts=8 sts=4 sw=4 et ai ml mls=5 is ex bo=all
+ \ bs=indent,eol,start nofixeol udir=~/tmp bdir=~/tmp list lcs=tab:\ \ ,nbsp:~
+unlet c_comment_strings
+colo sorbet
+au BufNewFile,BufRead {.vimrc,*.vim,*.m4} setl sts=2 sw=2
+au BufNewFile,BufRead {configure.ac,*.m4} setl ft=
+au BufNewFile,BufRead {Makefile,*.am}     setl ts=4 sts=0 sw=0 noet
+au BufNewFile,BufRead {*.bc}              setl ts=2 sts=0 sw=0 noet
+au BufNewFile,BufRead {*.ac}              setl sts=2 sw=2 ft=m4
+au BufNewFile,BufRead {/etc/environment}  setl ft=sh
+au BufNewFile,BufRead {*.sh}              setl sts=2 sw=2
+
+let $BASH_ENV = "~/.vim_bash_aliases"
+
+filet plugin on
+se ofu=syntaxcomplete#Complete
+
+" kitty
 " Mouse support
 set mouse=a
 set ttymouse=sgr
@@ -52,9 +118,3 @@ execute "set <FocusLost>=\<Esc>[O"
 " Window title
 let &t_ST = "\e[22;2t"
 let &t_RT = "\e[23;2t"
-
-" vim hardcodes background color erase even if the terminfo file does
-" not contain bce. This causes incorrect background rendering when
-" using a color theme with a background color in terminals such as
-" kitty that do not support background color erase.
-let &t_ut=''