Browse Source

Merge branch 'master' of git.xchg.sh:angrygoats/essentials

Taylor Bockman 5 years ago
parent
commit
d93a753272
  1. 5
      README.md
  2. 30
      dotfiles/config/nvim/init.vim
  3. 2
      dotfiles/emacs.d/init.el
  4. 1
      dotfiles/emacs.d/package.el
  5. 2
      dotfiles/zshrc
  6. BIN
      patched-inconsolata/Inconsolata Bold Nerd Font Complete Mono.ttf
  7. BIN
      patched-inconsolata/Inconsolata Bold Nerd Font Complete.ttf
  8. BIN
      patched-inconsolata/Inconsolata Nerd Font Complete.otf
  9. BIN
      patched-inconsolata/Inconsolata Regular Nerd Font Complete Mono.ttf
  10. BIN
      patched-inconsolata/Inconsolata Regular Nerd Font Complete.ttf

5
README.md

@ -15,6 +15,11 @@ The directory structure is as follows:
3. *installation_instructions* - This file contains a series of command you copy and paste during install of Arch
4. *nix/* - This contains all the stuff needed to get up and running with my nix configuration
## Patched Fonts
There are a series of patched inconsolata fonts designed for work with the plugins I have for
icons in nerd tree. These are not Windows compatible.
## Emacs Specific Things
Before programming C, install `global` and `libclang` in your distro. After doing that, run `M-x irony-install-server` to install the server in the emacs directory.

30
dotfiles/config/nvim/init.vim

@ -8,11 +8,8 @@ endif
call plug#begin('~/.config/nvim/plugged')
" Solarized theme
Plug 'altercation/vim-colors-solarized'
" Zenburn theme
Plug 'vim-scripts/zenburn'
" Material theme
Plug 'hzchirs/vim-material'
" Syntastic
Plug 'scrooloose/syntastic'
@ -35,6 +32,7 @@ Plug 'mileszs/ack.vim'
" Improved vim status bar
Plug 'bling/vim-airline'
Plug 'vim-airline/vim-airline-themes'
let g:airline_theme='material'
" Indent guides
Plug 'Yggdroot/indentLine'
@ -57,7 +55,6 @@ Plug 'wavded/vim-stylus'
Plug 'raichoo/haskell-vim'
Plug 'OCamlPro/ocp-indent'
Plug 'slim-template/vim-slim'
Plug 'fatih/vim-go'
Plug 'isRuslan/vim-es6'
" SBT integration for vim
@ -82,6 +79,9 @@ if !has("win32") || !has("win16")
" For nerdtree indicators of what has changed
Plug 'Xuyuanp/nerdtree-git-plugin'
" For some modern file icons
Plug 'ryanoasis/vim-devicons'
" Make Vim play nice with tmux
" Use <c-h> <c-j> <c-k> <c-l>
" to move between window panes in tmux or vim
@ -114,6 +114,16 @@ Plug 'https://github.com/vim-scripts/dbext.vim'
" end plugin list
call plug#end()
" Configure vim for true color display otherwise vim-material won't display
" correctly.
if (has('nvim'))
let $NVIM_TUI_ENABLE_TRUE_COLOR = 1
endif
if (has('termguicolors'))
set termguicolors
endif
" Standard variables
set expandtab " tabs to spaces
set tabstop=2 " spaces entered when tab key is pressed
@ -220,9 +230,6 @@ endif
let g:syntastic_javascript_checkers = ['eslint']
let g:syntastic_javascript_jsxhint_exec = 'eslint'
" Color customizations
colorscheme zenburn
" Python-mode settings
" disable pymode folding
@ -259,3 +266,8 @@ let g:indentLine_enabled=0
" Leader + i will toggle line indent guides
map <silent> <Leader>i :IndentLinesToggle<CR>
" Color scheme setting is done absolutely last to make sure everything is
" available to vim
set background=dark
colorscheme vim-material

2
dotfiles/emacs.d/init.el

@ -457,7 +457,7 @@
(set-frame-parameter nil 'background-mode 'dark)
(set-terminal-parameter nil 'background-mode 'dark)
(load-theme 'zenburn t)
(load-theme 'material t)
;; 10 pt font
(set-frame-font "inconsolata")

1
dotfiles/emacs.d/package.el

@ -41,6 +41,7 @@
wrap-region
expand-region
wrap-region
material-theme
;;;;;
;; Project Interaction/Search/Syntax

2
dotfiles/zshrc

@ -29,7 +29,7 @@ export GOPATH=$HOME/go/
export PATH=$PATH:"$GOPATH/bin"
alias emacs='emacs -nw'
alias vim='emacs' # LOL
alias vim='nvim'
alias irssi='TERM=screen-256color irssi'
alias scheme='rlwrap mit-scheme'
alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'

BIN
patched-inconsolata/Inconsolata Bold Nerd Font Complete Mono.ttf

Binary file not shown.

BIN
patched-inconsolata/Inconsolata Bold Nerd Font Complete.ttf

Binary file not shown.

BIN
patched-inconsolata/Inconsolata Nerd Font Complete.otf

Binary file not shown.

BIN
patched-inconsolata/Inconsolata Regular Nerd Font Complete Mono.ttf

Binary file not shown.

BIN
patched-inconsolata/Inconsolata Regular Nerd Font Complete.ttf

Binary file not shown.
Loading…
Cancel
Save