Merge branch 'master' of github.com:Jab2870/dotfiles
This commit is contained in:
		
						commit
						d9385c0e10
					
				
					 3 changed files with 11 additions and 1 deletions
				
			
		|  | @ -364,6 +364,7 @@ mode "$mode_gaps_outer" { | ||||||
| 
 | 
 | ||||||
| exec_always --no-startup-id setbackground | exec_always --no-startup-id setbackground | ||||||
| exec --no-startup-id compton -f -i 0.95 | exec --no-startup-id compton -f -i 0.95 | ||||||
| exec_always --no-startup-id albert | #exec_always --no-startup-id albert | ||||||
|  | exec_always --no-startup-id /usr/bin/dunst | ||||||
| exec --no-startup-id xfce4-clipman | exec --no-startup-id xfce4-clipman | ||||||
| exec setxkbmap gb | exec setxkbmap gb | ||||||
|  |  | ||||||
|  | @ -94,3 +94,8 @@ TRAPWINCH(){ | ||||||
| #if [ -f ~/.current-folder ] && [ ! $TMUX ]; then | #if [ -f ~/.current-folder ] && [ ! $TMUX ]; then | ||||||
| #	\cd "$(cat ~/.current-folder)" | #	\cd "$(cat ~/.current-folder)" | ||||||
| #fi | #fi | ||||||
|  | 
 | ||||||
|  | #[ -z "$TMUX"  ] && { exec tmux new-session && exit;} | ||||||
|  | #if [[ ! $TERM =~ screen ]]; then | ||||||
|  | #    exec tmux | ||||||
|  | #fi | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								symlinks.sh
									
										
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										4
									
								
								symlinks.sh
									
										
									
									
									
										
										
										Normal file → Executable file
									
								
							|  | @ -34,6 +34,7 @@ myLink $HOME/.dotfiles/shells/bash/bashrc $HOME/.bashrc | ||||||
| 
 | 
 | ||||||
| #X | #X | ||||||
| myLink $HOME/.dotfiles/x/xinitrc $HOME/.xinitrc | myLink $HOME/.dotfiles/x/xinitrc $HOME/.xinitrc | ||||||
|  | myLink /home/jonathan/.dotfiles/x/xmodmap $HOME/.Xmodmap | ||||||
| 
 | 
 | ||||||
| #Git | #Git | ||||||
| myLink $HOME/.dotfiles/git/gitconfig $HOME/.gitconfig | myLink $HOME/.dotfiles/git/gitconfig $HOME/.gitconfig | ||||||
|  | @ -45,6 +46,9 @@ myLink $HOME/.dotfiles/i3/config $HOME/.config/i3/config | ||||||
| #i3blocks | #i3blocks | ||||||
| myLink $HOME/.dotfiles/i3/i3blocks.conf $HOME/.i3blocks.conf | myLink $HOME/.dotfiles/i3/i3blocks.conf $HOME/.i3blocks.conf | ||||||
| 
 | 
 | ||||||
|  | #dunst | ||||||
|  | myLink $HOME/.dotfiles/dunst $HOME/.config/dunst | ||||||
|  | 
 | ||||||
| #vim | #vim | ||||||
| myLink $HOME/.dotfiles/vim $HOME/.vim | myLink $HOME/.dotfiles/vim $HOME/.vim | ||||||
| myLink $HOME/.dotfiles/vim/.vimrc $HOME/.vimrc | myLink $HOME/.dotfiles/vim/.vimrc $HOME/.vimrc | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue