Merge branch 'master' of ssh://github.com/dustinswan/dotfiles

config.fish

@@ -3,20 +3,15 @@ alias l "ls -la"
 alias tmux "tmux -2"
 alias ta "tmux attach -d"
 alias dustinswan "mosh dustinswan@dustinswan.org"
+alias kill_offlineimap "ps aux | grep offlineimap | awk '{ print $2 }' | xargs kill -9"
 set -x EDITOR "vim"
 set -x TERM "screen-256color"
-# TODO fix this for linux
-set -x BROWSER "open"
-alias browser "eval $BROWSER"
 set -x MOSH_TITLE_NOPREFIX 1
 
-# PATH
+set -x BROWSER "open"
-set -x PATH /usr/local/bin /usr/local/sbin $PATH # Homebrew
+[ -s luakit ] and set -x BROWSER=luakit
-set -x PATH $PATH $HOME/Library/Haskell/bin # Haskell
+
-set -x PATH $PATH $HOME/dotfiles/bin # Dotfiles bin
+alias browser "eval $BROWSER"
-set -x PATH $PATH /usr/local/share/npm/bin # npm
-set -x NODE_PATH $NODE_PATH /usr/local/lib/node
-set -x PYTHONPATH $PYTHONPATH /usr/local/lib/python2.7/site-packages
 
 # IOCOM stuff
 set -x P4USER "dswan"
@@ -26,11 +21,32 @@ set -x P4EDITOR "vim"
 alias p4vimdiff "set -x P4DIFF vimdiff; p4 diff"
 alias visidev "ssh root@visidev.iocom.com 'cd /; p4 sync'; scp /opt/iocom/user/webclient/all_desktop.js root@visidev.iocom.com:/opt/iocom/user/webclient/; scp /opt/iocom/user/webclient/css/all_desktop.css root@visidev.iocom.com:/opt/iocom/user/webclient/css/"
 alias dswan "ssh root@dswan.insors.net"
-alias webdev 'ssh -t root@webdev.insors.net "cd /var/www/html; /bin/bash -i"'
+alias er 'rm -rf logs; unzip -o'
 
-# chruby-fish: https://github.com/JeanMertz/chruby-fish
+# PATH
-#. /usr/local/share/chruby/chruby.fish
+set -x PATH /usr/local/bin /usr/local/sbin $PATH # Homebrew
-# source /usr/local/share/chruby/auto.fish # SERIOUSY BROKEN
+set -x PATH /Applications/Postgres.app/Contents/MacOS/bin $PATH
+set -x PATH $HOME/Library/Haskell/bin $PATH
+set -x PATH $HOME/dotfiles/bin $PATH
+set -x PATH /usr/local/share/npm/bin $PATH
+set -x NODE_PATH $NODE_PATH /usr/local/lib/node
+set -x PYTHONPATH $PYTHONPATH /usr/local/lib/python2.7/site-packages
+set -x SSL_CERT_FILE /usr/local/opt/curl-ca-bundle/share/ca-bundle.crt
 
-# GPG
+# Nix
-#~/dotfiles/bin/gpg-agent.sh
+. $HOME/.nix-profile/etc/fish/config.fish
+#sh $HOME/.nix-profile/etc/profile.d/nix.sh
+sh $HOME/.nix-profile/etc/profile.d/nix_fish.sh
+
+# Chruby
+source /usr/local/share/chruby/chruby.fish
+source /usr/local/share/chruby/auto.fish
+
+# NVM
+test -s /Users/dustinswan/.nvm/nvm.fish; and source /Users/dustinswan/.nvm/nvm.fish
+
+if status --is-interactive;
+    keychain ~/.ssh/id_rsa
+    [ -e $HOME/.keychain/$HOSTNAME-fish ]; and . $HOME/.keychain/$HOSTNAME-fish 
+    [ -e $HOME/.keychain/$HOSTNAME-fish-gpg]; and . $HOME/.keychain/$HOSTNAME-fish-gpg
+end

configuration.nix

