summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Vertes <mvertes@free.fr>2025-11-12 10:55:54 +0100
committerMarc Vertes <mvertes@free.fr>2025-11-12 10:55:54 +0100
commitb1da6ec80307a953ce322c2fe882182163a64cf2 (patch)
tree29aee90d779aaeb3d82f56f3b26790023b0895de
parent095144f6c0b3a4ec5c546ee88506834aee4a9877 (diff)
parent3e1b474cd63143c3c2fb81c449b9f97f61ce31b6 (diff)
Merge branch 'master' of git.vertes.org:git/dotfiles
-rw-r--r--.bashrc20
-rw-r--r--.nexrc2
-rw-r--r--.vimrc4
3 files changed, 19 insertions, 7 deletions
diff --git a/.bashrc b/.bashrc
index 492946d..bd08795 100644
--- a/.bashrc
+++ b/.bashrc
@@ -19,6 +19,8 @@ stty -ixon # disable Ctrl-S
# Save and reload the history after each command finishes
#export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
+[ "$TERM" = xterm-256color ] && export COLORTERM=truecolors
+
# export GNUTERM='sixelgd enhanced truecolor font "arial,9"'
#
OS=${OS:-$(~/bin/os)}
@@ -30,7 +32,8 @@ case $OS in
[ "$OS" = arch ] || trap 'printf "\e]2;%s\a" "$TERM_TAG ${BASH_COMMAND%ps1}"' DEBUG
;;
(Darwin)
- alias ibrew='arch -x86_64 /usr/local/bin/brew'
+ # alias ibrew='arch -x86_64 /usr/local/bin/brew'
+ source /opt/local/share/fzf/shell/completion.bash
alias ls='ls -GF' ll='ls -AlGFhv'
alias ldd='otool -L'
trap 'printf "\e]2;%s\a" "$TERM_TAG ${BASH_COMMAND%update_terminal_cwd}"' DEBUG
@@ -50,6 +53,7 @@ export -f d p
[ "$OS" = alpine ] && export MANPAGER='vim +MANPAGER --not-a-term'
export LESS=iXFRx4
+# export SHELLCHECK_OPTS='-S warning'
#export BACKUP=bip:/home/backup/marc@$(hostname -s)
@@ -73,11 +77,15 @@ alias more='less'
alias oman='MANPAGER= man'
alias rg='rg --smart-case'
alias rot13='tr A-Za-z N-ZA-Mn-za-m'
-alias vi='vim'
-alias view='vim -R'
-alias ww='vi ~/Wiki/home_page.md'
+#alias vi='vim'
+#alias view='vim -R'
+alias vi='nvi'
+alias view='nview'
+alias ex='nex'
+alias ww='vim ~/Wiki/home_page.md'
alias y='rlwrap yaegi'
alias mp='rlwrap mp'
+alias hd='hexdump -C'
# yaegi debug
export YAEGI_DOT_CMD='dotty -'
@@ -99,7 +107,7 @@ meteo() {
curl -H "Accept-Language: fr" --compressed "$request"
}
-eval "$(fzf --bash)" >/dev/null
+#eval "$(fzf --bash)" >/dev/null
# Handle missing commands, unless already provided.
type -t command_not_found_handle >/dev/null || command_not_found_handle() {
@@ -107,7 +115,7 @@ type -t command_not_found_handle >/dev/null || command_not_found_handle() {
case $OS in
(alpine) pkgs=$(apk list -Pq "cmd:$1" | awk '{print $2}') ;;
(arch) pkgs=$(pkgfile -b "$1") ;;
- (Darwin) pkgs=$(brew which-formula "$1") ;;
+ (Darwin) # pkgs=$(brew which-formula "$1") ;;
esac
echo "$1: command not found${pkgs:+. Present in: $pkgs}" >&2
}
diff --git a/.nexrc b/.nexrc
index f6e9e30..6ae2673 100644
--- a/.nexrc
+++ b/.nexrc
@@ -21,3 +21,5 @@ map gn /[A-Z][A-Za-z0-9_]+[A-Z]/
" Jump to go identifier definition using dynamic tag.
map gd D:+1,$d :1,$!wc -c 0cw:!gotag % "yddu..@y :ta _
+
+map [27;5;36~ 
diff --git a/.vimrc b/.vimrc
index 96983d3..93c3247 100644
--- a/.vimrc
+++ b/.vimrc
@@ -124,8 +124,10 @@ endfunction
noremap <leader><leader> :call CloseOnLast()<cr>
" vim-go settings
-let g:go_gopls_enabled = 0
+" let g:go_gopls_enabled = 0
+let g:go_gopls_enabled = 1
let g:go_def_mode = 'godef'
+" let g:go_referrers_mode = 'godef'
let g:go_fmt_command = 'goimports'
let g:go_imports_mode = 'goimports'
let g:go_rename_command = 'gorename'