move home-manager config to a dedicated location
This commit is contained in:
@@ -60,56 +60,18 @@ in {
|
||||
};
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.motiejus = {pkgs, ...}: {
|
||||
home.stateVersion = config.mj.stateVersion;
|
||||
home.packages = lib.mkIf cfg.devEnvironment [pkgs.go];
|
||||
home-manager.users.motiejus = {pkgs, ...}:
|
||||
import ../../../shared/home/default.nix {
|
||||
inherit pkgs;
|
||||
inherit (config.mj) stateVersion;
|
||||
|
||||
programs.direnv.enable = true;
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
defaultEditor = true;
|
||||
plugins = lib.mkIf cfg.devEnvironment [
|
||||
pkgs.vimPlugins.fugitive
|
||||
pkgs.vimPlugins.vim-go
|
||||
pkgs.vimPlugins.zig-vim
|
||||
];
|
||||
extraConfig = builtins.readFile ./vimrc;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userEmail = "motiejus@jakstys.lt";
|
||||
userName = "Motiejus Jakštys";
|
||||
aliases.yolo = "commit --amend --no-edit -a";
|
||||
extraConfig = {
|
||||
rerere.enabled = true;
|
||||
pull.ff = "only";
|
||||
merge.conflictstyle = "diff3";
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
};
|
||||
};
|
||||
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
mutableKeys = false;
|
||||
mutableTrust = false;
|
||||
publicKeys = [
|
||||
{
|
||||
source = ./motiejus-gpg.txt;
|
||||
trust = "ultimate";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=IHrp
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@@ -1,78 +0,0 @@
|
||||
if $VIM_PATH != ""
|
||||
let $PATH = $VIM_PATH
|
||||
endif
|
||||
|
||||
syntax on
|
||||
filetype plugin indent on
|
||||
set et ts=4 sw=4 sts=4 nu hlsearch ruler ignorecase smartcase nomodeline bg=dark incsearch
|
||||
set path=**/* grepprg=rg\ --vimgrep grepformat^=%f:%l:%c:%m backspace=2 nojs
|
||||
set laststatus=1
|
||||
nnoremap <Leader>\ gqj
|
||||
command OLD :enew | setl buftype=nofile | 0put =v:oldfiles | nnoremap <buffer> <CR> :e <C-r>=getline('.')<CR><CR>
|
||||
|
||||
let g:gutentags_enabled = 0
|
||||
let g:gutentags_generate_on_new = 0
|
||||
let g:gutentags_cache_dir = '~/.vim/ctags'
|
||||
let b:gutentags_file_list_command = 'git ls-files'
|
||||
|
||||
call matchadd('ColorColumn', '\%81v', 100)
|
||||
" thanks to drew de vault's vimrc, except swearing
|
||||
set mouse=
|
||||
set backupdir=~/.cache directory=~/.cache
|
||||
"nnoremap Q :grep <cword><CR>
|
||||
nmap gs :grep <cursor><CR>
|
||||
|
||||
" bits from vim-sensible
|
||||
set autoindent smarttab nrformats-=octal
|
||||
nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
|
||||
set wildmenu sidescrolloff=5 display+=lastline encoding=utf-8
|
||||
set formatoptions+=j history=1000 tabpagemax=50 sessionoptions-=options
|
||||
|
||||
" so Gdiff and vimdiff output are somewhat readable
|
||||
if &diff
|
||||
syntax off
|
||||
endif
|
||||
|
||||
if has("patch-8.1-0360")
|
||||
set diffopt+=algorithm:patience
|
||||
endif
|
||||
|
||||
" html
|
||||
au FileType html,gohtmltmpl setlocal ts=2 sw=2 sts=2
|
||||
|
||||
" ruby
|
||||
au BufRead,BufNewFile Vagrantfile setfiletype ruby
|
||||
|
||||
" puppet
|
||||
au BufRead,BufNewFile *.j2 setfiletype django
|
||||
|
||||
" avro
|
||||
au BufRead,BufNewFile *.avsc setfiletype json
|
||||
au BufRead,BufNewFile *.avsc setlocal ts=2 sw=2 sts=2
|
||||
|
||||
" redo
|
||||
au BufRead,BufNewFile *.do setfiletype sh
|
||||
|
||||
" go
|
||||
au FileType go setlocal noet
|
||||
au FileType go nnoremap <buffer> <C-]> :GoDef<CR>
|
||||
au FileType go let g:go_template_autocreate = 0
|
||||
au FileType go let g:go_fmt_command = "goimports"
|
||||
|
||||
" strace
|
||||
au FileType strace setlocal nonu
|
||||
|
||||
" yaml
|
||||
au FileType yaml setlocal ts=2 sw=2 sts=2
|
||||
|
||||
" sql
|
||||
au FileType sql setlocal formatprg=pg_format\ -
|
||||
au FileType sql setlocal ts=2 sw=2 sts=2
|
||||
let g:loaded_sql_completion = 0
|
||||
let g:omni_sql_no_default_maps = 1
|
||||
|
||||
" mail
|
||||
autocmd BufRead,BufNewFile *mutt-* setfiletype mail
|
||||
|
||||
" TeX
|
||||
au FileType tex setlocal spell spelllang=en_us ts=2 sw=2 sts=2
|
||||
Reference in New Issue
Block a user