commit 756414acf4b07c230b2819f64729f4551f53ff2f · hauleth.dev/dotfiles

-1

nix/.config/nixpkgs/darwin/configuration.nix

···

       12
       12
        
         # List packages installed in system profile. To search by name, run:

     

       13
       13
        
         # $ nix-env -qaP | grep wget

     

       14
       14
        
         environment.systemPackages = with pkgs; [

     

       15
       15
       -
           aerc

     

       16
       15
        
           asciinema

     

       17
       16
        
           bat

     

       18
       17
        
           coreutils

+53 -53

vim/.config/nvim/autoload/plugins.vim

···

       2
       2
        
       let s:current_file = expand('<sfile>')

     

       3
       3
        
       let s:data_dir = exists('$XDG_DATA_HOME') ? $XDG_DATA_HOME : $HOME . '/.local/share'

     

       4
       4
        
       

     

       5
       5
       -
       let s:dir = s:data_dir . '/nvim/site/pack/packager'

     

       5
       5
       +
       let s:dir = s:data_dir . '/nvim/site'

     

       6
       6
        
       

     

       7
       7
        
       if !exists('*plugins#reload')

     

       8
       8
        
           func! plugins#reload() abort

     
···

       13
       13
        
       endif

     

       14
       14
        
       

     

       15
       15
        
       func! plugins#spec() abort

     

       16
       16
       -
           packadd vim-packager

     

       16
       16
       +
           packadd minpac

     

       17
       17
        
       

     

       18
       18
       -
           if !exists('g:packager')

     

       19
       19
       -
               call packager#init({'dir': s:dir})

     

       18
       18
       +
           if !exists('g:minpac')

     

       19
       19
       +
               call minpac#init({'dir': s:dir})

     

       20
       20
        
           endif

     

       21
       21
        
       

     

       22
       22
        
           " Package manager {{{

     

       23
       23
       -
           call packager#add('kristijanhusak/vim-packager', {'type': 'opt'})

     

       23
       23
       +
           call minpac#add('k-takata/minpac', {'type': 'opt'})

     

       24
       24
        
           " }}}

     

       25
       25
        
           " Colorscheme {{{

     

       26
       26
       -
           call packager#add('hauleth/blame.vim') " colorscheme

     

       27
       27
       -
           call packager#add('dylanaraps/wal.vim') " colorscheme

     

       26
       26
       +
           call minpac#add('hauleth/blame.vim') " colorscheme

     

       27
       27
       +
           call minpac#add('dylanaraps/wal.vim') " colorscheme

     

       28
       28
        
           " }}}

     

       29
       29
        
           " Project navigation {{{

     

       30
       30
       -
           call packager#add('tpope/vim-projectionist') " Requires access to VimEnter

     

       31
       31
       -
           call packager#add('srstevenson/vim-picker')

     

       32
       32
       -
           call packager#add('justinmk/vim-dirvish') " Required for opening directories

     

       33
       33
       -
           call packager#add('tpope/vim-eunuch')

     

       30
       30
       +
           call minpac#add('tpope/vim-projectionist') " Requires access to VimEnter

     

       31
       31
       +
           call minpac#add('justinmk/vim-dirvish') " Required for opening directories

     

       32
       32
       +
           call minpac#add('tpope/vim-eunuch')

     

       33
       33
       +
           call minpac#add('liuchengxu/vim-clap')

     

       34
       34
        
           " }}}

     

       35
       35
        
           " Git {{{

     

       36
       36
       -
           call packager#add('tpope/vim-fugitive', { 'type': 'opt' })

     

       36
       36
       +
           call minpac#add('tpope/vim-fugitive', { 'type': 'opt' })

     

       37
       37
        
           " }}}

     

       38
       38
        
           " Launch screen {{{

     

       39
       39
       -
           call packager#add('mhinz/vim-startify') " Required during startup

     

       39
       39
       +
           call minpac#add('mhinz/vim-startify') " Required during startup

     

       40
       40
        
           " }}}

     

       41
       41
        
           " Languages {{{

     

       42
       42
       -
           call packager#add('aklt/plantuml-syntax') " ftplugin

     

       43
       43
       -
           call packager#add('b4b4r07/vim-hcl') " ftplugin

     

       44
       44
       -
           call packager#add('cespare/vim-toml') " ftplugin

     

       45
       45
       -
           call packager#add('dag/vim-fish') " ftplugin

     

       46
       46
       -
           call packager#add('elixir-lang/vim-elixir') " ftplugin

     

       47
       47
       -
           call packager#add('pangloss/vim-javascript') " ftplugin

     

       48
       48
       -
           call packager#add('tpope/vim-cucumber') " ftplugin

     

       49
       49
       -
           call packager#add('tpope/vim-scriptease', {'type': 'opt'}) " ftplugin

     

       50
       50
       -
           call packager#add('LnL7/vim-nix')

     

       42
       42
       +
           call minpac#add('aklt/plantuml-syntax') " ftplugin

     

       43
       43
       +
           call minpac#add('b4b4r07/vim-hcl') " ftplugin

     

       44
       44
       +
           call minpac#add('cespare/vim-toml') " ftplugin

     

       45
       45
       +
           call minpac#add('dag/vim-fish') " ftplugin

     

       46
       46
       +
           call minpac#add('elixir-lang/vim-elixir') " ftplugin

     

       47
       47
       +
           call minpac#add('pangloss/vim-javascript') " ftplugin

     

       48
       48
       +
           call minpac#add('tpope/vim-cucumber') " ftplugin

     

       49
       49
       +
           call minpac#add('tpope/vim-scriptease', {'type': 'opt'}) " ftplugin

     

       50
       50
       +
           call minpac#add('LnL7/vim-nix')

     

       51
       51
        
           " }}}

     

       52
       52
        
           " Completion {{{

     

       53
       53
       -
           call packager#add('prabirshrestha/async.vim') " autoload-only

     

       54
       54
       -
           call packager#add('prabirshrestha/vim-lsp')

     

       55
       55
       -
           call packager#add('Shougo/echodoc.vim')

     

       56
       56
       -
           call packager#add('fcpg/vim-complimentary') " autoload-only

     

       53
       53
       +
           call minpac#add('prabirshrestha/async.vim') " autoload-only

     

       54
       54
       +
           call minpac#add('prabirshrestha/vim-lsp')

     

       55
       55
       +
           call minpac#add('Shougo/echodoc.vim')

     

       56
       56
       +
           call minpac#add('fcpg/vim-complimentary') " autoload-only

     

       57
       57
        
           " }}}

     

       58
       58
        
           " Code manipulation {{{

     

       59
       59
       -
           call packager#add('AndrewRadev/splitjoin.vim')

     

       60
       60
       -
           call packager#add('hauleth/sad.vim')

     

       61
       61
       -
           call packager#add('tommcdo/vim-exchange')

     

       62
       62
       -
           call packager#add('tommcdo/vim-lion')

     

       63
       63
       -
           call packager#add('tpope/vim-commentary')

     

       64
       64
       -
           call packager#add('tpope/vim-endwise') " Requires access to au FileType

     

       65
       65
       -
           call packager#add('machakann/vim-sandwich', {'type': 'opt'})

     

       59
       59
       +
           call minpac#add('AndrewRadev/splitjoin.vim')

     

       60
       60
       +
           call minpac#add('hauleth/sad.vim')

     

       61
       61
       +
           call minpac#add('tommcdo/vim-exchange')

     

       62
       62
       +
           call minpac#add('tommcdo/vim-lion')

     

       63
       63
       +
           call minpac#add('tpope/vim-commentary')

     

       64
       64
       +
           call minpac#add('tpope/vim-endwise') " Requires access to au FileType

     

       65
       65
       +
           call minpac#add('machakann/vim-sandwich', {'type': 'opt'})

     

       66
       66
        
           " }}}

     

       67
       67
        
           " Movements {{{

     

       68
       68
       -
           call packager#add('wellle/targets.vim', {'type': 'opt'})

     

       69
       69
       -
           call packager#add('rhysd/clever-f.vim')

     

       70
       70
       -
           call packager#add('edkolev/erlang-motions.vim')

     

       68
       68
       +
           call minpac#add('wellle/targets.vim', {'type': 'opt'})

     

       69
       69
       +
           call minpac#add('rhysd/clever-f.vim')

     

       70
       70
       +
           call minpac#add('edkolev/erlang-motions.vim')

     

       71
       71
        
           " }}}

     

       72
       72
        
           " Task running & quickfix {{{

     

       73
       73
       -
           call packager#add('hauleth/asyncdo.vim')

     

       74
       74
       -
           call packager#add('romainl/vim-qf')

     

       75
       75
       -
           call packager#add('romainl/vim-qlist')

     

       76
       76
       -
           call packager#add('Olical/vim-enmasse')

     

       77
       77
       -
           call packager#add('igemnace/vim-makery')

     

       73
       73
       +
           call minpac#add('hauleth/asyncdo.vim')

     

       74
       74
       +
           call minpac#add('romainl/vim-qf')

     

       75
       75
       +
           call minpac#add('romainl/vim-qlist')

     

       76
       76
       +
           call minpac#add('Olical/vim-enmasse')

     

       77
       77
       +
           call minpac#add('igemnace/vim-makery')

     

       78
       78
        
           " }}}

     

       79
       79
        
           " Splits management {{{

     

       80
       80
       -
           call packager#add('t9md/vim-choosewin')

     

       80
       80
       +
           call minpac#add('t9md/vim-choosewin')

     

       81
       81
        
           " }}}

     

       82
       82
        
           " Utils {{{

     

       83
       83
       -
           call packager#add('andymass/vim-matchup')

     

       84
       84
       -
           call packager#add('tpope/vim-repeat') " autoload-only plugin

     

       85
       85
       -
           call packager#add('tpope/vim-unimpaired', {'type': 'opt'})

     

       86
       86
       -
           call packager#add('tpope/vim-rsi')

     

       87
       87
       -
           call packager#add('direnv/direnv.vim')

     

       88
       88
       -
           call packager#add('sgur/vim-editorconfig') " Required during startup

     

       89
       89
       -
           call packager#add('tpope/vim-characterize')

     

       90
       90
       -
           call packager#add('https://gitlab.com/hauleth/qfx.vim.git')

     

       91
       91
       -
           call packager#add('hauleth/vim-backscratch')

     

       92
       92
       -
           call packager#add('tpope/vim-dadbod')

     

       93
       93
       -
           call packager#add('https://gitlab.com/hauleth/smart.vim.git')

     

       83
       83
       +
           call minpac#add('andymass/vim-matchup')

     

       84
       84
       +
           call minpac#add('tpope/vim-repeat') " autoload-only plugin

     

       85
       85
       +
           call minpac#add('tpope/vim-unimpaired', {'type': 'opt'})

     

       86
       86
       +
           call minpac#add('tpope/vim-rsi')

     

       87
       87
       +
           call minpac#add('direnv/direnv.vim')

     

       88
       88
       +
           call minpac#add('sgur/vim-editorconfig') " Required during startup

     

       89
       89
       +
           call minpac#add('tpope/vim-characterize')

     

       90
       90
       +
           call minpac#add('https://gitlab.com/hauleth/qfx.vim.git')

     

       91
       91
       +
           call minpac#add('hauleth/vim-backscratch')

     

       92
       92
       +
           call minpac#add('tpope/vim-dadbod')

     

       93
       93
       +
           call minpac#add('https://gitlab.com/hauleth/smart.vim.git')

     

       94
       94
        
           " }}}

     

       95
       95
        
       endfunc

+5 -5

vim/.config/nvim/init.vim

···

       7
       7
        
       let g:loaded_netrwPlugin = 1

     

       8
       8
        
       let g:loaded_matchit = 1

     

       9
       9
        
       

     

       10
       10
       -
       command! -bar PackInstall call plugins#reload() | call packager#install()

     

       11
       11
       -
       command! -bar PackUpdate  call plugins#reload() | call packager#update()

     

       12
       12
       -
       command! -bar PackClean   call plugins#reload() | call packager#clean()

     

       13
       13
       -
       command! -bar PackStatus  call plugins#reload() | call packager#status()

     

       10
       10
       +
       command! -bar PackUpdate  call plugins#reload() | call minpac#update()

     

       11
       11
       +
       command! -bar PackClean   call plugins#reload() | call minpac#clean()

     

       12
       12
       +
       command! -bar PackStatus  call plugins#reload() | call minpac#status()

     

       14
       13
        
       " }}}

     

       15
       14
        
       " Identation {{{

     

       16
       15
        
       set shiftwidth=4 expandtab

     
···

       86
       85
        
       augroup END

     

       87
       86
        
       " }}}

     

       88
       87
        
       " Fuzzy file search {{{

     

       89
       89
       -
       nnoremap <Space><Space> :<C-u>PickerEdit<CR>

     

       88
       88
       +
       nnoremap <Space><Space> :<C-u>Clap files<CR>

     

       90
       89
        
       

     

       91
       90
        
       let g:picker_custom_find_executable = 'rg'

     

       92
       91
        
       let g:picker_custom_find_flags = '--color never --files --hidden --glob !.git'

     
···

       235
       234
        
       command! -nargs=* Start <mods> split new <bar> call termopen(<q-args>) <bar> startinsert

     

       236
       235
        
       command! -nargs=0 Ctags AsyncDo ctags -R

     

       237
       236
        
       command! -nargs=? Dash call dash#open(<f-args>)

     

       237
       237
       +
       command! Term <mods> split +term <bar> startinsert

     

       238
       238
        
       

     

       239
       239
        
       nnoremap gK :Dash<CR>

     

       240
       240
        
       nnoremap gx :<C-u>call open#open()<CR>