Merge branch 'master' of https://github.com/Tristaan/dotfiles

2017-11-23 20:11:54 +01:00
parent 08f46c7f31 68227dc289
commit b1fdefd59c
5 changed files with 27 additions and 2 deletions
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+    <match target="font">
+        <edit name="antialias" mode="assign">
+            <bool>true</bool>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintfull</const>
+        </edit>
+    </match>
+    <alias>
+        <family>system</family>
+        <prefer><family>DejaVu Sans</family></prefer>
+    </alias>
+
+
+</fontconfig>
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -79,6 +79,12 @@ nnoremap <leader>so :OpenSession<Space>
 nnoremap <leader>ss :SaveSession<Space>
 nnoremap <leader>sd :DeleteSession<CR>
 nnoremap <leader>sc :CloseSession<CR>
+"
+" GitGutter maps
+noremap \hn <Plug>GitGutterNextHunk
+noremap \hp <Plug>GitGutterPreviewHunk
+noremap \hs <Plug>GitGutterStageHunk
+noremap \hr <Plug>GitGutterUndoHunk

 "Git maps
 noremap <Leader>gs :Gstatus<CR>
--- a/.config/nvim/nvim
+++ b/.config/nvim/nvim
@@ -1 +0,0 @@
-/home/tristan/build/dotfiles/.config/nvim
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -1,4 +1,4 @@
-':/home/tristan/build/rineja/public/images/ostalo
+':/
 v:/home/tristan/build/rineja/app/views
 a:/home/tristan/build/rineja/app/assets
 c:/home/tristan/build/rineja/app/controllers