Separate system from home-manager again
This commit is contained in:
Greg Hellings
@@ -0,0 +1,157 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
colorschemes.gruvbox.enable = true;
|
||||
globals = {
|
||||
indent_guides_enable_on_vim_startup = 1;
|
||||
nix_recommended_style = 0;
|
||||
};
|
||||
opts = {
|
||||
background = "dark";
|
||||
backup = false;
|
||||
copyindent = true;
|
||||
cursorline = true;
|
||||
expandtab = false;
|
||||
hidden = true;
|
||||
hlsearch = true;
|
||||
ignorecase = true;
|
||||
lazyredraw = true;
|
||||
list = true;
|
||||
listchars = "tab:→ ,extends:→,precedes:←,trail:·,eol:¬";
|
||||
mouse = "a";
|
||||
number = true;
|
||||
preserveindent = true;
|
||||
relativenumber = true;
|
||||
shiftwidth = 4;
|
||||
showcmd = true;
|
||||
showmatch = true;
|
||||
signcolumn = "yes";
|
||||
smartcase = true;
|
||||
softtabstop = 4;
|
||||
tabstop = 4;
|
||||
# Setting for CtrlP
|
||||
wildignore = "*.swp,*.pyc,*.class,.tox";
|
||||
wrap = false;
|
||||
writebackup = false;
|
||||
};
|
||||
keymaps =
|
||||
let
|
||||
winMove = key: {
|
||||
mode = "n";
|
||||
key = "<C-${key}>";
|
||||
action = "<C-w>${key}<C-w><CR>";
|
||||
};
|
||||
in
|
||||
[
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-e>";
|
||||
action = "<Esc>:BufExplorer<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-t>";
|
||||
#action = "<Esc>:NERDTreeToggle<CR>";
|
||||
action = "<Esc>:Neotree toggle<CR>";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<C-g>";
|
||||
action = "<Esc>:Git<CR>";
|
||||
}
|
||||
(winMove "h")
|
||||
(winMove "j")
|
||||
(winMove "k")
|
||||
(winMove "l")
|
||||
];
|
||||
plugins = {
|
||||
airline.enable = true;
|
||||
cmp = {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
settings = {
|
||||
sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
{
|
||||
name = "buffer";
|
||||
group_index = 2;
|
||||
}
|
||||
{
|
||||
name = "path";
|
||||
gruop_index = 3;
|
||||
}
|
||||
];
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete()";
|
||||
"<CR>" = "cmp.mapping.confirm({ select = true })";
|
||||
"<C-f>" = "cmp.mapping.select_next_item()";
|
||||
"<C-b>" = "cmp.mapping.select_prev_item()";
|
||||
"<C-c>" = "cmp.mapping.abort()";
|
||||
};
|
||||
};
|
||||
};
|
||||
direnv.enable = true;
|
||||
gitgutter.enable = true;
|
||||
fugitive.enable = true;
|
||||
fzf-lua = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
"<C-o>" = {
|
||||
action = "files";
|
||||
settings = {
|
||||
previewers.cat.cmd = "${pkgs.coreutils}/bin/cat";
|
||||
winopts.height = 0.5;
|
||||
};
|
||||
};
|
||||
"<C-p>" = {
|
||||
action = "git_files";
|
||||
settings = {
|
||||
previewers.cat.cmd = "${pkgs.coreutils}/bin/cat";
|
||||
winopts.height = 0.5;
|
||||
};
|
||||
};
|
||||
};
|
||||
profile = "fzf-vim";
|
||||
};
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
ansiblels.enable = true;
|
||||
cmake.enable = true;
|
||||
gopls.enable = true;
|
||||
html.enable = true;
|
||||
nixd.enable = true;
|
||||
pylsp.enable = true;
|
||||
pyright.enable = true;
|
||||
rust_analyzer = {
|
||||
# No need to have these installed on every one of my systems
|
||||
installCargo = false;
|
||||
installRustc = false;
|
||||
enable = true;
|
||||
};
|
||||
terraformls.enable = true;
|
||||
};
|
||||
};
|
||||
neo-tree.enable = true;
|
||||
notify.enable = true;
|
||||
remote-nvim.enable = true;
|
||||
web-devicons.enable = true;
|
||||
};
|
||||
userCommands = {
|
||||
Ggr = {
|
||||
command = "Ggrep! <q-args> | cw | redraw!";
|
||||
nargs = "+";
|
||||
};
|
||||
};
|
||||
extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (
|
||||
builtins.readFile ./extra.lua
|
||||
);
|
||||
extraConfigVim = builtins.readFile ./extra.vimrc;
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
bufexplorer
|
||||
|
||||
context-vim
|
||||
vim-indent-guides
|
||||
];
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
# The Hack font is used in the Fugitive sidebars
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = with pkgs.nerd-fonts; [ hack ];
|
||||
|
||||
programs.nixvim = (import ./config.nix { inherit config pkgs lib; }) // {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
-- ======================================================================
|
||||
--
|
||||
-- automatic commands
|
||||
--
|
||||
-- ======================================================================
|
||||
local api = vim.api
|
||||
local all = {"n", "v", "i"}
|
||||
|
||||
-- Highlights bad whitespace
|
||||
--api.nvim_create_autocmd("ColorScheme", { command = "highlight ExtraWhitespace ctermbg=red guibg=red" })
|
||||
--api.nvim_create_autocmd("BufWinEnter", { command = "match ExtraWhitespace /\s\+$/" })
|
||||
--api.nvim_create_autocmd("InsertEnter", { command = "match ExtraWhitespace /\s\+\%#\@<!$/" })
|
||||
--api.nvim_create_autocmd("InsertLeave", { command = "match ExtraWhitespace /\s\+$/" })
|
||||
vim.fn.matchadd('errorMsg', [[\s\+$]])
|
||||
api.nvim_create_autocmd("BufWinLeave", { command = "call clearmatches()" })
|
||||
-- Automatically source .vimrc when we write that file
|
||||
-- This is probably no longer valid since we're writing init.lua, but we'll keep it for the sake
|
||||
-- of posterity at the moment
|
||||
api.nvim_create_autocmd("BufWritePost", {
|
||||
pattern = ".vimrc",
|
||||
command = "source $MYVIMRC"
|
||||
})
|
||||
-- Toggles absolute line numbers on/off when a window has focus or not
|
||||
numbertoggle = api.nvim_create_augroup("numbertoggle", { clear = true })
|
||||
api.nvim_create_autocmd({ "BufEnter", "FocusGained", "InsertLeave" }, {
|
||||
command = "set relativenumber",
|
||||
group = numbertoggle
|
||||
})
|
||||
api.nvim_create_autocmd({ "BufLeave", "FocusLost", "InsertEnter" }, {
|
||||
command = "set norelativenumber",
|
||||
group = numbertoggle
|
||||
})
|
||||
-- Set file highlighting to Ruby for Vagrantfiles
|
||||
api.nvim_create_autocmd({ "BufRead", "BufNewFile"}, {
|
||||
pattern = "Vagrantfile*",
|
||||
command = "set filetype=ruby"
|
||||
})
|
||||
@@ -0,0 +1,35 @@
|
||||
function! s:MkNonExDir(file, buf)
|
||||
if empty(getbufvar(a:buf, '&buftype')) && a:file!~#'\v^\w+\:\/'
|
||||
let dir=fnamemodify(a:file, ':h')
|
||||
if !isdirectory(dir)
|
||||
call mkdir(dir, 'p')
|
||||
endif
|
||||
endif
|
||||
endfunction
|
||||
augroup BWCCreateDir
|
||||
autocmd!
|
||||
autocmd BufWritePre * :call s:MkNonExDir(expand('<afile>'), +expand('<abuf>'))
|
||||
augroup END
|
||||
|
||||
function! Indenting(indent, what, cols)
|
||||
let spccol = repeat(' ', a:cols)
|
||||
let result = substitute(a:indent, spccol, '\t', 'g')
|
||||
let result = substitute(result, ' \+\ze\t', ''', 'g')
|
||||
if a:what == 1
|
||||
let result = substitute(result, '\t', spccol, 'g')
|
||||
endif
|
||||
return result
|
||||
endfunction
|
||||
|
||||
function! IndentConvert(line1, line2, what, cols)
|
||||
let savepos = getpos('.')
|
||||
let cols = empty(a:cols) ? &tabstop : a:cols
|
||||
execute a:line1 . ',' . a:line2 . 's/^\s\+/\=Indenting(submatch(0), a:what, cols)/e'
|
||||
call histdel('search', -1)
|
||||
call setpos('.', savepos)
|
||||
endfunction
|
||||
command! -nargs=? -range=% Space2Tab call IndentConvert(<line1>,<line2>,0,<q-args>)
|
||||
command! -nargs=? -range=% Tab2Space call IndentConvert(<line1>,<line2>,1,<q-args>)
|
||||
command! -nargs=? -range=% RetabIndent call IndentConvert(<line1>,<line2>,&et,<q-args>)
|
||||
|
||||
noremap <expr> <C-p> (fugitive#Head() != '' ? ':GFiles --exclude-standard --others --cached' : ':Files')."\<cr>"
|
||||
@@ -0,0 +1,88 @@
|
||||
-- ======================================================================
|
||||
--
|
||||
-- nvim-cmp configuration
|
||||
--
|
||||
-- ======================================================================
|
||||
local cmp = require'cmp'
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lspconfig' },
|
||||
{ name = 'vsnip' },
|
||||
},{
|
||||
{ name = 'buffer' }
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup.filetype('gitcommit', {
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'git' }
|
||||
},{
|
||||
{ name = 'buffer' }
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = { { name = 'buffer' } }
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
},{
|
||||
{ name = 'cmdline' }
|
||||
})
|
||||
})
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
local lspconfig = require('lspconfig')
|
||||
-- Add each LSP that you have configured here
|
||||
--require('lspconfig')['<LANGUAGE_SERVER_HERE>'].setup {
|
||||
-- capabilities = capabilities
|
||||
--}
|
||||
--lspconfig.pyright.setup { capabilities = capabilities }
|
||||
lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
--lspconfig.jedi_language_server.setup { capabilities }
|
||||
|
||||
-- ======================================================================
|
||||
--
|
||||
-- Plugin configurations
|
||||
--
|
||||
-- ======================================================================
|
||||
-- Set filetype to the way I want it
|
||||
-- Settings for CtrlP
|
||||
vim.opt.wildignore="*.swp,*.pyc,*.class,.tox"
|
||||
-- Settings for NerdTree
|
||||
vim.g.NERDTreeIgnore = {'\\.pyc$', '\\.o$', '\\.class$'}
|
||||
-- indent guides
|
||||
vim.g.indent_guides_enable_on_vim_startup = 1
|
||||
-- Tell syntastic to use yamllint
|
||||
vim.g.syntastic_yaml_checkers = {'yamllint'}
|
||||
vim.g.syntastic_yaml_yamllint_args = {}
|
||||
vim.g.syntastic_shell = "${pkgs.bash}/bin/bash"
|
||||
-- Shortcuts for resolving git diff conflicts
|
||||
vim.g.diffget_local_map = "gl"
|
||||
vim.g.diffget_upstream_map = "gu"
|
||||
|
||||
|
||||
-- ============================================================================
|
||||
-- User functions to just make life easier
|
||||
-- ============================================================================
|
||||
@@ -0,0 +1,220 @@
|
||||
set background=dark
|
||||
set copyindent
|
||||
set noexpandtab
|
||||
set hidden
|
||||
set ignorecase
|
||||
set mouse="a"
|
||||
set number
|
||||
set relativenumber
|
||||
set shiftwidth=4
|
||||
set smartcase
|
||||
set tabstop=4
|
||||
|
||||
syntax enable
|
||||
set preserveindent
|
||||
set softtabstop=0
|
||||
set nowrap
|
||||
set showcmd
|
||||
set cursorline
|
||||
set lazyredraw
|
||||
set showmatch
|
||||
set hlsearch
|
||||
|
||||
set nobackup
|
||||
set nowritebackup
|
||||
set signcolumn=yes
|
||||
" Milliseconds between updates
|
||||
set updatetime=300
|
||||
" Shows non-printing characters
|
||||
set listchars=tab:→\ ,extends:→,precedes:←,trail:·,eol:¬
|
||||
set list
|
||||
|
||||
" nvim-cmp configuration
|
||||
"
|
||||
lua <<EOF
|
||||
local cmp = require'cmp'
|
||||
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.abort(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lspconfig' },
|
||||
{ name = 'vsnip' },
|
||||
},{
|
||||
{ name = 'buffer' }
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup.filetype('gitcommit', {
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'git' }
|
||||
},{
|
||||
{ name = 'buffer' }
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup.cmdline({ '/', '?' }, {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = { { name = 'buffer' } }
|
||||
})
|
||||
|
||||
cmp.setup.cmdline(':', {
|
||||
mapping = cmp.mapping.preset.cmdline(),
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'path' }
|
||||
},{
|
||||
{ name = 'cmdline' }
|
||||
})
|
||||
})
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
local lspconfig = require('lspconfig')
|
||||
-- Add each LSP that you have configured here
|
||||
--require('lspconfig')['<LANGUAGE_SERVER_HERE>'].setup {
|
||||
-- capabilities = capabilities
|
||||
--}
|
||||
--lspconfig.pyright.setup { capabilities = capabilities }
|
||||
lspconfig.ansiblels.setup { capabilities = capabilities }
|
||||
lspconfig.jedi_language_server.setup { capabilities = capabilities }
|
||||
EOF
|
||||
" Set filetype to the way I want it
|
||||
let g:nix_recommended_style = 0
|
||||
|
||||
" Highlights bad whitespace
|
||||
autocmd ColorScheme * highlight ExtraWhitespace ctermbg=red guibg=red
|
||||
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
|
||||
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
|
||||
autocmd InsertLeave * match ExtraWhitespace /\s\+$/
|
||||
autocmd BufWinLeave * call clearmatches()
|
||||
|
||||
" Settings for CtrlP
|
||||
set wildignore+=*.swp,*.pyc,*.class,.tox
|
||||
" Settings for NerdTree
|
||||
let NERDTreeIgnore = ['\.pyc$', '\.o$', '\.class$']
|
||||
" indent guides
|
||||
let g:indent_guides_enable_on_vim_startup = 1
|
||||
autocmd! BufWritePost .vimrc source $MYVIMRC
|
||||
" Tell syntastic to use yamllint
|
||||
let g:syntastic_yaml_checkers = ['yamllint']
|
||||
let g:syntastic_yaml_yamllint_args = []
|
||||
let g:syntastic_shell = "${pkgs.bash}/bin/bash"
|
||||
" Shortcuts for resolving git diff conflicts
|
||||
let g:diffget_local_map = 'gl'
|
||||
let g:diffget_upstream_map = 'gu'
|
||||
|
||||
" Key mappings
|
||||
map <F2> <Esc>\be
|
||||
imap <F2> <Esc>\be
|
||||
map <F4> <Esc>:NERDTreeToggle<Cr>
|
||||
silent !git rev-parse --is-inside-work-tree
|
||||
if v:shell_error == 0
|
||||
map <C-p> :GFiles --cached --others --exclude-standard<CR>
|
||||
map <C-o> :GFiles?
|
||||
else
|
||||
map <C-p> :Files<CR>
|
||||
endif
|
||||
map <F6> <Esc>:Files<Cr>
|
||||
" Allows navigating splits
|
||||
map <C-j> <C-w>j<C-w><Cr>
|
||||
map <C-k> <C-w>k<C-w><Cr>
|
||||
map <C-h> <C-w>h<C-w><Cr>
|
||||
map <C-l> <C-w>l<C-w><Cr>
|
||||
|
||||
colorscheme gruvbox
|
||||
|
||||
" ============================================================================
|
||||
" User functions to just make life easier
|
||||
" ============================================================================
|
||||
" Toggle absolute line numbers when we don't have focus, and hybrid when
|
||||
" we do have it
|
||||
augroup numbertoggle
|
||||
autocmd!
|
||||
autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
|
||||
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
||||
augroup END
|
||||
" syntax highlighting for Vagrantfiles
|
||||
augroup vagrant
|
||||
au!
|
||||
au BufRead,BufNewFile Vagrantfile set filetype=ruby
|
||||
augroup END
|
||||
" Creates the directory for a file if it doesn't already exist.
|
||||
function! s:MkNonExDir(file, buf)
|
||||
if empty(getbufvar(a:buf, '&buftype')) && a:file!~#'\v^\w+\:\/'
|
||||
let dir=fnamemodify(a:file, ':h')
|
||||
if !isdirectory(dir)
|
||||
call mkdir(dir, 'p')
|
||||
endif
|
||||
endif
|
||||
endfunction
|
||||
augroup BWCCreateDir
|
||||
autocmd!
|
||||
autocmd BufWritePre * :call s:MkNonExDir(expand('<afile>'), +expand('<abuf>'))
|
||||
augroup END
|
||||
|
||||
" Return indent (all whitespace at start of a line), converted from
|
||||
" tabs to spaces if what = 1, or from spaces to tabs otherwise.
|
||||
" When converting to tabs, result has no redundant spaces.
|
||||
function! Indenting(indent, what, cols)
|
||||
let spccol = repeat(' ', a:cols)
|
||||
let result = substitute(a:indent, spccol, '\t', 'g')
|
||||
let result = substitute(result, ' \+\ze\t', ''', 'g')
|
||||
if a:what == 1
|
||||
let result = substitute(result, '\t', spccol, 'g')
|
||||
endif
|
||||
return result
|
||||
endfunction
|
||||
|
||||
" Convert whitespace used for indenting (before first non-whitespace).
|
||||
" what = 0 (convert spaces to tabs), or 1 (convert tabs to spaces).
|
||||
" cols = string with number of columns per tab, or empty to use 'tabstop'.
|
||||
" The cursor position is restored, but the cursor will be in a different
|
||||
" column when the number of characters in the indent of the line is changed.
|
||||
function! IndentConvert(line1, line2, what, cols)
|
||||
let savepos = getpos('.')
|
||||
let cols = empty(a:cols) ? &tabstop : a:cols
|
||||
execute a:line1 . ',' . a:line2 . 's/^\s\+/\=Indenting(submatch(0), a:what, cols)/e'
|
||||
call histdel('search', -1)
|
||||
call setpos('.', savepos)
|
||||
endfunction
|
||||
command! -nargs=? -range=% Space2Tab call IndentConvert(<line1>,<line2>,0,<q-args>)
|
||||
command! -nargs=? -range=% Tab2Space call IndentConvert(<line1>,<line2>,1,<q-args>)
|
||||
command! -nargs=? -range=% RetabIndent call IndentConvert(<line1>,<line2>,&et,<q-args>)
|
||||
|
||||
|
||||
"""""""""
|
||||
""" Unused, but kept in case I end up on a system where I can't use my preferred plugins
|
||||
"""""""""
|
||||
|
||||
|
||||
|
||||
" Base of search is ordered as
|
||||
" r - searching up from here to the nearest marker (.git, .hg, .svn, etc)
|
||||
" a - dir of current file, unless that's a subdirectory of CWD
|
||||
" c - dir of current file
|
||||
let g:ctrlp_working_path_mode = 'arc'
|
||||
let g:ctrlp_switch_buffer = 0
|
||||
let g:ctrlp_cmd = 'CtrlPMixed'
|
||||
let g:ctrlp_show_hidden = 1
|
||||
let g:ctrlp_user_command = {
|
||||
\'types': {
|
||||
\1: ['.git', '${pkgs.git}/bin/git ls-files --cached --exclude-standard --others' ],
|
||||
\},
|
||||
\'fallback': '${pkgs.findutils}/bin/find . -type f | ${pkgs.gnugrep}/bin/grep -v -e "\.tox/" -e "\.git/"',
|
||||
\}
|
||||
" let g:ctrpl_match_func = { 'match': 'pymatcher#PyMatch' }
|
||||
" map <F6> <Esc>:CtrlP<Cr>
|
||||
|
||||
Reference in New Issue
Block a user