Compare commits

...

4 commits

5 changed files with 65 additions and 10 deletions

View file

@ -41,3 +41,4 @@ alias showcolors='for i in {0..255} ; do \
printf "\n"; \
fi; done'
alias scanimage-arcoloc="scanimage -d 'smfp:net;192.168.0.202' --format=jpeg"

View file

@ -52,10 +52,18 @@ export TERMINAL="/usr/bin/terminator"
export LC_REALUSER='tbastian'
# Autojump
[ -f /etc/profile.d/autojump.bash ] && source /etc/profile.d/autojump.bash
# Opam
which opam > /dev/null 2>&1 && [ -d ~/.opam ] && eval $(opam config env)
# Gem
if [ -d "$HOME/.gem/ruby/2.4.0/bin" ] ; then
export PATH="$PATH:$HOME/.gem/ruby/2.4.0/bin"
gempath="$HOME/.gem/ruby"
if [ -d "$gempath" ] && [ "$(ls -1 $gempath | wc -l)" -gt 0 ]
then
cur_version=$(ls -1t $gempath | head -n 1)
cur_path="$gempath/$cur_version/bin"
export PATH="$PATH:$cur_path"
fi
unset gempath

View file

@ -9,6 +9,10 @@
[keybindings]
close_term = None
close_window = None
go_down = None
go_left = None
go_right = None
go_up = None
help = None
layout_launcher = None
next_profile = None
@ -27,8 +31,8 @@
background_image = None
background_type = transparent
cursor_color = "#fffeab"
custom_command = TERM='xterm-256color' bash -l
font = Monospace 8
custom_command = TERM='xterm-256color' $SHELL -l
font = DejaVu Sans Mono 9
foreground_color = "#faffb4"
scrollbar_position = hidden
show_titlebar = False
@ -56,10 +60,26 @@
palette = "#2e3436:#cc0000:#4e9a06:#ca5307:#3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#ff751d:#657689:#ad7fa8:#34e2e2:#eeeeec"
scrollbar_position = hidden
show_titlebar = False
<<<<<<< HEAD
[[vsmall_font]]
background_image = None
=======
use_system_font = False
[[projection_black]]
cursor_color = "#aaaaaa"
font = Inconsolata 20
foreground_color = "#ffffff"
scrollbar_position = hidden
use_system_font = False
[[vsmall_font]]
cursor_color = "#ffffff"
>>>>>>> 387b182... Terminator: cosmetic changes
font = Sans 6
foreground_color = "#ffffff"
use_system_font = False
[[with_titlebar]]
<<<<<<< HEAD
background_image = None
=======
cursor_color = "#aaaaaa"
>>>>>>> 387b182... Terminator: cosmetic changes

View file

@ -48,9 +48,9 @@ bind l send-keys 'C-l'
# Status bar
set -g status-bg colour237
set -g status-fg colour216
set -g status-attr dim
set -g status-style bg=colour237
set -ag status-style fg=colour216
set -ag status-style dim
set-option -g status-left '#[fg=colour196][#[fg=default]#S#[fg=colour196]]#[fg=default] '
set-option -g status-right \
'#[fg=colour196][#[fg=default]#(echo $USER)#[fg=colour196]@\
@ -58,6 +58,6 @@ set-option -g status-right \
#[fg=colour196][#[fg=default]#(date "+%H:%M %F")#[fg=colour196]]#[fg=defaultb'
# Current window
set-window-option -g window-status-current-bg colour215
set-window-option -g window-status-current-fg colour88
set-window-option -g window-status-current-style bg=colour215
set-window-option -ag window-status-current-style fg=colour88
set-window-option -g window-status-current-format ' #I:#W#F '

View file

@ -72,8 +72,9 @@ Plugin 'chrisbra/csv.vim'
Plugin 'let-def/vimbufsync'
Plugin 'the-lambda-church/coquille'
Plugin 'vim-latex/vim-latex'
Plugin 'let-def/ocp-indent-vim'
Plugin 'christoomey/vim-tmux-navigator'
Plugin 'let-def/ocp-indent-vim'
Plugin 'psf/black'
call vundle#end() " required
filetype plugin indent on " required
@ -95,6 +96,7 @@ let g:syntastic_quiet_messages = {"regex":'pragma once in'}
"" LaTeX
let g:syntastic_tex_checkers = [ 'chktex' ]
"" Python
let g:syntastic_python_python_exec = '/usr/bin/python3'
"" C++
@ -105,6 +107,19 @@ let g:syntastic_cpp_compiler_options = '-std=c++14 -Wall -Wextra'
let g:syntastic_python_checkers = ['flake8']
" let g:syntastic_ignore_files = []
""""""""""""""""" ALE
let g:ale_c_clangtidy_checks = ['clang-diagnostic-*', 'clang-analyzer-*', '*', '-google-readability-*', '-llvm-include-order', '-hicpp-braces-around-statements', '-readability-braces-around-statements', '-cppcoreguidelines-avoid-magic-numbers', '-readability-magic-numbers']
let g:ale_c_parse_makefile=1
""""""""""""""""" LaTeX
augroup tex_mappings
autocmd!
autocmd FileType tex,latex,context,plaintex nmap <buffer> <c-h> <Plug>IMAP_JumpForward
autocmd FileType tex,latex,context,plaintex imap <buffer> <c-h> <Plug>IMAP_JumpForward
augroup END
""""""""""""""""" OCaml
au BufEnter *.ml setf ocaml
au BufEnter *.mli setf ocaml
@ -121,6 +136,13 @@ execute "set rtp+=" . g:opamshare . "/merlin/vimbufsync"
execute "set rtp+=" . g:opamshare . "/ocp-indent/vim"
""""""""""""""""" Python
augroup python_settings
autocmd!
autocmd BufWritePre *.py execute ':Black'
autocmd FileType python nmap <LocalLeader>b <Esc>:Black<CR>
autocmd FileType python set colorcolumn=88
autocmd FileType python set textwidth=87
augroup END
let g:jedi#goto_definitions_command = "<LocalLeader>l"
let g:jedi#completions_enabled = 0
@ -129,6 +151,10 @@ set laststatus=2
let g:airline_powerline_fonts = 1
let g:airline#extensions#tabline#enabled = 1
set noshowmode
let g:airline_left_sep = '»'
let g:airline_left_sep = '▶'
let g:airline_right_sep = '«'
let g:airline_right_sep = '◀'
""""""""""""""""" clang-format
let g:clang_format#detect_style_file = 1