ambroisie/dot-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
My dot-files for Arch Linux.
142 commits 1 branch 0 tags 66 MiB
Vim script 59.3%
Shell 29.4%
Makefile 10.2%
Vim Snippet 1.1%
Go to file
Bruno BELANYI 4e6821a0f2 [ADD][GIT] Use vim-fugitive as default mergetool 
I really like the way vim-fugitive show a merge conflict by having our
local index on the left (the target), and the remote changes on the
right (what we're trying to merge with our branch). The result is
obviously the file in the middle.

The d2o and d3o mappings take from local/remote for the current chunk.
2019-10-19 05:46:29 +02:00
bash [FIX][SHELL] Modify PATH at login only 2019-10-19 05:46:29 +02:00
desktop [ADD][SCRIPT] Bluetoot dmenu interface btmenu 2019-10-18 22:17:20 +02:00
dunst/.config/dunst [ADD] Dunst mostly-default configuration file 2019-10-18 22:17:20 +02:00
flake8/.config [ADD] Flake8 configuration file 2019-10-19 05:46:29 +02:00
git [ADD][GIT] Use vim-fugitive as default mergetool 2019-10-19 05:46:29 +02:00
i3/.config/i3 [ADD][I3] Make htop floating by default 2019-10-19 05:46:29 +02:00
i3blocks/.config/i3blocks [UPDATE][I3] Change i3blocks config for new laptop 2019-10-18 22:17:20 +02:00
isort/.config [ADD] Python isort configuration 2019-10-19 05:46:29 +02:00
ranger/.config/ranger [ADD] Ranger configuration files 2019-10-18 22:17:20 +02:00
redshift/.config [UPDATE][REDSHIFT] Lower night temperature 2019-10-19 05:46:29 +02:00
rofi/.config/rofi [UPDATE][I3] Make rofi use dmenu skin 2019-10-18 22:17:20 +02:00
scripts [ADD][SCRIPT] Bluetoot dmenu interface btmenu 2019-10-18 22:17:20 +02:00
shell [UPDATE][SHELL] Remove ureload alias 2019-10-19 05:46:29 +02:00
termite/.config/termite [ADD] Termite configuration and TERMINAL variable 2019-07-13 03:35:43 +02:00
tridactyl/.config/tridactyl [ADD][TRIDACTYL] Hint at item pages on Hacker News 2019-10-19 05:46:29 +02:00
vim [UPDATE][VIM] Move filetype files to 'after/' 2019-10-19 05:46:29 +02:00
wallpapers/Pictures/wallpapers [ADD] Wallpapers 2019-07-12 23:59:30 +02:00
X [UPDATE][URxvt] Use the same terminal font 2019-10-18 22:17:20 +02:00
zsh [ADD][ZSH] Bind delete key 2019-10-19 05:46:29 +02:00
.gitignore [ADD][GITIGNORE] Ignore non-personal vim files 2019-10-19 05:46:29 +02:00
install.sh [ADD] Python isort configuration 2019-10-19 05:46:29 +02:00