installed plug stuff, removed ctrl p, added fzf stuff

This commit is contained in:
Jacob 2017-11-08 10:48:07 +01:00
parent c8440a27c9
commit 5d3f2b103a
7 changed files with 269 additions and 8 deletions

View File

@ -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'

10
backup/.netrwhist~ Normal file
View File

@ -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'

158
backup/vimrc~ Normal file
View File

@ -0,0 +1,158 @@
let mapleader = "<space>"
execute pathogen#infect()
" An example for a vimrc file.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
" 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 <C-J> :bnext<CR>
map <C-K> :bprev<CR>
" 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 <C-U> <C-G>u<C-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 <leader>th :OmniSharpHighlightTypes<cr>
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 <silent> <C-p> :FZF<CR>
" }}}

View File

@ -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)
}

@ -1 +0,0 @@
Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981

@ -1 +1 @@
Subproject commit b66c1ef07005fad6a70957b90d4f47bb932e33e2
Subproject commit f41520fd4afa58b147172ba49ad246f424069ca1

27
vimrc
View File

@ -1,3 +1,4 @@
let mapleader = "<space>"
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 <silent> <C-p> :FZF<CR>
" }}}
endif