summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bashrc18
-rw-r--r--.gitconfig2
-rw-r--r--.gitignore_global6
-rw-r--r--.profile1
-rwxr-xr-x.vim/pack/mvertes/install.sh1
-rwxr-xr-xbin/vm1
6 files changed, 21 insertions, 8 deletions
diff --git a/.bashrc b/.bashrc
index e6cb457..cd8ba5d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -18,7 +18,7 @@ shopt -s histappend # append to history, don't overwrite it
# cf 9x15
# cf xft:Monospace:size=12
# cf "xft:Bitstream Vera Sans Mono:size=8:antialias=true
-cf() { printf '\e]710;%s\007' "${1:-fixed}"; }
+# cf() { printf '\e]710;%s\007' "${1:-fixed}"; }
p() { [ -f "$1" -a ! -x "$1" ] && less -XF $1 || "$@" 2>&1 | less -XF ; }
export -f p
@@ -38,7 +38,9 @@ export LESS=XFRx4
# gnuplot display in terminal
export GNUTERM='sixelgd enhanced truecolor font "arial,9"'
-export BACKUP=bip:/home/backup/marc@m1
+#export BACKUP=bip:/home/backup/marc@m1
+
+export DOT='dotty -'
# Stopwatch
alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date'
@@ -49,8 +51,8 @@ alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date
#alias ls='ls --color=auto -v'
alias ls='ls -GF'
alias ll='ls -AlGFhv'
-alias vi='vim'
-alias view='vim -R'
+#alias vi='vim'
+#alias view='vim -R'
alias ldd='otool -L'
alias ibrew='arch -x86_64 /usr/local/bin/brew'
#alias op='xdg-open'
@@ -67,8 +69,8 @@ alias gol='GO111MODULE=off go'
alias gtr='go test -v -run'
alias gtb='go test -v -cpuprofile cpu.out -memprofile mem.out -benchmem -bench'
alias rvi='sudo vim'
-alias rxt='sudo xt'
-alias rxvi='sudo xvi'
+#alias rxt='sudo xt'
+#alias rxvi='sudo xvi'
alias ww='(cd ~/Wiki && vi home_page.md)'
alias s='(cd ~/Wiki && vi scratch.md)'
alias dotfiles='git --git-dir=$HOME/dotfiles --work-tree=$HOME'
@@ -85,7 +87,7 @@ alias dotfiles='git --git-dir=$HOME/dotfiles --work-tree=$HOME'
#alias cryptsetup='sudo cryptsetup'
alias by='go build ./cmd/yaegi'
-alias by8='go1.18.3 build ./cmd/yaegi'
+#alias by8='go1.18.3 build ./cmd/yaegi'
alias cy='cd ~/go/src/github.com/traefik/yaegi'
#alias ty='go test -v -short ./interp'
alias y='rlwrap -pblue yaegi'
@@ -93,7 +95,7 @@ alias dy='YAEGI_AST_DOT=1 YAEGI_CFG_DOT=1 ./yaegi'
alias wai='~/go/src/github.co/traefik/whoami/whoami'
# yaegi debug
-export YAEGI_DOT_CMD='dotty -'
+export YAEGI_DOT_CMD="$DOT"
export YAEGI_UNSAFE=1
export YAEGI_UNRESTRICTED=1
export YAEGI_SYSCALL=1
diff --git a/.gitconfig b/.gitconfig
index e57e38b..4deaf03 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,3 +20,5 @@
defaultBranch = main
[push]
autoSetupRemote = true
+[core]
+ excludesfile = /Users/marc/.gitignore_global
diff --git a/.gitignore_global b/.gitignore_global
new file mode 100644
index 0000000..0f2078b
--- /dev/null
+++ b/.gitignore_global
@@ -0,0 +1,6 @@
+.*.swp
+.DS_Store
+*.dll
+*.o
+*.so
+tags
diff --git a/.profile b/.profile
index 93f1fb2..ef396f0 100644
--- a/.profile
+++ b/.profile
@@ -3,6 +3,7 @@
PATH=~/bin:/opt/homebrew/bin:/opt/homebrew/opt/ruby/bin:/opt/homebrew/opt/tcl-tk/bin:$PATH:~/go/bin:~/.cargo/bin
export REPLYTO='mvertes@free.fr'
+export LANG=en_US.UTF-8
if [ -z "$SSH_AUTH_SOCK" ] ; then
eval `ssh-agent -s`
diff --git a/.vim/pack/mvertes/install.sh b/.vim/pack/mvertes/install.sh
index 48d5950..9ce210e 100755
--- a/.vim/pack/mvertes/install.sh
+++ b/.vim/pack/mvertes/install.sh
@@ -5,6 +5,7 @@ git@github.com:mvertes/vimki
git@github.com:fatih/vim-go
git@github.com:othree/xml.vim
git@github.com:junegunn/fzf.vim
+git@github.com:rust-lang/rust.vim
'
ht='test -d doc && vim -c "helptags doc" -c "q"'
diff --git a/bin/vm b/bin/vm
index a1c7ae6..779672e 100755
--- a/bin/vm
+++ b/bin/vm
@@ -197,6 +197,7 @@ start_vm() (
${initrd+-i "$initrd"} \
${hda+-d "$hda"} \
${hdb+-d "$hdb"} \
+ ${hdc+-d "$hdc"} \
${iso+-c "$iso"} \
${cpu+-p "$cpu"} \
${ram+-m "$ram"} \