@@ -0,0 +1,85 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Use the GRUB 2 boot loader.
+  boot.loader.grub.enable = true;
+  boot.loader.grub.version = 2;
+  # Define on which hard drive you want to install Grub.
+  boot.loader.grub.device = "/dev/sda";
+
+  networking.hostName = "swan-nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless.
+
+  # Select internationalisation properties.
+  i18n = {
+    consoleFont = "lat9w-16";
+    consoleKeyMap = "dvorak";
+    defaultLocale = "en_US.UTF-8";
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search by name, run:
+  # -env -qaP | grep wget
+  environment.systemPackages = with pkgs; [
+    fish
+    i3
+    i3status
+    dmenu
+    wget
+  ];
+
+  environment.shells = [ "/run/current-system/sw/bin/zsh" ];
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  services.openssh.enable = true;
+
+  time.timeZone = "America/Chicago";
+  services.ntp.enable = false;
+  services.chrony.enable = true;
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+  services.xserver.layout = "dvorak";
+  # services.xserver.xkbOptions = "eurosign:e";
+
+  services.xserver.desktopManager.default = "none";
+  services.xserver.desktopManager.xterm.enable = false;
+
+  services.xserver.displayManager.slim.enable = true;
+
+  services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.default = "i3";
+
+  services.xserver.resolutions = [ { x = 1440; y = 900; } ];
+
+  services.xserver.synaptics.enable = true;
+  services.xserver.synaptics.twoFingerScroll = true;
+
+  users.defaultUserShell = "/var/run/current-system/sw/bin/zsh";
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.extraUsers.dustinswan = {
+    name = "dustinswan";
+    group = "users";
+    extraGroups = [ "wheel" ];
+    createHome = true;
+    home = "/home/dustinswan";
+    useDefaultShell = true;
+  };
+
+}

ghci.conf

@@ -5,7 +5,6 @@ import Data.String
 import Data.Char
 import Data.List
 import Data.Monoid
-import Control.Monad.IO.Class
 
 :set prompt "λ: "
 :set -fno-warn-unused-imports

vimrc

@@ -1,74 +1,73 @@
 set nocompatible
-filetype off
+"filetype off
-set rtp+=~/.vim/bundle/Vundle.vim
+"set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+"call vundle#begin()
 
-Plugin 'gmarik/Vundle.vim'
+call plug#begin('~/.vim/plugged')
-Plugin 'sheerun/vim-polyglot'
-Plugin 'terryma/vim-multiple-cursors'
-Plugin 'chrisbra/csv.vim'
-"Plugin 'spreadsheet.vim'
-Plugin 'szw/vim-dict'
-Plugin 'burnettk/vim-angular'
-Plugin 'jQuery'
-Plugin 'tpope/vim-rails'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-vinegar'
-Plugin 'tpope/vim-characterize.git'
-Plugin 'tpope/vim-jdaddy'
-Plugin 'tpope/vim-eunuch'
-" Plugin 'tpope/vim-unimpared'
-Plugin 'mileszs/ack.vim'
-Plugin 'justinmk/vim-sneak'
-Plugin 'bkad/CamelCaseMotion'
-Plugin 'majutsushi/tagbar'
-Plugin 'scrooloose/syntastic'
-Plugin 'scrooloose/nerdcommenter'
-Plugin 'w0ng/vim-hybrid'
-" Plugin 'ervandew/supertab'
-Plugin 'kien/ctrlp.vim'
-Plugin 'gregsexton/MatchTag'
-" Plugin 'kana/vim-smartinput'
-Plugin 'Raimondi/delimitMate'
-Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
-Plugin 'mbbill/undotree'
-Plugin 'coderifous/textobj-word-column.vim'
-" Plugin 'myusuf3/numbers'
-" Plugin 'benmills/vimux'
-Plugin 'searchfold.vim'
-Plugin 'godlygeek/tabular'
-Plugin 'tommcdo/vim-lion'
-Plugin 'kshenoy/vim-signature'
-"Plugin 'SirVer/ultisnips'
-"Plugin 'fmoralesc/vim-pad' " Takes forever to start
-Plugin 'eagletmt/ghc-mod'
-Plugin 'eagletmt/neco-ghc'
-"Plugin 'lukerandall/haskellmode-vim'
-"Plugin 'bitc/vim-hdevtools'
-Plugin 'Shougo/vimproc.vim'
-Plugin 'Shougo/neocomplcache'
-Plugin 'qstrahl/vim-matchmaker'
-"Plugin 'bling/vim-airline'
-Plugin 'matze/vim-move'
-Plugin 'bruno-/vim-vertical-move'
-Plugin 'itchyny/calendar.vim'
-Plugin 'lfilho/cosco.vim'
-Plugin 'ntpeters/vim-better-whitespace'
-" No good for IOCOM
-Plugin 'sdanielf/vim-stdtabs'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'gcmt/wildfire.vim'
-Plugin 'lambdatoast/elm.vim'
-Plugin 'AndrewRadev/splitjoin.vim'
-Plugin 'kien/rainbow_parentheses.vim'
-Plugin 'nathanaelkane/vim-indent-guides'
-Plugin 'junegunn/goyo.vim'
 
