Merge branch 'master' of https://gitlab.com/Toric/dotfiles
This commit is contained in:
		
						commit
						bf3e6d39ad
					
				
					 2 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
#remap caps lock to a third control key. both shifts at once toggle shiftlock
 | 
			
		||||
setxkbmap -option ctrl:nocaps,shift:both_capslock
 | 
			
		||||
setxkbmap -option ctrl:nocaps
 | 
			
		||||
xrdb -merge ~/.Xresources
 | 
			
		||||
#~/dotfiles/scripts/mousestart
 | 
			
		||||
i3
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,9 +17,9 @@
 | 
			
		|||
	(($+command[ruby])) && export PATH="$PATH:$(ruby -e 'puts Gem.user_dir' 2> /dev/null)/bin"
 | 
			
		||||
	#test that these nonstandard paths exist before adding to PATH.
 | 
			
		||||
	testPath="$HOME/.local/bin"
 | 
			
		||||
	[ -f $testPath ] && export PATH="$PATH:$testPath"
 | 
			
		||||
	[ -d "$testPath" ] && export PATH="$PATH:$testPath"
 | 
			
		||||
	testPath="$HOME/scripts"
 | 
			
		||||
	[ -f $testPath ] && export PATH="$PATH:$testPath"
 | 
			
		||||
	[ -d "$testPath" ] && export PATH="$PATH:$testPath"
 | 
			
		||||
	#set default editor and pager.
 | 
			
		||||
	export EDITOR=nvim
 | 
			
		||||
	export VISUAL=nvim
 | 
			
		||||
| 
						 | 
				
			
			@ -198,7 +198,7 @@
 | 
			
		|||
#fzf stuff
 | 
			
		||||
	#zsh key bindings (different distros put these in different places.)
 | 
			
		||||
	testPath=$(find /usr/share -path '*fzf/*key-bindings.zsh' -print -quit 2> /dev/null)
 | 
			
		||||
	[ -f $testPath ] && source $testPath
 | 
			
		||||
	[ -f "$testPath" ] && source $testPath
 | 
			
		||||
	#zsh completions, if it exists.
 | 
			
		||||
	testPath=$(find /usr/share -path '*fzf/*completion.zsh' -print -quit 2> /dev/null)
 | 
			
		||||
	[ -f $testPath ] && source $testPath
 | 
			
		||||
	[ -f "$testPath" ] && source $testPath
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue