|  | @@ -2,8 +2,8 @@ INSTALLATION
 | 
	
		
			
			| 2 | 2 |  ============
 | 
	
		
			
			| 3 | 3 |  
 | 
	
		
			
			| 4 | 4 |  
 | 
	
		
			
			| 5 |  | -Note that this will only work for dotfiles stored right in your `$HOME`.  Support
 | 
	
		
			
			| 6 |  | -for configuration stored in folders like ~/.config/application or
 | 
	
		
			
			|  | 5 | +Note that this will only work for dotfiles stored right in your `$HOME`.
 | 
	
		
			
			|  | 6 | +Support for configuration stored in folders like ~/.config/application or
 | 
	
		
			
			| 7 | 7 |  ~/.local/application is planned.
 | 
	
		
			
			| 8 | 8 |  
 | 
	
		
			
			| 9 | 9 |  
 | 
	
	
		
			
			|  | @@ -13,26 +13,26 @@ To install, you need to perform following steps:
 | 
	
		
			
			| 13 | 13 |  
 | 
	
		
			
			| 14 | 14 |      For now, I'm going to assume it's local/mydots
 | 
	
		
			
			| 15 | 15 |  
 | 
	
		
			
			| 16 |  | -2.  Move (and merge if needed) your existing configs to dotfiles folder.  Remove
 | 
	
		
			
			| 17 |  | -    the dot from name, e.g.:
 | 
	
		
			
			|  | 16 | +2.  Move (and merge if needed) your existing configs to dotfiles folder.
 | 
	
		
			
			|  | 17 | +    Remove the dot from name, e.g.:
 | 
	
		
			
			| 18 | 18 |  
 | 
	
		
			
			| 19 | 19 |          $ mv ~/.gnucash ~/local/mydots/dotfiles/gnucash
 | 
	
		
			
			| 20 | 20 |  
 | 
	
		
			
			| 21 |  | -    This works for directories as well as files, although e.g. for bash, vim or
 | 
	
		
			
			| 22 |  | -    git, I recommend different solutions--see below.
 | 
	
		
			
			|  | 21 | +    This works for directories as well as files, although e.g. for bash, vim
 | 
	
		
			
			|  | 22 | +    or git, I recommend different solutions--see below.
 | 
	
		
			
			| 23 | 23 |  
 | 
	
		
			
			| 24 |  | -    Also note that you can name the dotfiles folder whatever you want; there's
 | 
	
		
			
			| 25 |  | -    no real connection with the repository.
 | 
	
		
			
			|  | 24 | +    Also note that you can name the dotfiles folder whatever you want;
 | 
	
		
			
			|  | 25 | +    there's no real connection with the repository.
 | 
	
		
			
			| 26 | 26 |  
 | 
	
		
			
			| 27 | 27 |  3.  Run mklinks script with single argument: path to dotfiles folder (or how
 | 
	
		
			
			| 28 | 28 |      you named it), e.g.:
 | 
	
		
			
			| 29 | 29 |  
 | 
	
		
			
			| 30 | 30 |          $ ~/local/mydots/mklinks ~/local/mydots/dotfiles
 | 
	
		
			
			| 31 | 31 |  
 | 
	
		
			
			| 32 |  | -    The script will create links back in your `$HOME`, uless they (or real files)
 | 
	
		
			
			| 33 |  | -    did already exist, in which case it will only warn you.  This makes it easy
 | 
	
		
			
			| 34 |  | -    to exclude some of your applications from some of your machines: just skip
 | 
	
		
			
			| 35 |  | -    step 2 for them.
 | 
	
		
			
			|  | 32 | +    The script will create links back in your `$HOME`, uless they (or real
 | 
	
		
			
			|  | 33 | +    files) did already exist, in which case it will only warn you.  This
 | 
	
		
			
			|  | 34 | +    makes it easy to exclude some of your applications from some of your
 | 
	
		
			
			|  | 35 | +    machines: just skip step 2 for them.
 | 
	
		
			
			| 36 | 36 |  
 | 
	
		
			
			| 37 | 37 |  
 | 
	
		
			
			| 38 | 38 |  Instructions for bash
 | 
	
	
		
			
			|  | @@ -55,18 +55,18 @@ in /etc/skel/.bashrc, and patch it with dotfiles/bash/setup/bashrc.diff:
 | 
	
		
			
			| 55 | 55 |      $ cp /etc/skel/.bashrc ~/
 | 
	
		
			
			| 56 | 56 |      $ patch -u ~/.bashrc local/mydots/dotfiles/bash/setup/bashrc.diff
 | 
	
		
			
			| 57 | 57 |  
 | 
	
		
			
			| 58 |  | -From that point on, .bashrc will source appropriate fies for you, so do not make
 | 
	
		
			
			| 59 |  | -any changes to your local .bashrc, unless you really want them to be local, i.e.
 | 
	
		
			
			| 60 |  | -private only.
 | 
	
		
			
			|  | 58 | +From that point on, .bashrc will source appropriate fies for you, so do not
 | 
	
		
			
			|  | 59 | +make any changes to your local .bashrc, unless you really want them to be
 | 
	
		
			
			|  | 60 | +local, i.e. private only.
 | 
	
		
			
			| 61 | 61 |  
 | 
	
		
			
			| 62 | 62 |  
 | 
	
		
			
			| 63 | 63 |  Instructions for Vim
 | 
	
		
			
			| 64 | 64 |  --------------------
 | 
	
		
			
			| 65 | 65 |  
 | 
	
		
			
			| 66 |  | -If you want to keep default vim-ish behavior and have all local config in ~/.vimrc,
 | 
	
		
			
			| 67 |  | -you can use above generic steps.  However, if you want to have rtather more
 | 
	
		
			
			| 68 |  | -sophisticated model, and for example use my vim configuration as a starting point,
 | 
	
		
			
			| 69 |  | -do this instead of step 2:
 | 
	
		
			
			|  | 66 | +If you want to keep default vim-ish behavior and have all local config in
 | 
	
		
			
			|  | 67 | +~/.vimrc, you can use above generic steps.  However, if you want to have
 | 
	
		
			
			|  | 68 | +rtather more sophisticated model, and for example use my vim configuration
 | 
	
		
			
			|  | 69 | +as a starting point, do this instead of step 2:
 | 
	
		
			
			| 70 | 70 |  
 | 
	
		
			
			| 71 | 71 |  1.  Merge your local ~/.vimrc into dotfiles/vim/vimrc
 | 
	
		
			
			| 72 | 72 |  
 | 
	
	
		
			
			|  | @@ -96,15 +96,14 @@ However, if you only want to use the sharing/splitting mechanism, 1.7 *should*
 | 
	
		
			
			| 96 | 96 |  be OK.  **No warranties**, though.
 | 
	
		
			
			| 97 | 97 |  
 | 
	
		
			
			| 98 | 98 |  The pricnicple is the same as in bash section above: a new folder is created,
 | 
	
		
			
			| 99 |  | -local config is split into parts per user/host or global one, and original file
 | 
	
		
			
			| 100 |  | -becomes just a crossroads into these.
 | 
	
		
			
			| 101 |  | -
 | 
	
		
			
			| 102 |  | -Except that since git does not support expansion in config paths, the file must
 | 
	
		
			
			| 103 |  | -be created by a script.  So what you want to do is the same as for bash above,
 | 
	
		
			
			| 104 |  | -except that instead of applying patch to your .gitconfig, you simply delete it
 | 
	
		
			
			| 105 |  | -and run dotfiles/git/setup.
 | 
	
		
			
			| 106 |  | -
 | 
	
		
			
			| 107 |  | -If you have a local changes that you don't want to share, you can either put them
 | 
	
		
			
			| 108 |  | -into the re-created ~.gitconfig, or (as I prefer) in dotfiles/git/privete/gitconfig
 | 
	
		
			
			|  | 99 | +local config is split into parts per user/host or global one, and original
 | 
	
		
			
			|  | 100 | +file becomes just a crossroads into these.
 | 
	
		
			
			| 109 | 101 |  
 | 
	
		
			
			|  | 102 | +Except that since git does not support expansion in config paths, the fil
 | 
	
		
			
			|  | 103 | +must be created by a script.  So what you want to do is the same as for bash
 | 
	
		
			
			|  | 104 | +above, except that instead of applying patch to your .gitconfig, you simply
 | 
	
		
			
			|  | 105 | +delete it and run dotfiles/git/setup.
 | 
	
		
			
			| 110 | 106 |  
 | 
	
		
			
			|  | 107 | +If you have a local changes that you don't want to share, you can either put
 | 
	
		
			
			|  | 108 | +them into the re-created ~.gitconfig, or (as I prefer) in
 | 
	
		
			
			|  | 109 | +dotfiles/git/privete/gitconfig
 |