Minor changes

6 files changed, 28 insertions, 41 deletions

diff --git a/Xresources/.Xresources/base b/Xresources/.Xresources/base
index 67d6f1a..b9ff079 100644
--- a/Xresources/.Xresources/base
+++ b/Xresources/.Xresources/base
@@ -33,6 +33,5 @@ URxvt*scrollBar: false
 URxvt*internalBorder: 0
 URxvt.fading: 35
 
-
 ! $TERM environment variable
-XTerm*termName: rxvt-256color
+URxvt*.termName: rxvt-unicode-256color
diff --git a/guix/.guix-profile b/guix/.guix-profile
new file mode 100644
index 0000000..d1495ae
--- /dev/null
+++ b/guix/.guix-profile
@@ -0,0 +1,13 @@
+# Guix
+export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
+export GUIX_PACKAGE_PATH=$HOME/Dropbox/projects/guix-packages
+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"
+
+# Guile
+export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/2.2:$GUILE_LOAD_PATH
+export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/2.2/site-ccache:$GUILE_LOAD_COMPILED_PATH
+export GUILE_WARN_DEPRECATED=detailed
+
+# vim: set ft=sh
diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py
index 6b123af..2ad65f9 100644
--- a/qutebrowser/.config/qutebrowser/config.py
+++ b/qutebrowser/.config/qutebrowser/config.py
@@ -9,8 +9,8 @@ c.hints.uppercase = True
 c.tabs.favicons.show = False
 c.tabs.show = 'multiple'
 c.tabs.tabs_are_windows = True
-c.url.default_page = 'about:blank'
-c.url.start_pages = ['about:blank']
+c.url.start_pages = ['file:///home/urbain/personal/index.html']
+c.url.default_page = c.url.start_pages[0]
 
 # Bindings for normal mode
 config.bind(",b", 'spawn --userscript explorer -b')
@@ -41,12 +41,14 @@ config.bind("<Ctrl-i>", 'open-editor', mode='insert')
 
 # Bindings for command mode
 config.bind('<Ctrl-W>', 'fake-key -g <Ctrl-Backspace>', mode='command')
+config.bind('<Ctrl-P>', 'completion-item-focus prev', mode='command')
+config.bind('<Ctrl-N>', 'completion-item-focus next', mode='command')
 
 # Search engines
 c.url.searchengines = {
     'DEFAULT': 'https://startpage.com/do/search?query={}',
     'yt': 'https://www.youtube.com/results?search_query={}',
     'ddg': 'https://duckduckgo.com/?q={}',
-    'google': 'https://duckduckgo.com/?q={}',
+    'google': 'https://www.google.com/search?hl=en&q={}',
     'aw': 'https://wiki.archlinux.org/index.php?search={}',
 }
diff --git a/vim/.vimrc b/vim/.vimrc
index 00c3816..6b9c2f0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -17,12 +17,10 @@ Plug 'beloglazov/vim-online-thesaurus'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'critiqjo/lldb.nvim'
 Plug 'easymotion/vim-easymotion'
-Plug 'embear/vim-localvimrc'
 Plug 'holomorph/vim-freefem'
 Plug 'honza/vim-snippets'
 Plug 'inkarkat/vim-SpellCheck'
 Plug 'inkarkat/vim-ingo-library'
-Plug 'kopischke/vim-stay'
 Plug 'jamessan/vim-gnupg'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
@@ -74,10 +72,9 @@ endif
 " Colors
 Plug 'altercation/vim-colors-solarized'
 Plug 'KKPMW/moonshine-vim'
-Plug 'arcticicestudio/nord-vim'
 Plug 'junegunn/seoul256.vim'
-Plug 'noah/vim256-color'
 Plug 'romainl/Apprentice'
+Plug 'josuegaleas/jay'
 call plug#end()
 
 "" Plugin mappings
@@ -90,7 +87,7 @@ nnoremap cpt :TagbarToggle<cr>
 nnoremap cpu :GundoToggle<cr>
 
 " Easy motion
-map <Leader>s <Plug>(easymotion-prefix)
+map gs <Plug>(easymotion-prefix)
 
 " Fuzzy finder
 nnoremap <c-p>a  :Ag
