diff options
| -rwxr-xr-x | bin/bin/keyboard | 2 | ||||
| -rwxr-xr-x | git/.git_template/hooks/ctags | 3 | ||||
| -rw-r--r-- | guix/.guix-env | 1 | ||||
| -rw-r--r-- | vim/.vimrc | 4 | ||||
| -rw-r--r-- | zsh/.zshenv | 9 |
5 files changed, 11 insertions, 8 deletions
diff --git a/bin/bin/keyboard b/bin/bin/keyboard index e0cf952..11b13d1 100755 --- a/bin/bin/keyboard +++ b/bin/bin/keyboard @@ -22,7 +22,7 @@ xcape -e 'Mode_switch=Multi_key' # Make Caps_Lock (Control_L, Escape) xmodmap -e "clear Lock" -xmodmap -e "keysym Caps_Lock = Control_L Caps_Lock" +xmodmap -e "keysym Caps_Lock = Control_L Control_L" xmodmap -e "add Control = Control_L" xcape -e 'Control_L=Escape' diff --git a/git/.git_template/hooks/ctags b/git/.git_template/hooks/ctags index a9a2150..6fc53b6 100755 --- a/git/.git_template/hooks/ctags +++ b/git/.git_template/hooks/ctags @@ -1,8 +1,7 @@ #!/bin/sh set -e PATH="/usr/local/bin:$PATH" -dir="`git rev-parse --git-dir`" +dir="$(git rev-parse --git-dir)" trap 'rm -f "$dir/$$.tags"' EXIT git ls-files | ctags --tag-relative -L - -f"$dir/$$.tags" --languages=-javascript,sql mv "$dir/$$.tags" "$dir/tags" - diff --git a/guix/.guix-env b/guix/.guix-env index 1a97ec8..821079b 100644 --- a/guix/.guix-env +++ b/guix/.guix-env @@ -20,6 +20,7 @@ export GUILE_WARN_DEPRECATED=detailed # Python # export GUIX_GTK3_PATH="/home/urbain/.guix-profile/lib/gtk-3.0${GUIX_GTK3_PATH:+:}$GUIX_GTK3_PATH" # export PYTHONPATH="/home/urbain/.guix-profile/lib/python3.6/site-packages${PYTHONPATH:+:}$PYTHONPATH" +# export PYTHONPATH="/home/urbain/.guix-profile/lib/python3.5/site-packages${PYTHONPATH:+:}$PYTHONPATH" # export GI_TYPELIB_PATH="/home/urbain/.guix-profile/lib/girepository-1.0${GI_TYPELIB_PATH:+:}$GI_TYPELIB_PATH" # export XDG_DATA_DIRS="/home/urbain/.guix-profile/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" # export GIO_EXTRA_MODULES="/home/urbain/.guix-profile/lib/gio/modules${GIO_EXTRA_MODULES:+:}$GIO_EXTRA_MODULES" @@ -48,6 +48,7 @@ Plug 'tommcdo/vim-exchange' Plug 'tommcdo/vim-ninja-feet' Plug 'ton/vim-bufsurf' Plug 'tpope/vim-abolish' +Plug 'tpope/vim-apathy' Plug 'tpope/vim-commentary' Plug 'tpope/vim-dispatch' Plug 'tpope/vim-eunuch' @@ -388,6 +389,9 @@ inoreabbrev <expr> #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype " Spell inoremap <c-s> <esc>1z=eA +" Unimpaired +nmap co =o + " }}} "" Colorscheme {{{ function! SaveColo(...) diff --git a/zsh/.zshenv b/zsh/.zshenv index aea57fc..d93fc42 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,12 +1,11 @@ export EDITOR=nvim export VISUAL=nvim -# Source guix & nix profiles +# Export PATH without repetitions +export -U PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin:$HOME/.gem/ruby/2.5.0/bin:/usr/lib/surfraw${PATH:+:}$PATH" + +# Source guix profile guix_profile=$HOME/.guix-env -nix_profile=$HOME/.nix-profile/etc/profile.d/nix.sh [[ -f $guix_profile ]] && . $guix_profile -[[ -f $nix_profile ]] && . $nix_profile -# Export PATH without repetitions -export -U PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin:$HOME/.gem/ruby/2.5.0/bin:/usr/lib/surfraw${PATH:+:}$PATH" |