+"Plug 'gmarik/Vundle.vim'
+Plug 'sheerun/vim-polyglot'
+Plug 'terryma/vim-multiple-cursors'
+Plug 'szw/vim-dict'
+Plug 'burnettk/vim-angular'
+Plug 'jQuery'
+Plug 'tpope/vim-rails'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-endwise'
+Plug 'tpope/vim-vinegar'
+Plug 'tpope/vim-characterize'
+Plug 'tpope/vim-jdaddy'
+Plug 'tpope/vim-eunuch'
+" Plug 'tpope/vim-unimpared'
+Plug 'mileszs/ack.vim'
+Plug 'justinmk/vim-sneak'
+Plug 'bkad/CamelCaseMotion'
+Plug 'majutsushi/tagbar'
+Plug 'scrooloose/syntastic'
+Plug 'scrooloose/nerdcommenter'
+Plug 'w0ng/vim-hybrid'
+" Plug 'ervandew/supertab'
+Plug 'kien/ctrlp.vim'
+Plug 'gregsexton/MatchTag'
+" Plug 'kana/vim-smartinput'
+Plug 'Raimondi/delimitMate'
+Plug 'rstacruz/sparkup', {'rtp': 'vim/'}
+Plug 'mbbill/undotree'
+Plug 'coderifous/textobj-word-column.vim'
+Plug 'benmills/vimux'
+Plug 'searchfold.vim'
+Plug 'godlygeek/tabular'
+Plug 'tommcdo/vim-lion'
+Plug 'kshenoy/vim-signature'
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+Plug 'Valloric/YouCompleteMe', { 'do': './install.sh' }
+Plug 'eagletmt/ghc-mod'
+"Plug 'eagletmt/neco-ghc'
+"Plug 'lukerandall/haskellmode-vim'
+Plug 'bitc/vim-hdevtools'
+Plug 'idris-hackers/idris-vim'
+Plug 'qstrahl/vim-matchmaker'
+"Plug 'bling/vim-airline'
+Plug 'matze/vim-move'
+Plug 'bruno-/vim-vertical-move'
+Plug 'itchyny/calendar.vim'
+Plug 'lfilho/cosco.vim'
+Plug 'ntpeters/vim-better-whitespace'
+Plug 'sdanielf/vim-stdtabs'
+Plug 'airblade/vim-gitgutter'
+Plug 'gcmt/wildfire.vim'
+Plug 'lambdatoast/elm.vim'
+Plug 'AndrewRadev/splitjoin.vim'
+Plug 'kien/rainbow_parentheses.vim'
+Plug 'nathanaelkane/vim-indent-guides'
+Plug 'junegunn/goyo.vim'
+
+call plug#end()
 "let $GIT_SSL_NO_VERIFY = 'true'
-call vundle#end()
+"call vundle#end()
 filetype plugin indent on " last Vundle requirement
 
 " mouse
@@ -78,7 +77,7 @@ if has("mouse")
 endif
 
 " general goodness
-"set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders
+set shell=/bin/bash " Syntastic breaks when trying to write to /var/folders
 syntax enable
 let mapleader=","
 let maplocalleader="\\"
@@ -102,7 +101,7 @@ set laststatus=2 " Always show the statusline
 set scrolloff=5 " Give us a few lines before and after the cursor
 
 " Encryption
-set cryptmethod=blowfish
+set cryptmethod=blowfish2
 
 " long lines
 set wrap
@@ -164,13 +163,6 @@ python from powerline.vim import setup as powerline_setup
 python powerline_setup()
 python del powerline_setup
 