@@ -218,7 +215,6 @@ let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
 " Vimtex
 let g:vimtex_fold_enabled=0
 let g:vimtex_view_method='zathura'
-let g:vimtex_latexmk_continuous=1
 let g:vimtex_quickfix_mode=2
 let g:vimtex_compiler_progname='nvr'
 
@@ -261,6 +257,7 @@ set conceallevel=2
 set cursorline
 set diffopt=filler,vertical
 set expandtab
+set exrc
 set foldmethod=marker
 set hidden
 set ignorecase
@@ -350,7 +347,7 @@ endif
 
 "" Colorscheme
 let g:airline_theme='deus'
-colo apprentice
+colo seoul256
 
 
 "" Autocommands
@@ -406,11 +403,6 @@ function! Cycle_searchprg()
     echom g:my_searchprg
 endfunction
 
-nmap <silent> cog :call Cycle_searchprg()<cr>
-nmap <silent> gs :set opfunc=My_search<cr>g@
-xmap <silent> gs :call Search(visualmode())<cr>
-
-" nmap gs :let g:my_searchprg="Grep"<cr>:set opfunc=My_search<cr>g@
-" nmap g/ :let g:my_searchprg="GitGrep"<cr>:set opfunc=My_search<cr>g@
-" xmap gs :<c-u>let g:my_searchprg="Grep"<cr>:call Search(visualmode())<cr>
-" xmap g/ :<c-u>let g:my_searchprg="GitGrep"<cr>:call Search(visualmode())<cr>
+nmap <silent> co/ :call Cycle_searchprg()<cr>
+nmap <silent> g/ :set opfunc=My_search<cr>g@
+xmap <silent> g/ :call Search(visualmode())<cr>
diff --git a/zsh/.zsh/functions b/zsh/.zsh/functions
index 411f27a..c5bbb09 100644
--- a/zsh/.zsh/functions
+++ b/zsh/.zsh/functions
@@ -27,19 +27,6 @@ function colo {
     # Change color for future sessions
     xrdb ${XRESOURCE_FILE}
 
-    # Update termite colorscheme
-    TERMITE_CONFIG=~/.config/termite/config
-    while read -r line || [[ -n "$line" ]]; do
-        case "$line" in
-            *background* ) sed -i "s/^background.*$/background = ${line##* }/" ${TERMITE_CONFIG} ;;
-            *foreground* ) sed -i "s/^foreground.*$/foreground = ${line##* }/" ${TERMITE_CONFIG} ;;
-            *cursorColor* ) sed -i "s/^cursor.*$/cursor = ${line##* }/" ${TERMITE_CONFIG} ;;
-            *color[0-9]* ) color=$(echo ${line/:*/} | sed 's/.*color\([0-9]\+\)/\1/');
-                sed -i "s/^color${color}\>.*$/color${color} = ${line##* }/" ${TERMITE_CONFIG} ;;
-            * ) ;;
-        esac
-    done < ${XRESOURCE_FILE}
-
     # Change default environment variable for future sessions
     mkdir -p $(dirname ${ZSH_COLORS})
 
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 140e8fd..95701e8 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,10 +1,4 @@
 export ZDOTDIR=$HOME/.zsh
+export PATH="$HOME/bin:$HOME/bin:/usr/lib/surfraw${PATH:+:}$PATH"
 
-# Guix stuff
-export PATH="$HOME/bin:$HOME/.guix-profile/bin:$HOME/.guix-profile/sbin:$HOME/bin:/usr/lib/surfraw${PATH:+:}$PATH"
-export GUIX_LOCPATH=$HOME/.guix-profile/lib/locale
-export GUIX_PACKAGE_PATH=$HOME/Dropbox/projects/guix-packages
-export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/2.2:$GUILE_LOAD_PATH
-export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/2.2/site-ccache:$GUILE_LOAD_COMPILED_PATH
-export CPATH="/home/urbain/.guix-profile/include${CPATH:+:}$CPATH"
-export LIBRARY_PATH="/home/urbain/.guix-profile/lib${LIBRARY_PATH:+:}$LIBRARY_PATH"
+source $HOME/.guix-profile