diff --git a/.netrwhist b/.netrwhist index e7ccd21..4500f98 100644 --- a/.netrwhist +++ b/.netrwhist @@ -1,4 +1,10 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =2 +let g:netrw_dirhist_cnt =8 let g:netrw_dirhist_1='/Users/jacobhartmann/ReactWorkSpace/image-tagger/src/actions' let g:netrw_dirhist_2='/Users/jacobhartmann/takunomi website/page' +let g:netrw_dirhist_3='/Users/jacobhartmann/.vim/bundle/vim-airline/.git' +let g:netrw_dirhist_4='/Users/jacobhartmann/.vim/bundle/auto-pairs/.git' +let g:netrw_dirhist_5='/Users/jacobhartmann/goworkspace/src' +let g:netrw_dirhist_6='/Users/jacobhartmann/goworkspace/src/takunomi/posts' +let g:netrw_dirhist_7='/Users/jacobhartmann/goworkspace/src/takunomi/page' +let g:netrw_dirhist_8='/Users/jacobhartmann/.vim' diff --git a/backup/.netrwhist~ b/backup/.netrwhist~ new file mode 100644 index 0000000..4500f98 --- /dev/null +++ b/backup/.netrwhist~ @@ -0,0 +1,10 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =8 +let g:netrw_dirhist_1='/Users/jacobhartmann/ReactWorkSpace/image-tagger/src/actions' +let g:netrw_dirhist_2='/Users/jacobhartmann/takunomi website/page' +let g:netrw_dirhist_3='/Users/jacobhartmann/.vim/bundle/vim-airline/.git' +let g:netrw_dirhist_4='/Users/jacobhartmann/.vim/bundle/auto-pairs/.git' +let g:netrw_dirhist_5='/Users/jacobhartmann/goworkspace/src' +let g:netrw_dirhist_6='/Users/jacobhartmann/goworkspace/src/takunomi/posts' +let g:netrw_dirhist_7='/Users/jacobhartmann/goworkspace/src/takunomi/page' +let g:netrw_dirhist_8='/Users/jacobhartmann/.vim' diff --git a/backup/vimrc~ b/backup/vimrc~ new file mode 100644 index 0000000..7f7e00e --- /dev/null +++ b/backup/vimrc~ @@ -0,0 +1,158 @@ +let mapleader = "" + +execute pathogen#infect() + +" An example for a vimrc file. +" +" Maintainer: Bram Moolenaar +" Last change: 2008 Dec 17 +" +" To use it, copy it to +" for Unix and OS/2: ~/.vimrc +" for Amiga: s:.vimrc +" for MS-DOS and Win32: $VIM\_vimrc +" for OpenVMS: sys$login:.vimrc + +" When started as "evim", evim.vim will already have done these settings. +if v:progname =~? "evim" + finish +endif + +" Use Vim settings, rather than Vi settings (much better!). +" This must be first, because it changes other options as a side effect. +set nocompatible + +map :bnext +map :bprev + + +" allow backspacing over everything in insert mode +set backspace=indent,eol,start + +if has("vms") + set nobackup " do not keep a backup file, use versions instead +else + set backup " keep a backup file +endif +set backupdir=~/.vim/backup +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time +set showcmd " display incomplete commands +set incsearch " do incremental searching +set nu + +" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries +" let &guioptions = substitute(&guioptions, "t", "", "g") + +" Don't use Ex mode, use Q for formatting +map Q gq + +" CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo, +" so that you can undo CTRL-U after inserting a line break. +inoremap u + +" In many terminal emulators the mouse works just fine, thus enable it. +if has('mouse') + set mouse=a +endif + +syntax on +color dracula + +set hlsearch + +" Only do this part when compiled with support for autocommands. +if has("autocmd") + + " Enable file type detection. + " Use the default filetype settings, so that mail gets 'tw' set to 72, + " 'cindent' is on in C files, etc. + " Also load indent files, to automatically do language-dependent indenting. + filetype plugin indent on + + " Put these in an autocmd group, so that we can delete them easily. + augroup vimrcEx + au! + + " For all text files set 'textwidth' to 78 characters. + autocmd FileType text setlocal textwidth=78 + + " When editing a file, always jump to the last known cursor position. + " Don't do it when the position is invalid or when inside an event handler + " (happens when dropping a file on gvim). + " Also don't do it when the mark is in the first line, that is the default + " position when opening a file. + autocmd BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") | + \ exe "normal! g`\"" | + \ endif + + augroup END + +else + + set autoindent " always set autoindenting on + +endif " has("autocmd") + +" Convenient command to see the difference between the current buffer and the +" file it was loaded from, thus the changes you made. +" Only define it when not defined already. +if !exists(":DiffOrig") + command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis + \ | wincmd p | diffthis +endif + +let g:syntastic_cs_checkers = ['syntax', 'semantic', 'issues'] + + +nnoremap th :OmniSharpHighlightTypes + +set tabstop=4 +" when indenting with '>', use 2 spaces width +set shiftwidth=4 + +set guifont=ProFontIIx:h12 +set linespace=3 +if has ("gui_macvim") + set background=dark + + filetype plugin indent on + " show existing tab with 2 spaces width + set tabstop=4 + " when indenting with '>', use 2 spaces width + set shiftwidth=4 + " On pressing tab, insert 2 spaces + set expandtab + + set transparency=3 +endif + +set runtimepath^=~/.vim/bundle/ctrlp.vim + +highlight LineNr ctermfg=grey + +noremap ø $ +noremap æ 0 +noremap Æ ( +noremap Ø ) +noremap _ / +set ignorecase +set smartcase + +call plug#begin('~/.vim/plugged') + +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } + +call plug#end() + + +if executable ('fzf') + " FZF{{{ + + nnoremap :FZF + + " }}} + + + diff --git a/backup/websiteTemplate.go~ b/backup/websiteTemplate.go~ new file mode 100644 index 0000000..d65fb16 --- /dev/null +++ b/backup/websiteTemplate.go~ @@ -0,0 +1,71 @@ +package main + +import ( + "html/template" + "net/http" + "strings" + "os" + "fmt" +) + +type Page struct { + Title string + MenuItems []string + Posts []Post +} + +var name string = "takunomi" +var posts []Post +var sections = []string {"about","past", "contact"} +var templates = template.Must(template.ParseFiles("blog.tmpl", "blog_roll.tmpl", "style.tmpl", "post.tmpl")) + +func main() { + + http.HandleFunc("/", blogHandler) + http.HandleFunc("/post/", postHandler) + + if os.Args[1] == "local" { + http.ListenAndServe(":8080", nil) + } + + if os.Args[1] == "ext" { + http.ListenAndServe(":35291", nil) + } + + //http.ListenAndServe(":8080", nil) + +} + +func errorHandler(w http.ResponseWriter, req *http.Request, status int) { + w.WriteHeader(status) + if status == http.StatusNotFound { + fmt.Fprint(w, "custom 404") + } +} + +func blogHandler(w http.ResponseWriter, req *http.Request) { + if req.URL.Path != "/" { + errorHandler(w, req, http.StatusNotFound) + return + } + posts = getNewestPosts(3) + page := Page {name, sections, posts} + renderTemplates(w, page) +} + +func postHandler (w http.ResponseWriter, r *http.Request) { + title := strings.TrimPrefix(r.URL.Path, "/post/") + posts := []Post{getPostByURLTitle(title)} + page := Page {name, sections, posts} + renderTemplates(w, page) +} + +func renderTemplates (w http.ResponseWriter, p Page) { + s1 := templates.Lookup("blog.tmpl") + s1.ExecuteTemplate(w, "blog", p) + s2 := templates.Lookup("blog_roll.tmpl") + s2.ExecuteTemplate(w, "blog_roll", nil) + s3 := templates.Lookup("post.tmpl") + s3.ExecuteTemplate(w, "post", nil) +} + diff --git a/bundle/ctrlp.vim b/bundle/ctrlp.vim deleted file mode 160000 index 564176f..0000000 --- a/bundle/ctrlp.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981 diff --git a/bundle/vim-airline b/bundle/vim-airline index b66c1ef..f41520f 160000 --- a/bundle/vim-airline +++ b/bundle/vim-airline @@ -1 +1 @@ -Subproject commit b66c1ef07005fad6a70957b90d4f47bb932e33e2 +Subproject commit f41520fd4afa58b147172ba49ad246f424069ca1 diff --git a/vimrc b/vimrc index 0fec9fe..09741fb 100644 --- a/vimrc +++ b/vimrc @@ -1,3 +1,4 @@ +let mapleader = "" execute pathogen#infect() @@ -131,10 +132,26 @@ set runtimepath^=~/.vim/bundle/ctrlp.vim highlight LineNr ctermfg=grey -map ø $ -map æ 0 -map Æ ( -map Ø ) -map _ / +noremap ø $ +noremap æ 0 +noremap Æ ( +noremap Ø ) +noremap _ / set ignorecase set smartcase + +call plug#begin('~/.vim/plugged') + +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } + +call plug#end() + + +if executable ('fzf') + " FZF{{{ + + nnoremap :FZF + + " }}} +endif +