Compare commits

...

3 Commits

Author SHA1 Message Date
71a52ec3d3 nixpkgs for non-nixos 2020-10-12 19:05:24 -07:00
57e7f870cf vimrc update 2020-10-12 19:05:17 -07:00
db2b7fb39d makefile update 2020-10-12 19:05:11 -07:00
3 changed files with 312 additions and 66 deletions

View File

@ -39,9 +39,6 @@ mailoffsite: imapbackup
$(HOME)/Documents/Dropbox/eeqj/archives/mail.tgz
databackup:
mkdir -p $(HOME)/Library/misc
#brew list > $(HOME)/Library/misc/brewinstalled.txt
#brew cask list > $(HOME)/Library/misc/brew-cask-installed.txt
~/dev/hacks/bin/backup.command
cleanup:

102
nixpkgs/config.nix Normal file
View File

@ -0,0 +1,102 @@
{
allowUnsupportedSystem = true;
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
'';
nostromo = pkgs.buildEnv {
name = "nostromopackages";
paths = [
basePackages
macPackages
];
pathsToLink = [ "/Applications" "/share/man" "/share/doc" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" ];
};
secondmillion = pkgs.buildEnv {
name = "secondmillion";
paths = [
basePackages
macPackages
];
pathsToLink = [ "/Applications" "/share/man" "/share/doc" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" ];
};
macPackages = pkgs.buildEnv {
name = "macPackages";
paths = [
pinentry_mac
];
pathsToLink = [ "/Applications" "/share/man" "/share/doc" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" ];
};
adminPackages = pkgs.buildEnv {
name = "adminPackages";
paths = [
(runCommand "profile" {} ''
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
byobu
envdir
httpie
jq
mosh
nmap
openssl
pv
rsync
runit
terraform
tmux
wget
xz
];
pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" ];
};
basePackages = pkgs.buildEnv {
name = "my-packages";
paths = [
(runCommand "profile" {} ''
mkdir -p $out/etc/profile.d
cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
adminPackages
aria2
byobu
cmus
coreutils-prefixed
envdir
ffmpeg
gnupg
go
httpie
jq
neofetch
neovim
nmap
nodejs
openssl
par2cmdline
pv
pwgen
rsync
runit
tmux
tor
vim
vimpager
weechat
wget
xz
yarn
];
pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" ];
};
};
}

View File

@ -1,87 +1,236 @@
execute pathogen#infect()
" this has to be first apparently?
" i had problems when it was lower in the file.
let mapleader=","
let system_uname = system('uname -s')
let osx = system_uname =~? 'darwin'
let linux = system_uname =~? 'linux'
let windows = has('win32') || system_uname =~? 'mingw'
set number
silent !mkdir -p ~/Library/vim/backup > /dev/null 2>&1
silent !mkdir -p ~/Library/vim/undo > /dev/null 2>&1
silent !mkdir -p ~/Library/vim/swap > /dev/null 2>&1
silent !mkdir -p ~/.paths/sneak-sync/dotfiles/vim/autoload > /dev/null 2>&1
silent !mkdir -p ~/.paths/sneak-sync/dotfiles/vim/plugged > /dev/null 2>&1
if empty(glob('~/.paths/sneak-sync/dotfiles/vim/autoload/plug.vim'))
silent !curl -fLo ~/.paths/sneak-sync/dotfiles/vim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif
source ~/.paths/sneak-sync/dotfiles/vim/autoload/plug.vim
"Plug 'zchee/deoplete-go', { 'for': 'go' }
"Plug 'zchee/deoplete-jedi', { 'for': 'python' }
call plug#begin('~/.paths/sneak-sync/dotfiles/vim/plugged')
if has('nvim')
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
Plug 'roxma/nvim-yarp'
Plug 'roxma/vim-hug-neovim-rpc'
let g:deoplete#enable_at_startup = 1
endif
Plug 'tpope/vim-sensible'
Plug 'preservim/nerdtree'
Plug 'ryanoasis/vim-devicons'
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
"Plug 'fatih/molokai'
Plug 'morhetz/gruvbox'
Plug 'sbdchd/neoformat'
Plug 'LnL7/vim-nix'
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" syntastic
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Plug 'vim-syntastic/syntastic'
set statusline+=%#warningmsg#
set statusline+=%{SyntasticStatuslineFlag()}
set statusline+=%*
let g:syntastic_always_populate_loc_list = 1
let g:syntastic_auto_loc_list = 1
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
let g:syntastic_go_checkers = ['go']
call plug#end()
let g:rehash256 = 1
let g:molokai_original = 1
let g:gruvbox_italic = 1
"colorscheme molokai
colorscheme gruvbox
noremap <Leader>w :w<cr>
noremap <Leader><cr> i<cr><Esc>
noremap <Leader>l :GoMetaLinter<cr>
noremap <Leader>b :GoBuild<cr>
noremap <Leader>f :Neoformat<cr>
noremap <Leader>t :NERDTreeToggle<CR>
" vim-go golang configuration:
let g:go_fmt_fail_silently = 0
let g:go_fmt_command = "goimports"
let g:go_addtags_transform = "camelcase"
let g:go_highlight_types = 1
let g:go_highlight_fields = 1
let g:go_highlight_functions = 1
let g:go_highlight_function_calls = 1
let g:go_highlight_extra_types = 1
let g:go_def_mode='gopls'
let g:go_info_mode='gopls'
let g:go_auto_type_info = 1
"highlight SyntasticErrorSign guifg=white guibg=red
"Plug 'scrooloose/nerdtree'
"Plug 'ludovicchabant/vim-gutentags'
let g:gutentags_ctags_tagfile = '.tags'
let g:gutentags_file_list_command = 'git ls-files'
let g:gutentags_generate_on_new = 1
"Plug 'majutsushi/tagbar'
"Plug 'fatih/vim-go', { 'do': 'GoUpdateBinaries', 'for': 'go' }
"Plug 'cespare/vim-toml', { 'for': 'toml' }
"call plug#end()
let g:airline_powerline_fonts = 1
if !exists('g:airline_symbols')
let g:airline_symbols = {}
endif
" unicode symbols
" let g:airline_left_sep = '▶'
" let g:airline_right_sep = '◀'
let g:airline_symbols.crypt = '🔒'
let g:airline_symbols.linenr = '☰'
" let g:airline_symbols.linenr = '␊'
" let g:airline_symbols.linenr = '␤'
" let g:airline_symbols.linenr = '¶'
" let g:airline_symbols.maxlinenr = ''
" let g:airline_symbols.maxlinenr = '㏑'
" let g:airline_symbols.branch = '⎇'
" let g:airline_symbols.paste = 'ρ'
" let g:airline_symbols.paste = 'Þ'
" let g:airline_symbols.paste = '∥'
" let g:airline_symbols.spell = 'Ꞩ'
" let g:airline_symbols.notexists = 'Ɇ'
" let g:airline_symbols.whitespace = 'Ξ'
fun! InitBex()
let myvar = strftime("%y%m%d.%Hh%M")
let myvar = "set backupext=.". myvar
execute myvar
endfun
map <silent> <Esc>:call InitBex()<CR>
silent call InitBex()
set relativenumber
filetype plugin indent on
syntax on
set modelines=10
noremap <Up> ""
noremap! <Up> <Esc>
noremap <Down> ""
noremap! <Down> <Esc>
noremap <Left> ""
noremap! <Left> <Esc>
noremap <Right> ""
noremap! <Right> <Esc>
vnoremap > ><CR>gv
vnoremap < <<CR>gv
"noremap <Up> ""
"noremap! <Up> <Esc>
"noremap <Down> ""
"noremap! <Down> <Esc>
"noremap <Left> ""
"noremap! <Left> <Esc>
"noremap <Right> ""
"noremap! <Right> <Esc>
"vnoremap > ><CR>gv
"vnoremap < <<CR>gv
"au BufWinLeave * silent! mkview
"au BufWinEnter * silent! loadview
set directory=~/.vim/swap//
set backupdir=~/.vim/backup//
set undodir=~/.vim/undo//
set spelllang=en
set spellfile=~/.vim/spellfile.utf-8.add
set backup
set writebackup
set undofile
set showbreak=\ \ \ \
set linebreak
au BufRead,BufNewFile *.go set filetype=go
au BufRead,BufNewFile *.coffee set filetype=coffee
"au BufRead,BufNewFile *.coffee set filetype=coffee
let mapleader=","
set tw=76
set encoding=utf-8
setglobal fileencoding=utf-8
set nobomb
set hidden
set termencoding=utf-8
set fileencodings=utf-8,iso-8859-15
set backspace=indent,eol,start
set guifont=Monaco:h16
set modeline
set cmdheight=3
set laststatus=2
set tabstop=4
set shiftwidth=4
set softtabstop=4
set ignorecase
set smartcase
set gdefault
set incsearch
set showmatch
set hlsearch
"nnoremap <leader><space> :noh<cr>
set bg=dark
set ignorecase
set smartcase
set gdefault
set incsearch
set showmatch
set hlsearch
set autoindent
set smarttab
"set signcolumn=yes
set backspace=indent,eol,start
set backup
set backupdir=~/Library/vim/backup//
set cmdheight=3
"set clipboard=unnamed
set directory=~/Library/vim/swap//
set encoding=utf-8
set expandtab
set nowrap
set fileencodings=utf-8,iso-8859-15
set guifont=Monaco:h16
set hidden
set ignorecase
set laststatus=2
set modeline
set nobomb
set nocompatible
set shiftwidth=4
set showcmd
set smartcase
set smarttab
set softtabstop=4
set spellfile=~/.paths/sneak-sync/dotfiles/vim/spellfile.utf-8.add
set spelllang=en
set tabstop=4
set termencoding=utf-8
set ttyfast
set tw=76
set undodir=~/Library/vim/undo//
set undofile
set wildignore+=*.pyc
set writebackup
setglobal fileencoding=utf-8
autocmd FileType make setlocal noexpandtab
autocmd FileType markdown setlocal spell
au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
autocmd BufNewFile,BufRead *.json set ft=javascript
set ttyfast
set showcmd
set nocompatible
set wildignore+=*.pyc
set ignorecase
set smartcase
inoremap jj <Esc>
map N Nzz
map n nzz
map <s-tab> <c-w><c-w>
colorscheme koehler
autocmd BufWritePre *.js Neoformat
autocmd BufWritePre *.jsx Neoformat
autocmd BufWritePre *.json Neoformat
autocmd BufWritePre *.css Neoformat
"inoremap jj <Esc>
"map N Nzz
"map n nzz
"map <s-tab> <c-w><c-w>
"colorscheme koehler
hi CursorLine term=none cterm=none ctermbg=none
set t_Co=256
nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
vnoremap <Space> zf
set foldmethod=indent
set foldminlines=5
set nofoldenable "dont fold by default
set foldlevel=1 "this is just what i use
"nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
"vnoremap <Space> zf
nnoremap <silent> <Tab> :bn<CR>
nnoremap <silent> <Backspace> :bp<CR>
@ -102,5 +251,3 @@ let python_no_number_highlight = 1
let python_space_error_highlight = 1
let g:flake8_show_in_gutter=1 " show
let g:go_fmt_command = "goimports"