summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/.guix-env5
-rw-r--r--vim/.vimrc4
-rw-r--r--zsh/.zshenv9
3 files changed, 11 insertions, 7 deletions
diff --git a/guix/.guix-env b/guix/.guix-env
index 5482c74..821079b 100644
--- a/guix/.guix-env
+++ b/guix/.guix-env
@@ -5,7 +5,7 @@ export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
export LC_ALL=en_US.utf8
# Paths
-export PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH"
+# export PATH="$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin${PATH:+:}$PATH"
# export CPATH="/home/urbain/.guix-profile/include${CPATH:+:}$CPATH"
# export LIBRARY_PATH="/home/urbain/.guix-profile/lib${LIBRARY_PATH:+:}$LIBRARY_PATH"
@@ -20,11 +20,12 @@ 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"
# Cmake
-export CMAKE_PREFIX_PATH="/home/urbain/.guix-profile/${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH"
+# export CMAKE_PREFIX_PATH="/home/urbain/.guix-profile/${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH"
# vim: set ft=sh
diff --git a/vim/.vimrc b/vim/.vimrc
index 72ca6d7..09a84f0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -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"