From e0d77f9e7c1c6326b4a013c35028a69c993eba9c Mon Sep 17 00:00:00 2001 From: Caleb Young Date: Sun, 1 Aug 2021 15:16:56 -0700 Subject: [PATCH 1/8] bashrc updates --- bashrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bashrc b/bashrc index 5f825aef..547560d5 100644 --- a/bashrc +++ b/bashrc @@ -126,6 +126,8 @@ if [ -x /usr/bin/mint-fortune ]; then fi alias ..='cd ..' +alias 2..='cd ../..' +alias 3..='cd ../../..' alias vi='vim' alias clc='clear' alias a='acpi' From c1cf5eb0c69180e1565c8bc58de0bd005ed46d1c Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 17:43:05 +0000 Subject: [PATCH 2/8] added setup script --- setup.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 setup.sh diff --git a/setup.sh b/setup.sh new file mode 100644 index 00000000..eaa1a8fb --- /dev/null +++ b/setup.sh @@ -0,0 +1,12 @@ +#!/usr/bin/bash + +# move existing files +rm ~/.vimrc_old +rm ~/.bashrc_old +rm -r ~/.vim_old +mv ~/.vimrc ~/.vimrc_old +mv ~/.bashrc ~/.bashrc_old +mv ~/.vim ~/.vim_old +ln -s ~/.dotfiles/vimrc ~/.vimrc +ln -s ~/.dotfiles/vim ~/.vim +ln -s ~/.dotfiles/bashrc ~/.bashrc From c2e32640e65563ac3f220769c7a090275c123ad6 Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 18:15:47 +0000 Subject: [PATCH 3/8] trying to get submodules to work --- vim/bundle/Lucius2 | 1 - 1 file changed, 1 deletion(-) delete mode 160000 vim/bundle/Lucius2 diff --git a/vim/bundle/Lucius2 b/vim/bundle/Lucius2 deleted file mode 160000 index d2f1baef..00000000 --- a/vim/bundle/Lucius2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2f1baef189c2d0bac39f2948b26606a2b2ca5f5 From 32c7d433b817974002eb7639d22d7db556d00c33 Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 18:26:44 +0000 Subject: [PATCH 4/8] work on submodules --- vim/bundle/YouCompleteMe | 1 - 1 file changed, 1 deletion(-) delete mode 160000 vim/bundle/YouCompleteMe diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe deleted file mode 160000 index c25e449f..00000000 --- a/vim/bundle/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c25e449f4e72667aca3d18d8bfccd7b289b2e9a1 From 3b0dcae85b43670db2f63cd1e3945dca1c5329c4 Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 18:28:45 +0000 Subject: [PATCH 5/8] submodules --- .gitmodules | 3 +++ vim/bundle/Vundle.vim | 1 - vim/bundle/nerdtree | 1 - vim/bundle/nerdtree-git-plugin | 1 - vim/bundle/vim-airline | 1 - vim/bundle/vim-airline-themes | 1 - vim/bundle/vim-colorschemes | 1 - 7 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 .gitmodules delete mode 160000 vim/bundle/Vundle.vim delete mode 160000 vim/bundle/nerdtree delete mode 160000 vim/bundle/nerdtree-git-plugin delete mode 160000 vim/bundle/vim-airline delete mode 160000 vim/bundle/vim-airline-themes delete mode 160000 vim/bundle/vim-colorschemes diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..d5297c75 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vim/bundle/YouCompleteMe"] + path = vim/bundle/YouCompleteMe + url = https://github.com/ycm-core/YouCompleteMe diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim deleted file mode 160000 index 9a38216a..00000000 --- a/vim/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree deleted file mode 160000 index 72c36567..00000000 --- a/vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72c3656799289d4635520c28e17f737066ce19d6 diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin deleted file mode 160000 index 325a1298..00000000 --- a/vim/bundle/nerdtree-git-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 325a1298b0c9d8a4c61388a2f9956a534a9068cd diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline deleted file mode 160000 index 98bc6abd..00000000 --- a/vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98bc6abde3860600e599c7ad17fdfb80809c04af diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes deleted file mode 160000 index 3bfe1d00..00000000 --- a/vim/bundle/vim-airline-themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9 diff --git a/vim/bundle/vim-colorschemes b/vim/bundle/vim-colorschemes deleted file mode 160000 index 2f532d05..00000000 --- a/vim/bundle/vim-colorschemes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f532d0564534accf09cecfa9a1e3639865367ee From 9033d56a42ce776480898c1c0c8e9bbdab7c4874 Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 18:35:35 +0000 Subject: [PATCH 6/8] did this work --- .gitmodules | 18 ++++++++++++++++++ vim/bundle/Vundle.vim | 1 + vim/bundle/nerdtree | 1 + vim/bundle/nerdtree-git-plugin | 1 + vim/bundle/vim-airline | 1 + vim/bundle/vim-airline-themes | 1 + vim/bundle/vim-color-schemes | 1 + 7 files changed, 24 insertions(+) create mode 160000 vim/bundle/Vundle.vim create mode 160000 vim/bundle/nerdtree create mode 160000 vim/bundle/nerdtree-git-plugin create mode 160000 vim/bundle/vim-airline create mode 160000 vim/bundle/vim-airline-themes create mode 160000 vim/bundle/vim-color-schemes diff --git a/.gitmodules b/.gitmodules index d5297c75..d3cda34f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,21 @@ [submodule "vim/bundle/YouCompleteMe"] path = vim/bundle/YouCompleteMe url = https://github.com/ycm-core/YouCompleteMe +[submodule "vim/bundle/nerdtree"] + path = vim/bundle/nerdtree + url = https://github.com/preservim/nerdtree.git +[submodule "vim/bundle/nerdtree-git-plugin"] + path = vim/bundle/nerdtree-git-plugin + url = https://github.com/Xuyuanp/nerdtree-git-plugin +[submodule "vim/bundle/vim-airline"] + path = vim/bundle/vim-airline + url = https://github.com/vim-airline/vim-airline +[submodule "vim/bundle/vim-airline-themes"] + path = vim/bundle/vim-airline-themes + url = https://github.com/vim-airline/vim-airline-themes +[submodule "vim/bundle/Vundle.vim"] + path = vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim +[submodule "vim/bundle/vim-color-schemes"] + path = vim/bundle/vim-color-schemes + url = https://github.com/flazz/vim-colorschemes diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim new file mode 160000 index 00000000..b255382d --- /dev/null +++ b/vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree new file mode 160000 index 00000000..2c14ed0e --- /dev/null +++ b/vim/bundle/nerdtree @@ -0,0 +1 @@ +Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin new file mode 160000 index 00000000..ff9b14f1 --- /dev/null +++ b/vim/bundle/nerdtree-git-plugin @@ -0,0 +1 @@ +Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline new file mode 160000 index 00000000..0cfd829c --- /dev/null +++ b/vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes new file mode 160000 index 00000000..97cf3e6e --- /dev/null +++ b/vim/bundle/vim-airline-themes @@ -0,0 +1 @@ +Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/bundle/vim-color-schemes b/vim/bundle/vim-color-schemes new file mode 160000 index 00000000..fd8f122c --- /dev/null +++ b/vim/bundle/vim-color-schemes @@ -0,0 +1 @@ +Subproject commit fd8f122cef604330c96a6a6e434682dbdfb878c9 From dbdf8e9d66fb98bbe0591421b7091708490d49df Mon Sep 17 00:00:00 2001 From: caleb Date: Sat, 7 Aug 2021 18:47:42 +0000 Subject: [PATCH 7/8] submodules --- .gitignore | 2 ++ .gitmodules | 18 ------------------ vim/bundle/nerdtree | 1 - vim/bundle/nerdtree-git-plugin | 1 - vim/bundle/vim-airline | 1 - vim/bundle/vim-airline-themes | 1 - vim/bundle/vim-color-schemes | 1 - vimrc | 7 ++----- 8 files changed, 4 insertions(+), 28 deletions(-) create mode 100644 .gitignore delete mode 160000 vim/bundle/nerdtree delete mode 160000 vim/bundle/nerdtree-git-plugin delete mode 160000 vim/bundle/vim-airline delete mode 160000 vim/bundle/vim-airline-themes delete mode 160000 vim/bundle/vim-color-schemes diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c27cc5f8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +vim/bundle/* +!vim/bundle/Vundle.vim diff --git a/.gitmodules b/.gitmodules index d3cda34f..eedd1ebb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,3 @@ -[submodule "vim/bundle/YouCompleteMe"] - path = vim/bundle/YouCompleteMe - url = https://github.com/ycm-core/YouCompleteMe -[submodule "vim/bundle/nerdtree"] - path = vim/bundle/nerdtree - url = https://github.com/preservim/nerdtree.git -[submodule "vim/bundle/nerdtree-git-plugin"] - path = vim/bundle/nerdtree-git-plugin - url = https://github.com/Xuyuanp/nerdtree-git-plugin -[submodule "vim/bundle/vim-airline"] - path = vim/bundle/vim-airline - url = https://github.com/vim-airline/vim-airline -[submodule "vim/bundle/vim-airline-themes"] - path = vim/bundle/vim-airline-themes - url = https://github.com/vim-airline/vim-airline-themes [submodule "vim/bundle/Vundle.vim"] path = vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim -[submodule "vim/bundle/vim-color-schemes"] - path = vim/bundle/vim-color-schemes - url = https://github.com/flazz/vim-colorschemes diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree deleted file mode 160000 index 2c14ed0e..00000000 --- a/vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2 diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin deleted file mode 160000 index ff9b14f1..00000000 --- a/vim/bundle/nerdtree-git-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250 diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline deleted file mode 160000 index 0cfd829c..00000000 --- a/vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636 diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes deleted file mode 160000 index 97cf3e6e..00000000 --- a/vim/bundle/vim-airline-themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256 diff --git a/vim/bundle/vim-color-schemes b/vim/bundle/vim-color-schemes deleted file mode 160000 index fd8f122c..00000000 --- a/vim/bundle/vim-color-schemes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd8f122cef604330c96a6a6e434682dbdfb878c9 diff --git a/vimrc b/vimrc index 4235ba5f..d86f535e 100644 --- a/vimrc +++ b/vimrc @@ -6,18 +6,15 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' "My Plugins" -"Plugin 'ervandew/supertab' -Plugin 'Valloric/YouCompleteMe' +Plugin 'ervandew/supertab' +"Plugin 'Valloric/YouCompleteMe' Plugin 'flazz/vim-colorschemes' Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' "Plugin 'vim-scripts/auto-pairs-gentle' -"Plugin 'luochen1990/rainbow' "Plugin 'Yggdroot/indentLine' Plugin 'scrooloose/nerdtree' Plugin 'Xuyuanp/nerdtree-git-plugin' -"Plugin 'rakr/vim-one' -Plugin 'maksimr/Lucius2' call vundle#end() " required filetype plugin indent on " required From 3f0ccd5ede6b31eea7395e3fd79f6f4333a9ba8a Mon Sep 17 00:00:00 2001 From: Caleb Young Date: Sat, 7 Aug 2021 11:53:23 -0700 Subject: [PATCH 8/8] added submodule setup to setup.sh --- setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.sh b/setup.sh index eaa1a8fb..e0e6bed5 100644 --- a/setup.sh +++ b/setup.sh @@ -10,3 +10,6 @@ mv ~/.vim ~/.vim_old ln -s ~/.dotfiles/vimrc ~/.vimrc ln -s ~/.dotfiles/vim ~/.vim ln -s ~/.dotfiles/bashrc ~/.bashrc + +git submodule init +git submodule update