aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules9
-rw-r--r--herbstluftwm/.config/herbstluftwm/theme.sh4
l---------vim/.vim/autoload/pathogen.vim1
m---------vim/.vim/bundle/nerdtree0
m---------vim/.vim/vim-pathogen0
-rw-r--r--vim/.vimrc6
6 files changed, 16 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..8f453df
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
1[submodule "vim/.vim/bundle/vim-pathogen"]
2 path = vim/.vim/bundle/vim-pathogen
3 url = https://github.com/tpope/vim-pathogen.git
4[submodule "vim/.vim/bundle/nerdtree"]
5 path = vim/.vim/bundle/nerdtree
6 url = git@github.com:scrooloose/nerdtree.git
7[submodule "vim/.vim/vim-pathogen"]
8 path = vim/.vim/vim-pathogen
9 url = git@github.com:tpope/vim-pathogen.git
diff --git a/herbstluftwm/.config/herbstluftwm/theme.sh b/herbstluftwm/.config/herbstluftwm/theme.sh
index cfc5536..c4f9433 100644
--- a/herbstluftwm/.config/herbstluftwm/theme.sh
+++ b/herbstluftwm/.config/herbstluftwm/theme.sh
@@ -12,7 +12,7 @@ add_alpha_channel(){
12} 12}
13 13
14# Wallpaper 14# Wallpaper
15wallpaper="/home/tom/Pictures/ice.jpg" 15wallpaper="/home/tom/Pictures/mountains.jpg"
16 16
17# Padding 17# Padding
18window_p=20 18window_p=20
@@ -24,7 +24,7 @@ font_sec="-*-stlarch-medium-*-*-*-10-*-*-*-*-*-*-*"
24 24
25# Colors 25# Colors
26color_fg=$(get_x_color 15) 26color_fg=$(get_x_color 15)
27color_accent=$(get_x_color 12) 27color_accent=$(get_x_color 11)
28color_bg=$(get_x_color 0) 28color_bg=$(get_x_color 0)
29 29
30# Alpha Colors for use with bar 30# Alpha Colors for use with bar
diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim
new file mode 120000
index 0000000..9a7227e
--- /dev/null
+++ b/vim/.vim/autoload/pathogen.vim
@@ -0,0 +1 @@
../vim-pathogen/autoload/pathogen.vim \ No newline at end of file
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
new file mode 160000
Subproject 3b98a7fcae8f9fff356907171f0406ff8cd2892
diff --git a/vim/.vim/vim-pathogen b/vim/.vim/vim-pathogen
new file mode 160000
Subproject b9fb0dfd811004010f5f6903edef42d6004ebea
diff --git a/vim/.vimrc b/vim/.vimrc
index 7313a1c..c0c3fec 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,8 +1,10 @@
1execute pathogen#infect()
2
1syntax on 3syntax on
4filetype plugin indent on
2set number 5set number
3set background=dark 6set background=dark
4set tabstop=4
5 7
6autocmd StdinReadPre * let s:std_in=1 8autocmd StdinReadPre * let s:std_in=1
7autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif 9autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
8 10autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif