Browse Source

WIP: Large rename and reactor

sdbarker 4 years ago
parent
commit
22281f7ad3

gitconfig/.gitconfig → git/.gitconfig


gitconfig/.gitignore → git/.gitignore


+ 13 - 8
install.nsi

@@ -6,9 +6,9 @@
 ;Include Modern UI
 
 !define Vendor "sdbarker"
-!define Title "sdbarker's configs"
+!define Title "sdbarker's dotfiles"
 
-	!include "MUI2.nsh"
+!include "MUI2.nsh"
 
 ;--------------------------------
 ;General
@@ -52,17 +52,22 @@ RequestExecutionLevel user
 ;--------------------------------
 ;Installer Sections
 
-Section ".vimrc" SecVimrc
+Section ".vimrc" SecVimRc
 	; .vimrc
 	SetOutPath "$INSTDIR"
-	CreateDirectory "$INSTDIR\vimfiles\configs"
+	CreateDirectory "$INSTDIR\vimfiles"
 
-	File /r vimrc\*
+	File /r vim\*
+SectionEnd
+
+Section "_vsvimrc" SecVsVimRc
+	; _vsvimrc
+	File /r vsvim\*
 SectionEnd
 
 Section ".gitconfig" SecGitconfig
 	; .gitconfig
-	File /r gitconfig\*
+	File /r git\*
 SectionEnd
 
 Section "-Uninstaller" SecUninstaller
@@ -82,13 +87,13 @@ SectionEnd
 ;Descriptions
 
 ;Language strings
-LangString DESC_SecVimrc ${LANG_ENGLISH} ".vimrc and associated config files, plugins, syntax definitions, etc."
+LangString DESC_SecVimRc ${LANG_ENGLISH} ".vimrc and associated config files, plugins, syntax definitions, etc."
 LangString DESC_SecGitconfig ${LANG_ENGLISH} ".gitconfig and .gitignore"
 LangString DESC_SecUninstaller ${LANG_ENGLISH} "Adds an uninstaller to remove the configs later."
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecVimrc} $(DESC_SecVimrc)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecVimRc} $(DESC_SecVimRc)
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecGitConfig} $(DESC_SecGitconfig)
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecUninstaller} $(DESC_SecUninstaller)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

+ 6 - 6
install.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-TITLE="sdbarker's configs Installer"
+TITLE="sdbarker's dotfiles Installer"
 SEP="---------------------------"
 
 echo $TITLE
@@ -24,8 +24,8 @@ install_vimrc ()
 	rm -rf ~/.vimrc
 	rm -rf ~/.vim
 
-	ln -s "${DIR}/vimrc/_vimrc" ~/.vimrc
-	ln -s "${DIR}/vimrc/vimfiles" ~/.vim
+	ln -s "${DIR}/vim/.vimrc" ~/.vimrc
+	ln -s "${DIR}/vim/.vim" ~/.vim
 
 	vim +PluginInstall +qall
 	echo "Done."
@@ -38,8 +38,8 @@ install_gitconfig ()
 	rm -rf ~/.gitconfig
 	rm -rf ~/.gitignore
 
-	ln -s "${DIR}/gitconfig/.gitconfig" ~/.gitconfig
-	ln -s "${DIR}/gitconfig/.gitignore" ~/.gitignore
+	ln -s "${DIR}/git/.gitconfig" ~/.gitconfig
+	ln -s "${DIR}/git/.gitignore" ~/.gitignore
 	echo "Done."
 	echo
 }
@@ -48,7 +48,7 @@ install_tmuxconfig ()
 {
 	echo "Installing .tmux.conf"
 	rm -rf ~/.tmux.conf
-	ln -s "${DIR}/tmux/tmux.conf" ~/.tmux.conf
+	ln -s "${DIR}/tmux/.tmux.conf" ~/.tmux.conf
 	echo "Done."
 	echo
 }

tmux/tmux.conf → tmux/.tmux.conf


vimrc/vimfiles/bundle/.gitignore → vim/.vim/bundle/.gitignore


vimrc/vimfiles/bundle/vundle → vim/.vim/bundle/vundle


vimrc/vimfiles/colors/sdbarker.vim → vim/.vim/colors/sdbarker.vim


vimrc/vimfiles/compiler/perl.vim → vim/.vim/compiler/perl.vim


vimrc/vimfiles/compiler/ruby.vim → vim/.vim/compiler/ruby.vim


vimrc/vimfiles/compiler/sass.vim → vim/.vim/compiler/sass.vim


vimrc/vimfiles/configs/ftbehaviors.vim → vim/.vim/configs/ftbehaviors.vim


vimrc/vimfiles/configs/functions.vim → vim/.vim/configs/functions.vim


vimrc/vimfiles/configs/keybindings.vim → vim/.vim/configs/keybindings.vim


vimrc/vimfiles/configs/syntaxbehaviors.vim → vim/.vim/configs/syntaxbehaviors.vim


vimrc/vimfiles/configs/winbehavior.vim → vim/.vim/configs/winbehavior.vim


+ 7 - 7
vimrc/_vimrc

@@ -46,13 +46,13 @@ Plugin 'vim-surround'
 
 filetype plugin on
 
-if has("win32")
-	let $VIMDIR = "$HOME\\vimfiles"
-	let $VIMRC = "$HOME\\_vimrc"
-else
-	let $VIMDIR = "$HOME/.vim"
-	let $VIMRC = "$HOME/.vimrc"
-endif
+"if has("win32")
+"	let $VIMDIR = "$HOME\\vimfiles"
+"	let $VIMRC = "$HOME\\_vimrc"
+"else
+"	let $VIMDIR = "$HOME/.vim"
+"	let $VIMRC = "$HOME/.vimrc"
+"endif
 
 " Load keybindings
 source $VIMDIR/configs/keybindings.vim

vsvimrc/_vsvimrc → vsvim/_vsvimrc