dustinswan
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying out helix. omg. removing neovim. here we goooooo. and adding mu

Browse Source
master
Dustin Swan 3 years ago
parent 1ce213f818
commit 0b957aeeec
Signed by: dustinswan
GPG Key ID: AB49BD6B2B3A6377
2 changed files with 172 additions and 168 deletions
Show Stats Download Patch File Download Diff File

4
bin/sync
Unescape Escape View File

@ -4,6 +4,10 @@ if command -v mbsync &> /dev/null; then
mbsync -a mbsync -a
fi fi
if command -v mu &> /dev/null; then
mu index
fi
if command -v vdirsyncer &> /dev/null; then if command -v vdirsyncer &> /dev/null; then
vdirsyncer sync vdirsyncer sync
fi fi

336
home-cli.nix
Unescape Escape View File

@ -5,7 +5,7 @@ let
in in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
ripgrep fd wget mosh w3m nnn urlview gnupg hexyl httpie catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora weechat duf procs pandoc magic-wormhole pastel fx helix ripgrep fd wget mosh w3m nnn urlview gnupg hexyl httpie catimg tealdeer du-dust duplicati bitwarden-cli rage sd eva glow restic tig gitui spotify-tui manix amfora weechat duf procs pandoc magic-wormhole pastel fx
nodejs deno yarn nodePackages.stylelint nodePackages.js-beautify nodejs deno yarn nodePackages.stylelint nodePackages.js-beautify
ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin ocaml dune_2 ocamlPackages.utop ocamlPackages.ocp-indent ocamlPackages.merlin
# racket-minimal # racket-minimal
@ -17,7 +17,7 @@ in
]; ];
home.sessionVariables = { home.sessionVariables = {
EDITOR = "vim"; EDITOR = "hx";
MANPAGER = "sh -c 'col -bx | bat -l man -p'"; MANPAGER = "sh -c 'col -bx | bat -l man -p'";
PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin:${builtins.getEnv "HOME"}/.cargo/bin"; PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin:${builtins.getEnv "HOME"}/.cargo/bin";
EXA_ICON_SPACING = 2; EXA_ICON_SPACING = 2;
@ -151,172 +151,172 @@ in
package = ((pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [ epkgs.vterm ])); package = ((pkgs.emacsPackagesNgGen pkgs.emacs).emacsWithPackages (epkgs: [ epkgs.vterm ]));
}; };
programs.neovim = { # programs.neovim = {
enable = true; # enable = true;
viAlias = true; # viAlias = true;
vimAlias = true; # vimAlias = true;
vimdiffAlias = true; # vimdiffAlias = true;
withNodeJs = true; # withNodeJs = true;
withPython3 = true; # withPython3 = true;
coc = { # coc = {
enable = true; # enable = true;
settings = '' # settings = ''
{ # {
"tsserver.formatOnType": true, # "tsserver.formatOnType": true,
"coc.preferences.formatOnType": true # "coc.preferences.formatOnType": true
} # }
''; # '';
}; # };
plugins = with pkgs.vimPlugins; [ # ale # plugins = with pkgs.vimPlugins; [ # ale
vim-repeat vim-snippets vim-signify vim-orgmode vim-devicons vim-startify vim-highlightedyank # vim-repeat vim-snippets vim-signify vim-orgmode vim-devicons vim-startify vim-highlightedyank
emmet-vim # <ctrl-y>, # emmet-vim # <ctrl-y>,
vim-signature # marks in the gutter; mx (add), dmx (delete), m, (place next available), m. (next available if empty), m- (delete all on line), m<space> (delete all) # vim-signature # marks in the gutter; mx (add), dmx (delete), m, (place next available), m. (next available if empty), m- (delete all on line), m<space> (delete all)
vim-expand-region # + / - to select increasingly larger / smaller regions∑ # vim-expand-region # + / - to select increasingly larger / smaller regions∑
vim-better-whitespace # :StripWhitespace # vim-better-whitespace # :StripWhitespace
vim-peekaboo # see registers when doing " @ and ctrl-r # vim-peekaboo # see registers when doing " @ and ctrl-r
vim-abolish # Substitution: :Subvert/child{,ren}/adult{,s}/g Coercios: crs (coerce to snake-case), crm (mixed), crc (camel), cru (upper), cr- (dash), cr., cr<space>, crt (title-case) # vim-abolish # Substitution: :Subvert/child{,ren}/adult{,s}/g Coercios: crs (coerce to snake-case), crm (mixed), crc (camel), cru (upper), cr- (dash), cr., cr<space>, crt (title-case)
vim-polyglot # includes sensible, dups vim-sleuth # vim-polyglot # includes sensible, dups vim-sleuth
argtextobj-vim # daa => delete an argument # argtextobj-vim # daa => delete an argument
splitjoin-vim # gS / gJ to turn single-line code into multi, etc. # splitjoin-vim # gS / gJ to turn single-line code into multi, etc.
MatchTagAlways # highlights the matching & surrounding tags # MatchTagAlways # highlights the matching & surrounding tags
vim-visual-multi # ctrl-n on word, n/N to select next/prev, [/] to switch cursors, q to skip, Q to remove current # vim-visual-multi # ctrl-n on word, n/N to select next/prev, [/] to switch cursors, q to skip, Q to remove current
# vim-endwise # automatically add end block keyword or symbol # # vim-endwise # automatically add end block keyword or symbol
vim-fugitive # Git, Gdiff, Gblame, Gstatus, Gcommit # vim-fugitive # Git, Gdiff, Gblame, Gstatus, Gcommit
vim-speeddating # ctrl-a & ctrl-x on dates # vim-speeddating # ctrl-a & ctrl-x on dates
jdaddy-vim # cij: change inner json. gqaj: pretty print json # jdaddy-vim # cij: change inner json. gqaj: pretty print json
vim-surround # cs[{ -> change surrounding [ to {, cst -> change surrounding tag, ysiw] -> surround inner word with ], etc. # vim-surround # cs[{ -> change surrounding [ to {, cst -> change surrounding tag, ysiw] -> surround inner word with ], etc.
vim-tmux-navigator # ctrl-l -> right in vim splits then tmux panes, etc. # vim-tmux-navigator # ctrl-l -> right in vim splits then tmux panes, etc.
vim-sneak # stp -> jump to next occurance of 'tp'. ; -> next. , -> go back, `` -> back home # vim-sneak # stp -> jump to next occurance of 'tp'. ; -> next. , -> go back, `` -> back home
fzf-vim # fzf-vim
vim-table-mode # <space>tm, || for rule, <space>tt -> tableize csv # vim-table-mode # <space>tm, || for rule, <space>tt -> tableize csv
tabular # :Tabularize /, :Tabu (shortcut & guess the right thing) # tabular # :Tabularize /, :Tabu (shortcut & guess the right thing)
vim-markdown # zr, zR, zm, zM, za, zA, zc, zC for folding # vim-markdown # zr, zR, zm, zM, za, zA, zc, zC for folding
vim-gnupg # vim-gnupg
vim-floaterm # <leader>T # vim-floaterm # <leader>T
undotree # <leader>u # undotree # <leader>u
vim-which-key # vim-which-key
coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets # coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets
{ # {
plugin = chadtree; # nvim-tree-lua # plugin = chadtree; # nvim-tree-lua
config = "let g:chadtree_settings = { 'xdg': v:true }"; # config = "let g:chadtree_settings = { 'xdg': v:true }";
} # }
{ # {
plugin = vim-easy-align; # gaip= -> align inner paragraph on first =, gaip*= -> align aroud all = # plugin = vim-easy-align; # gaip= -> align inner paragraph on first =, gaip*= -> align aroud all =
config = '' # config = ''
xmap ga <Plug>(EasyAlign) # xmap ga <Plug>(EasyAlign)
nmap ga <Plug>(EasyAlign) # nmap ga <Plug>(EasyAlign)
''; # '';
} # }
{ # {
plugin = vim-easymotion; # <leader><leader> w, <leader><leader>fx -> find x # plugin = vim-easymotion; # <leader><leader> w, <leader><leader>fx -> find x
config = "let g:EasyMotion_smartcase = 1"; # config = "let g:EasyMotion_smartcase = 1";
} # }
{ # {
plugin = nerdcommenter; # toggle: <leader>c<space>, comment: <leader>cc # plugin = nerdcommenter; # toggle: <leader>c<space>, comment: <leader>cc
config = "let g:NERDSpaceDelims = 1"; # config = "let g:NERDSpaceDelims = 1";
} # }
{ # {
plugin = vim-airline; # plugin = vim-airline;
config = '' # config = ''
let g:airline#extensions#tabline#enabled = 1 # let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#ale#enabled = 1 # let g:airline#extensions#ale#enabled = 1
let g:airline_powerline_fonts = 1 # let g:airline_powerline_fonts = 1
''; # '';
} # }
vim-airline-themes # vim-airline-themes
{ # {
plugin = nord-vim; # plugin = nord-vim;
config = '' # config = ''
colorscheme nord # colorscheme nord
let g:nord_italic = 1 # let g:nord_italic = 1
let g:nord_underline = 1 # let g:nord_underline = 1
''; # '';
} # }
]; # ];
extraConfig = '' # extraConfig = ''
set hidden # set hidden
set number # set number
set ignorecase # set ignorecase
set smartcase # set smartcase
set magic # set magic
set mouse=a # set mouse=a
let mapleader="\<Space>" # let mapleader="\<Space>"
let maplocalleader="\\" # let maplocalleader="\\"
let g:org_indent = 1 # let g:org_indent = 1
nnoremap <silent> <leader> :WhichKey '<Space>'<CR> # nnoremap <silent> <leader> :WhichKey '<Space>'<CR>
nnoremap <silent> <leader>t :CHADopen<CR> # nnoremap <silent> <leader>t :CHADopen<CR>
nnoremap <silent> <leader>T :FloatermNew<CR> # nnoremap <silent> <leader>T :FloatermNew<CR>
nnoremap <silent> <leader>u :UndotreeToggle<cr> # nnoremap <silent> <leader>u :UndotreeToggle<cr>
" let g:coc_snippet_next = '<tab>' # " let g:coc_snippet_next = '<tab>'
" let g:coc_snippet_prev = '<S-Tab>' # " let g:coc_snippet_prev = '<S-Tab>'
" CoC # " CoC
" Use tab for trigger completion with characters ahead and navigate. # " Use tab for trigger completion with characters ahead and navigate.
inoremap <silent><expr> <TAB> pumvisible() ? "\<C-n>" : <SID>check_back_space() ? "\<TAB>" : coc#refresh() # inoremap <silent><expr> <TAB> pumvisible() ? "\<C-n>" : <SID>check_back_space() ? "\<TAB>" : coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>" # inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
" Make <CR> auto-select the first completion item and notify coc.nvim to # " Make <CR> auto-select the first completion item and notify coc.nvim to
" format on enter, <cr> could be remapped by other vim plugin # " format on enter, <cr> could be remapped by other vim plugin
inoremap <silent><expr> <CR> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>" # inoremap <silent><expr> <CR> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
function! s:check_back_space() abort # function! s:check_back_space() abort
let col = col('.') - 1 # let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s' # return !col || getline('.')[col - 1] =~# '\s'
endfunction # endfunction
" GoTo code navigation. # " GoTo code navigation.
nmap <silent> gd <Plug>(coc-definition) # nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition) # nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation) # nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references) # nmap <silent> gr <Plug>(coc-references)
" Use K to show documentation in preview window. # " Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR> # nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation() # function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0) # if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>') # execute 'h '.expand('<cword>')
elseif (coc#rpc#ready()) # elseif (coc#rpc#ready())
call CocActionAsync('doHover') # call CocActionAsync('doHover')
else # else
execute '!' . &keywordprg . " " . expand('<cword>') # execute '!' . &keywordprg . " " . expand('<cword>')
endif # endif
endfunction # endfunction
" Highlight the symbol and its references when holding the cursor. # " Highlight the symbol and its references when holding the cursor.
autocmd CursorHold * silent call CocActionAsync('highlight') # autocmd CursorHold * silent call CocActionAsync('highlight')
nnoremap <silent><leader>/ :noh<cr> # nnoremap <silent><leader>/ :noh<cr>
nnoremap <leader>v <c-w>v<c-w>l # nnoremap <leader>v <c-w>v<c-w>l
nnoremap <leader>s <c-w>s<c-w>j # nnoremap <leader>s <c-w>s<c-w>j
nnoremap <silent> <leader>a :Rg<CR> # nnoremap <silent> <leader>a :Rg<CR>
nnoremap <silent> <leader>f :Files<CR> # nnoremap <silent> <leader>f :Files<CR>
nnoremap <silent> <leader>b :Buffers<CR> # nnoremap <silent> <leader>b :Buffers<CR>
nnoremap <silent> <leader>w :Windows<CR> # nnoremap <silent> <leader>w :Windows<CR>
nnoremap <silent> <leader>C :Commands<CR> # nnoremap <silent> <leader>C :Commands<CR>
nnoremap <silent> <leader>hf :History<CR> # nnoremap <silent> <leader>hf :History<CR>
nnoremap <silent> <leader>hc :History:<CR> # nnoremap <silent> <leader>hc :History:<CR>
nnoremap <silent> <leader>hs :History/<CR> # nnoremap <silent> <leader>hs :History/<CR>
nnoremap <silent> <leader>l :BLines<CR> # nnoremap <silent> <leader>l :BLines<CR>
nnoremap <silent> <leader><leader>l :Lines<CR> # nnoremap <silent> <leader><leader>l :Lines<CR>
" nnoremap <silent> <leader>t :BTags<CR> # " nnoremap <silent> <leader>t :BTags<CR>
nnoremap <silent> <leader><leader>t :Tags<CR> # nnoremap <silent> <leader><leader>t :Tags<CR>
nnoremap <silent> <leader>gc :BCommits<CR> # nnoremap <silent> <leader>gc :BCommits<CR>
nnoremap <silent> <leader><leader>gc :Commits<CR> # nnoremap <silent> <leader><leader>gc :Commits<CR>
nmap <leader><tab> <plug>(fzf-maps-n) # nmap <leader><tab> <plug>(fzf-maps-n)
xmap <leader><tab> <plug>(fzf-maps-x) # xmap <leader><tab> <plug>(fzf-maps-x)
omap <leader><tab> <plug>(fzf-maps-o) # omap <leader><tab> <plug>(fzf-maps-o)
imap <c-x><c-k> <plug>(fzf-complete-word) # imap <c-x><c-k> <plug>(fzf-complete-word)
imap <c-x><c-f> <plug>(fzf-complete-path) # imap <c-x><c-f> <plug>(fzf-complete-path)
imap <c-x><c-j> <plug>(fzf-complete-file-ag) # imap <c-x><c-j> <plug>(fzf-complete-file-ag)
imap <c-x><c-l> <plug>(fzf-complete-line) # imap <c-x><c-l> <plug>(fzf-complete-line)
''; # '';
}; # };
programs.bat = { programs.bat = {
enable = true; enable = true;

Write Preview
Loading…
Cancel
Save