diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim
new file mode 100644
index 0000000..a13ae08
--- /dev/null
+++ b/.vim/autoload/pathogen.vim
@@ -0,0 +1,347 @@
+" pathogen.vim - path option manipulation
+" Maintainer: Tim Pope
+" Version: 2.3
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.
+
+if exists("g:loaded_pathogen") || &cp
+ finish
+endif
+let g:loaded_pathogen = 1
+
+" Point of entry for basic default usage. Give a relative path to invoke
+" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround(). Curly braces are expanded with pathogen#expand():
+" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
+" in the runtime path.
+function! pathogen#infect(...) abort
+ for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+ if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
+ call pathogen#surround(path)
+ elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+ call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+ call pathogen#surround(path . '/{}')
+ elseif path =~# '[{}*]'
+ call pathogen#interpose(path)
+ else
+ call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+ call pathogen#interpose(path . '/{}')
+ endif
+ endfor
+ call pathogen#cycle_filetype()
+ if pathogen#is_disabled($MYVIMRC)
+ return 'finish'
+ endif
+ return ''
+endfunction
+
+" Split a path into a list.
+function! pathogen#split(path) abort
+ if type(a:path) == type([]) | return a:path | endif
+ if empty(a:path) | return [] | endif
+ let split = split(a:path,'\\\@]','\\&','')
+ endif
+endfunction
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort "{{{1
+ let rtp = pathogen#join(1,pathogen#split(&rtp))
+ let file = findfile(a:file,rtp,a:count)
+ if file ==# ''
+ return ''
+ else
+ return fnamemodify(file,':p')
+ endif
+endfunction
+
+" Section: Deprecated
+
+function! s:warn(msg) abort
+ echohl WarningMsg
+ echomsg a:msg
+ echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories. Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+ call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+ return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+ let name = a:0 ? a:1 : 'bundle/{}'
+ call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+ return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+ if a:0
+ call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
+ else
+ call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
+ endif
+ return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
+
+if exists(':Vedit')
+ finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd)
+ let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+ let file = pathogen#runtime_findfile(a:file,a:count)
+ if file ==# ''
+ return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+ endif
+ if !s:vopen_warning
+ let s:vopen_warning = 1
+ let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+ else
+ let warning = ''
+ endif
+ if a:lcd
+ let path = file[0:-strlen(a:file)-2]
+ execute 'lcd `=path`'
+ return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+ else
+ return a:cmd.' '.pathogen#fnameescape(file) . warning
+ endif
+endfunction
+
+function! s:Findcomplete(A,L,P)
+ let sep = pathogen#slash()
+ let cheats = {
+ \'a': 'autoload',
+ \'d': 'doc',
+ \'f': 'ftplugin',
+ \'i': 'indent',
+ \'p': 'plugin',
+ \'s': 'syntax'}
+ if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+ let request = cheats[a:A[0]].a:A[1:-1]
+ else
+ let request = a:A
+ endif
+ let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+ let found = {}
+ for path in pathogen#split(&runtimepath)
+ let path = expand(path, ':p')
+ let matches = split(glob(path.sep.pattern),"\n")
+ call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+ call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+ for match in matches
+ let found[match] = 1
+ endfor
+ endfor
+ return sort(keys(found))
+endfunction
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1)
+
+" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/.vim/backup/.gitignore~ b/.vim/backup/.gitignore~
new file mode 100644
index 0000000..59d842b
--- /dev/null
+++ b/.vim/backup/.gitignore~
@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# Commenting this out is preferred by some people, see
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
+node_modules
+
+# Users Environment Variables
+.lock-wscript
diff --git a/.vim/backup/.vimrc~ b/.vim/backup/.vimrc~
new file mode 100644
index 0000000..d6e6812
--- /dev/null
+++ b/.vim/backup/.vimrc~
@@ -0,0 +1,77 @@
+" ################################
+" # 2014. WTFPL. #
+" #.vimrc by David Aizenberg #
+" # david.aizenberg@paranoici.org#
+" ################################
+
+" #Requirements: Pathogen, Airline, NERDTree, Mustang colour theme
+
+" Turn syntax highlight on.
+syntax on
+
+"for future use.
+let mapleader = ","
+
+"Enable Pathongen
+execute pathogen#infect()
+
+"Enable Airline
+set laststatus=2
+let g:airline_powerline_fonts = 1
+
+"bind F2 as a Toggle for NERDTree
+map silent :NERDTreeToggle
+
+"Configure vim to backup files, might save sometime, definitely will not hurt.
+set backup
+set backupdir=~/.vim/backup
+set directory=~/.vim/tmp
+set autochdir
+
+" Make Vim highlight current line
+set cul
+
+" Enable line Numbers on left, and set their colour.
+set number
+highlight LineNr ctermfg=grey
+
+
+"set list " show invisible characters
+"set mouse=a " try to use a mouse in the console (wimp!)
+set autoindent " set the cursor at same indent as line above
+set smartindent " try to be smart about indenting (C-style)
+set noexpandtab
+
+" ###############################
+" # Language Dependent settings #
+" ###############################
+
+
+" Shell
+autocmd FileType sh setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4
+
+" Ruby
+autocmd FileType ruby setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2
+
+" PHP
+autocmd FileType php setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
+
+" X?HTML & XML
+autocmd FileType html,xhtml,xml setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2
+
+" CSS
+autocmd FileType css setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
+
+" Makefiles
+autocmd FileType make setlocal noexpandtab
+
+" JavaScript
+" autocmd BufRead,BufNewFile *.json setfiletype javascript
+autocmd FileType javascript setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2
+let javascript_enable_domhtmlcss=1
+
+
+" Set 256 colour mode and Theme.
+set t_Co=256
+colorscheme mustang
+
diff --git a/.vim/backup/COMMIT_EDITMSG~ b/.vim/backup/COMMIT_EDITMSG~
new file mode 100644
index 0000000..90e2e41
--- /dev/null
+++ b/.vim/backup/COMMIT_EDITMSG~
@@ -0,0 +1,8 @@
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+# Explicit paths specified without -i or -o; assuming --only paths...
+# On branch master
+# Changes to be committed:
+# modified: package.json
+#
diff --git a/.vim/backup/MERGE_MSG~ b/.vim/backup/MERGE_MSG~
new file mode 100644
index 0000000..82ef03d
--- /dev/null
+++ b/.vim/backup/MERGE_MSG~
@@ -0,0 +1,7 @@
+Merge branch 'master' of https://github.com/Neoromantique/taskr
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.
diff --git a/.vim/backup/app.js~ b/.vim/backup/app.js~
new file mode 100644
index 0000000..f2dec6c
--- /dev/null
+++ b/.vim/backup/app.js~
@@ -0,0 +1,42 @@
+var express = require('express');
+var http = require('http');
+var path = require('path');
+var app = express();
+var favicon = require('serve-favicon');
+var logger = require('morgan');
+var cookieParser = require('cookie-parser');
+var bodyParser = require('body-parser');
+var fs = require('fs');
+
+
+// view engine setup
+app.set('port', process.env.PORT || 80);
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'jade');
+
+// uncomment after placing your favicon in /public
+//app.use(favicon(__dirname + '/public/favicon.ico'));
+app.use(logger('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(require('stylus').middleware(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'public')));
+
+app.get('/api/hello', function(req, res) {
+ res.json({
+ message: 'Hello, World'
+ });
+};
+
+fs.readdirSync('./controllers').forEach(function (file) {
+ if(file.substr(-3) == '.js') {
+ route = require('./controllers/' + file);
+ route.controller(app);
+ }
+});
+
+http.createServer(app).listen(app.get('port'), function(){
+ console.log('Express server listening on port ' + app.get('port'));
+});
+
diff --git a/.vim/backup/bower.json~ b/.vim/backup/bower.json~
new file mode 100644
index 0000000..7ec4c47
--- /dev/null
+++ b/.vim/backup/bower.json~
@@ -0,0 +1,26 @@
+{
+ "name": "ServerMonitor",
+ "version": "0.0.0",
+ "description": "Simple Server Monitor Application that shows server status and data",
+ "main": "index.html",
+ "moduleType": [
+ "globals"
+ ],
+ "keywords": [
+ "Server",
+ "Monitor"
+ ],
+ "authors": [
+ "David Aizenberg"
+ ],
+ "license": "(WTFPL)",
+ "homepage": "neoromantique.co.uk",
+ "private": true,
+ "ignore": [
+ "**/.*",
+ "node_modules",
+ "bower_components",
+ "test",
+ "tests"
+ ]
+}
diff --git a/.vim/backup/ex1.c~ b/.vim/backup/ex1.c~
new file mode 100644
index 0000000..d9a3dfa
--- /dev/null
+++ b/.vim/backup/ex1.c~
@@ -0,0 +1,12 @@
+#include
+
+int main()
+{
+ int age = 10;
+ int height = 72;
+
+ printf("I am %d years old. \n");
+ printf("I am %d inches tall. \n", height);
+
+ return 0;
+}
diff --git a/.vim/backup/index.html~ b/.vim/backup/index.html~
new file mode 100644
index 0000000..78b0806
--- /dev/null
+++ b/.vim/backup/index.html~
@@ -0,0 +1,27 @@
+
+
+
+
+
+ David Aizenberg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.vim/backup/index.scss~ b/.vim/backup/index.scss~
new file mode 100644
index 0000000..f4b7e97
--- /dev/null
+++ b/.vim/backup/index.scss~
@@ -0,0 +1,2 @@
+@import "bourbon/bourbon";
+
diff --git a/.vim/backup/main.css.map~ b/.vim/backup/main.css.map~
new file mode 100644
index 0000000..3db43eb
--- /dev/null
+++ b/.vim/backup/main.css.map~
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "",
+"sources": [mainsrc.css],
+"names": [],
+"file": "main.css"
+}
diff --git a/.vim/backup/main.css~ b/.vim/backup/main.css~
new file mode 100644
index 0000000..355217b
--- /dev/null
+++ b/.vim/backup/main.css~
@@ -0,0 +1,4 @@
+@import "bourbon/bourbon";
+
+
+/*# sourceMappingURL=main.css.map */
diff --git a/.vim/backup/main.c~ b/.vim/backup/main.c~
new file mode 100644
index 0000000..0d763f1
--- /dev/null
+++ b/.vim/backup/main.c~
@@ -0,0 +1,12 @@
+#include
+
+int some_number;
+int shift_value;
+int resulting_value;
+
+some_number = 1;
+shift_value = 11;
+
+*some_number <<= shift_value;
+
+
diff --git a/.vim/backup/makefile~ b/.vim/backup/makefile~
new file mode 100644
index 0000000..04eec0d
--- /dev/null
+++ b/.vim/backup/makefile~
@@ -0,0 +1,11 @@
+CFLAGS=-Wall -O0 -g
+CC=gcc
+
+default: taskr
+
+clean:
+ rm -f taksr
+clean_all_executables:
+ find . -perm +100 -type f -delete
+
+
diff --git a/.vim/backup/package.json~ b/.vim/backup/package.json~
new file mode 100644
index 0000000..8ef797a
--- /dev/null
+++ b/.vim/backup/package.json~
@@ -0,0 +1,19 @@
+{
+ "name": "dumbmonitor",
+ "version": "0.0.1",
+ "private": true,
+ "scripts": {
+ "start": "node app.js"
+ },
+ "dependencies": {
+ "body-parser": "~1.10.2",
+ "cookie-parser": "~1.3.3",
+ "debug": "~2.1.1",
+ "express": "~4.11.1",
+ "jade": "~1.9.1",
+ "morgan": "~1.5.1",
+ "serve-favicon": "~2.2.0",
+ "stylus": "0.42.3",
+ "net-ping": "1.1.11"
+}
+}
diff --git a/.vim/backup/ping.jade~ b/.vim/backup/ping.jade~
new file mode 100644
index 0000000..cab76f3
--- /dev/null
+++ b/.vim/backup/ping.jade~
@@ -0,0 +1,6 @@
+extends layout
+
+block content
+ p Server №1: cat-free:
+ span(style="color:#{local.color}") #{local.ping}
+ a(href="/") Come back to Index Page
diff --git a/.vim/backup/ping.js~ b/.vim/backup/ping.js~
new file mode 100644
index 0000000..4641e46
--- /dev/null
+++ b/.vim/backup/ping.js~
@@ -0,0 +1,6 @@
+//module.exports = User;
+
+var servers[] = 'x.x.x.x', 'x.x.x.x', 'x,x,x,x';
+
+var Target = "8.8.8.8";
+exports.Target = Target;
diff --git a/.vim/backup/taskr.c~ b/.vim/backup/taskr.c~
new file mode 100644
index 0000000..f026bf5
--- /dev/null
+++ b/.vim/backup/taskr.c~
@@ -0,0 +1,66 @@
+#include
+#include
+#include
+
+int main()
+{
+ readFile();
+ return 0;
+}
+
+int add()
+{
+ return 0;
+}
+
+int readFile(int typeOfRead, int taskID) // Type of read operation 0 == list ; 1 == filter. ;; int taskID == Expeced task ID
+{
+ FILE *ifp;
+ char *mode = "r";
+ char outputFilename[] = "taskr.lst";
+
+ char* p;
+ char* string;
+
+ char ID[6];
+ char desc[255], comm[255], buffer[510];
+
+ ifp = fopen("taskr.lst", mode);
+
+ if (ifp == NULL) { //Check if file is available for reading
+ fprintf(stderr, "Can't open task file, does it exist? \n");
+ exit(1);
+ } // if closing
+
+ while (1) { //Read File & Put contents into a buffer
+ if (fgets(buffer, 150, ifp) == NULL) break;
+ // printf("%s", buffer);
+ }
+ //while (fgets(buffer, 510, ifp) != "\n") {
+ //
+ // printf("%d ~ Description: %s, \n", ID, buffer);
+ //}
+
+ p = strtok(buffer, "%");
+ if (p != NULL)
+ {
+ strcpy(ID, p);
+ p = strtok (NULL, "%");
+ if (p != NULL)
+ strcpy(desc, p);
+ }
+ printf("\n Read value 1: %s; Read Value 2: %s; \n", ID, desc);
+
+ return 0;
+} // readFile()
+
+int read()
+{
+
+}
+
+int list()
+{
+ return 0;
+}
+
diff --git a/.vim/backup/taskr.lst~ b/.vim/backup/taskr.lst~
new file mode 100644
index 0000000..1bfe235
--- /dev/null
+++ b/.vim/backup/taskr.lst~
@@ -0,0 +1,2 @@
+1324 Ω Some Description of Kinds Ω some Comment of kinds
+1222 Ω Some Other Description Ω and a different Comment.
diff --git a/.vim/backup/test.c~ b/.vim/backup/test.c~
new file mode 100644
index 0000000..0c53c0a
--- /dev/null
+++ b/.vim/backup/test.c~
@@ -0,0 +1,7 @@
+#include
+#include
+
+int shit = 1;
+int zShit = 2;
+
+printf("shit = %d; Shit = %d", shit, zShit);
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
new file mode 160000
index 0000000..3b98a7f
--- /dev/null
+++ b/.vim/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit 3b98a7fcae8f9fff356907171f0406ff8cd28921
diff --git a/.vim/colors/mustang.vim b/.vim/colors/mustang.vim
new file mode 100644
index 0000000..715605a
--- /dev/null
+++ b/.vim/colors/mustang.vim
@@ -0,0 +1,55 @@
+" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com)
+" Version: 1.0
+" Last Change: September 25 2008
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let colors_name = "mustang"
+
+" Vim >= 7.0 specific colors
+if version >= 700
+ hi CursorLine guibg=#2d2d2d ctermbg=236
+ hi CursorColumn guibg=#2d2d2d ctermbg=236
+ hi MatchParen guifg=#d0ffc0 guibg=#2f2f2f gui=bold ctermfg=157 ctermbg=237 cterm=bold
+ hi Pmenu guifg=#ffffff guibg=#444444 ctermfg=255 ctermbg=238
+ hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148
+endif
+
+" General colors
+hi Cursor guifg=NONE guibg=#626262 gui=none ctermbg=241
+hi Normal guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234
+hi NonText guifg=#808080 guibg=#303030 gui=none ctermfg=244 ctermbg=235
+hi LineNr guifg=#808080 guibg=#000000 gui=none ctermfg=244 ctermbg=232
+hi StatusLine guifg=#d3d3d5 guibg=#444444 gui=italic ctermfg=253 ctermbg=238 cterm=italic
+hi StatusLineNC guifg=#939395 guibg=#444444 gui=none ctermfg=246 ctermbg=238
+hi VertSplit guifg=#444444 guibg=#444444 gui=none ctermfg=238 ctermbg=238
+hi Folded guibg=#384048 guifg=#a0a8b0 gui=none ctermbg=4 ctermfg=248
+hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=254 cterm=bold
+hi Visual guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4
+hi SpecialKey guifg=#808080 guibg=#343434 gui=none ctermfg=244 ctermbg=236
+
+" Syntax highlighting
+hi Comment guifg=#808080 gui=italic ctermfg=244
+hi Todo guifg=#8f8f8f gui=italic ctermfg=245
+hi Boolean guifg=#b1d631 gui=none ctermfg=148
+hi String guifg=#b1d631 gui=italic ctermfg=148
+hi Identifier guifg=#b1d631 gui=none ctermfg=148
+hi Function guifg=#ffffff gui=bold ctermfg=255
+hi Type guifg=#7e8aa2 gui=none ctermfg=103
+hi Statement guifg=#7e8aa2 gui=none ctermfg=103
+hi Keyword guifg=#ff9800 gui=none ctermfg=208
+hi Constant guifg=#ff9800 gui=none ctermfg=208
+hi Number guifg=#ff9800 gui=none ctermfg=208
+hi Special guifg=#ff9800 gui=none ctermfg=208
+hi PreProc guifg=#faf4c6 gui=none ctermfg=230
+hi Todo guifg=#000000 guibg=#e6ea50 gui=italic
+
+" Code-specific colors
+hi pythonOperator guifg=#7e8aa2 gui=none ctermfg=103
+
diff --git a/.vimrc b/.vimrc
index 9b2b447..948d411 100644
--- a/.vimrc
+++ b/.vimrc
@@ -20,7 +20,7 @@ set laststatus=2
let g:airline_powerline_fonts = 1
"bind F2 as a Toggle for NERDTree
-map :NERDTreeToggle
+map :NERDTreeToggle
"Configure vim to backup files, might save sometime, definitely will not hurt.
set backup
@@ -40,21 +40,16 @@ highlight LineNr ctermfg=grey
"set mouse=a " try to use a mouse in the console (wimp!)
set autoindent " set the cursor at same indent as line above
set smartindent " try to be smart about indenting (C-style)
-set expandtab " expand s with spaces; death to tabs!
+set noexpandtab
" ###############################
" # Language Dependent settings #
" ###############################
-" Vimscript
-autocmd FileType vim setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4
" Shell
autocmd FileType sh setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4
-" Lisp
-autocmd Filetype lisp,scheme setlocal equalprg=~/.vim/bin/lispindent.lisp expandtab shiftwidth=2 tabstop=8 softtabstop=2
-
" Ruby
autocmd FileType ruby setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2
@@ -67,6 +62,9 @@ autocmd FileType html,xhtml,xml setlocal expandtab shiftwidth=2 tabstop=2 softta
" CSS
autocmd FileType css setlocal expandtab shiftwidth=4 tabstop=4 softtabstop=4
+" Makefiles
+autocmd FileType make setlocal noexpandtab
+
" JavaScript
" autocmd BufRead,BufNewFile *.json setfiletype javascript
autocmd FileType javascript setlocal expandtab shiftwidth=2 tabstop=2 softtabstop=2