Merge branch 'master' of git.framasoft.org:mpo/dotfiles

This commit is contained in:
Martin Potier 2016-09-04 03:32:34 +02:00
commit 10c9819273
5 changed files with 31 additions and 8 deletions

View file

@ -1,6 +1,10 @@
Samæ's config files Samæ's config files
------------------- -------------------
To get this, run:
git clone https://git.framasoft.org/mpo/dotfiles.git ~/dotfiles-from-samae
To install a configuration, use: To install a configuration, use:
./configure <bundle> ./configure <bundle>
@ -9,3 +13,7 @@ To list bundles, run:
./configure ./configure
!!! The `configure` script requires GNU stow (apt-get install stow, pacman -S stow, …) !!!
!!! The `configure` script will only properly work if run from a subfolder of
your home directory (like ~/dotfiles-from-samae) !!!

View file

@ -255,7 +255,12 @@ before packages are loaded. If you are unsure, you should try in setting them in
monokai monokai
monochrome monochrome
)) ))
(add-to-list 'auto-mode-alist '("\\.tikz\\'" . latex-mode))
;; Use auctex with .tikz files too
(setq auto-mode-alist
(append
'(("\\.tikz\\'" . latex-mode))
auto-mode-alist))
) )
(defun dotspacemacs/user-config () (defun dotspacemacs/user-config ()
@ -282,6 +287,7 @@ you should place you code here."
;; Tex viewers ;; Tex viewers
(setq TeX-view-program-list '(("Zathura" "zathura-sync %n:1:%b %o"))) (setq TeX-view-program-list '(("Zathura" "zathura-sync %n:1:%b %o")))
(setq TeX-view-program-selection '((output-pdf "Zathura"))) (setq TeX-view-program-selection '((output-pdf "Zathura")))
) )
;; Do not write anything past this comment. This is where Emacs will ;; Do not write anything past this comment. This is where Emacs will

View file

@ -28,7 +28,7 @@ set -g @resurrect-strategy-vim 'session'
set -g display-time 2000 set -g display-time 2000
# allow mouse mode # allow mouse mode
set -g mouse-utf8 on #set -g mouse-utf8 on # deprecated
set -g mouse on set -g mouse on
# center align the window list # center align the window list
@ -36,14 +36,14 @@ set -g status-justify centre
set -g status-right "(" set -g status-right "("
set -g status-left ")" set -g status-left ")"
#### COLOUR (Solarized light) #### COLOUR (Default dark (terminal chooses variant))
# default statusbar colors # default statusbar colors
set-option -g status-bg white #base2 set-option -g status-bg black #base02
set-option -g status-fg yellow #yellow set-option -g status-fg yellow #yellow
set-option -g status-attr default set-option -g status-attr default
# default window title colors # default window title colors
set-window-option -g window-status-fg brightyellow #base00 set-window-option -g window-status-fg brightblue #base0
set-window-option -g window-status-bg default set-window-option -g window-status-bg default
#set-window-option -g window-status-attr dim #set-window-option -g window-status-attr dim
@ -53,11 +53,11 @@ set-window-option -g window-status-current-bg default
#set-window-option -g window-status-current-attr bright #set-window-option -g window-status-current-attr bright
# pane border # pane border
set-option -g pane-border-fg white #base2 set-option -g pane-border-fg black #base02
set-option -g pane-active-border-fg brightcyan #base1 set-option -g pane-active-border-fg brightgreen #base01
# message text # message text
set-option -g message-bg white #base2 set-option -g message-bg black #base02
set-option -g message-fg brightred #orange set-option -g message-fg brightred #orange
# pane number display # pane number display

6
vim/.vim/.netrwhist Normal file
View file

@ -0,0 +1,6 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =4
let g:netrw_dirhist_1='/home/eeva/teaching/2015-ATER/ASR/TP26'
let g:netrw_dirhist_2='/home/eeva/.config/termite'
let g:netrw_dirhist_3='/home/eeva/work/OTB2.demo'
let g:netrw_dirhist_4='/etc/X11/xorg.conf.d'

View file

@ -25,9 +25,12 @@ nnoremap <leader>a :echo("\<leader\> works! It is set to <leader>")<CR>
" Highlighting " Highlighting
syntax enable syntax enable
if has('gui_running') if has('gui_running')
" When gui is running, it pretty much sets its own colors
set background=light set background=light
set guifont=Inconsolata\ 16 set guifont=Inconsolata\ 16
else else
" If we're in a terminal, then we stay default, terminal will choose
" which colors it likes.
set background=dark set background=dark
endif endif