-" Airline
-"let g:airline_left_sep=''
-"let g:airline_right_sep=''
-" let g:airline_theme='solarized'
-"let g:airline_powerline_fonts=1
-"let g:airline#extensions#tabline#enabled=1
-
 " Colors
 " colorscheme default
 colorscheme hybrid
@@ -198,6 +190,7 @@ nnoremap <leader>S :SyntasticToggleMode<cr>
 " let g:SuperTabDefaultCompletionType="context"
 
 " UltiSnips
+let g:UltiSnipsExpandTrigger="<tab>"
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 
@@ -212,9 +205,6 @@ nnoremap <leader>a :Ack<space>
 " use ag
 let g:ackprg = 'ag --nogroup --nocolor --column'
 
-" Clam
-" nnoremap ! :Clam<space>
-
 " Buffer selection
 nnoremap <leader>l :ls<cr>:b<space>
 
@@ -222,18 +212,13 @@ nnoremap <leader>l :ls<cr>:b<space>
 "let g:ctrlp_max_files = 10000
 let g:ctrlp_clear_cache_on_exit = 0
 
-" Vimux stuff
+" Vimux
-nnoremap <silent><leader><leader>vp :VimuxPromptCommand<cr>
+nnoremap <Leader>vp :VimuxPromptCommand<CR>
-nnoremap <silent><leader><leader>vl :VimuxRunLastCommand<cr>
+nnoremap <Leader>vl :VimuxRunLastCommand<CR>
-nnoremap <silent><leader><leader>vi :VimuxInspectRunner<cr>
+nnoremap <Leader>vi :VimuxInspectRunner<CR>
-nnoremap <silent><leader><leader>vq :VimuxCloseRunner<cr>
+nnoremap <Leader>vq :VimuxCloseRunner<CR>
-nnoremap <silent><leader><leader>vs :VimuxInterruptRunner<cr>
+nnoremap <Leader>vx :VimuxInterruptRunner<CR>
-nnoremap <silent><leader><leader>vx :VimuxClosePanes<cr>
+nnoremap <Leader>vz :call VimuxZoomRunner()<CR>
-nnoremap <silent><leader><leader>vc :VimuxClearRunnerHistory<cr>
-
-" Vim-Pad
-"let g:pad_dir = "~/Dropbox/notes/"
-"let g:pad_search_backend = "ack"
 
 " Haskellmode
 "let g:ghc = "/usr/bin/ghc"
@@ -241,11 +226,13 @@ nnoremap <silent><leader><leader>vc :VimuxClearRunnerHistory<cr>
 "let g:haddock_browser_callformat = "%s %s"
 
 " hdevtools
-"nnoremap <leader>ht :HdevtoolsType<cr>
+nnoremap <leader>ht :HdevtoolsType<cr>
-"nnoremap <leader>hc :HdevtoolsClear<cr>
+nnoremap <leader>hc :HdevtoolsClear<cr>
-"nnoremap <leader>hi :HdevtoolsInfo<cr>
+nnoremap <leader>hi :HdevtoolsInfo<cr>
 
-let g:necoghc_enable_detailed_browse = 1
+autocmd BufEnter *.hs set formatprg=pointfree
+
+"let g:necoghc_enable_detailed_browse = 1
 
 " automatically open and close the popup menu / preview window
 au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
@@ -255,16 +242,9 @@ set completeopt=menu,preview,longest
 nnoremap <leader>u :UndotreeToggle<cr>
 
 " Move between splits
-map <c-j> <c-w>j<c-w>_
-map <c-k> <c-w>k<c-w>_
 map <c-l> <c-w>l<c-w>_
 map <c-h> <c-w>h<c-w>_
 
-" NeoComplCache
-let g:neocomplcache_enable_at_startup = 1
-let g:neocomplcache_enable_smart_case = 1
-autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-
 " Vim-move
 let g:move_key_modifier = 'C'
 
@@ -281,3 +261,5 @@ autocmd FileType javascript,css inoremap <silent> ,; <ESC>:call cosco#commaOrSem
 " Browser
 :let g:netrw_browsex_viewer = "browser"
 
+" Calendar
+let g:calendar_google_calendar = 1