commit be1fe91fd620a3f90ffa12424603d471cb49d8b6 · hauleth.dev/dotfiles

+1

.gitignore

+5 -1

fish/.config/fish/functions/p.fish

···

       1
        
       function p

     

       2
       +
           if test (count $argv) -gt 0 && test -f $argv[1] || not isatty

     

       3
       +
               bat $argv

     

       4
       +
           else

     

       5
       +
               ls -lh $argv

     

       6
       +
           end

     

       7
        
       end

+2 -2

git/.config/git/config

···

       10
        
       	ci = commit

     

       11
        
       	co = checkout

     

       12
        
       	cob = checkout -b

     

       13
       -
       	lg = log --color --graph --oneline --abbrev-commit

     

       14
        
       	pr = pull-request

     

       15
        
       	rci = commit --amend --reuse-message HEAD

     

       16
        
       	squash = rebase -i @{u}

     
···

       23
        
       	skip = update-index --skip-worktree

     

       24
        
       	unskip = update-index --no-skip-worktree

     

       25
        
       	publish = push -u hauleth

     

       26
       -
       	cleanup = "!git branch --format='%(refname:lstrip=2)' --no-contains HEAD --no-contains master --merged master | xargs -xn1 git branch -d"

     

       27
        
       

     

       28
        
       [mergetool]

     

       29
        
       	keepBackup = false

···

       10
        
       	ci = commit

     

       11
        
       	co = checkout

     

       12
        
       	cob = checkout -b

     

       13
       +
       	lg = log --color --graph --abbrev-commit --pretty=format:'%C(yellow)%h%C(auto)%d %s <%C(green)%aN%C(reset)> (%C(blue)%ar%C(reset))'

     

       14
        
       	pr = pull-request

     

       15
        
       	rci = commit --amend --reuse-message HEAD

     

       16
        
       	squash = rebase -i @{u}

     
···

       23
        
       	skip = update-index --skip-worktree

     

       24
        
       	unskip = update-index --no-skip-worktree

     

       25
        
       	publish = push -u hauleth

     

       26
       +
       	cleanup = "!git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(if:notequals=${1:-master})%(refname:lstrip=2)%(then)%(refname:lstrip=2)%(end)%(end)\" --merged master | xargs -rpxL1 git branch -d"

     

       27
        
       

     

       28
        
       [mergetool]

     

       29
        
       	keepBackup = false

+1

nix/.config/nixpkgs/config.nix

···

       0

···

       1
       +
       { allowUnsupportedSystem = true; }

+2 -3

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

···

       18
        
           direnv

     

       19
        
           dnsmasq

     

       20
        
           entr

     

       0
        
       
     

       21
        
           fzy

     

       0
        
       
     

       22
        
           gitAndTools.diff-so-fancy

     

       23
        
           gitAndTools.git-imerge

     

       24
        
           gitAndTools.git-test

     

       25
        
           gitAndTools.hub

     

       26
        
           gitAndTools.tig

     

       27
        
           gitFuller

     

       28
       -
           git-lfs

     

       29
        
           gnupg

     

       30
        
           httpie

     

       31
        
           imagemagick

     

       32
        
           jq

     

       33
        
           neovim

     

       34
        
           neovim-remote

     

       35
       -
           nix-index

     

       36
        
           noti

     

       37
        
           ripgrep

     

       38
        
           universal-ctags

     

       39
       -
           weechat

     

       40
        
           w3m

     

       41
        
         ];

     

       42

···

       18
        
           direnv

     

       19
        
           dnsmasq

     

       20
        
           entr

     

       21
       +
           findutils

     

       22
        
           fzy

     

       23
       +
           git-lfs

     

       24
        
           gitAndTools.diff-so-fancy

     

       25
        
           gitAndTools.git-imerge

     

       26
        
           gitAndTools.git-test

     

       27
        
           gitAndTools.hub

     

       28
        
           gitAndTools.tig

     

       29
        
           gitFuller

     

       0
        
       
     

       30
        
           gnupg

     

       31
        
           httpie

     

       32
        
           imagemagick

     

       33
        
           jq

     

       34
        
           neovim

     

       35
        
           neovim-remote

     

       0
        
       
     

       36
        
           noti

     

       37
        
           ripgrep

     

       38
        
           universal-ctags

     

       0
        
       
     

       39
        
           w3m

     

       40
        
         ];

     

       41

+27

nix/.config/nixpkgs/overlays/encpipe.nix

···

       1
       +
       self: super:

     

       2
       +
       

     

       3
       +
       with super;

     

       4
       +
       

     

       5
       +
       let

     

       6
       +
         libhydrogen = fetchGit {

     

       7
       +
           url = "https://github.com/jedisct1/libhydrogen.git";

     

       8
       +
           ref = "master";

     

       9
       +
         };

     

       10
       +
       in

     

       11
       +
       {

     

       12
       +
         encpipe = self.stdenv.mkDerivation rec {

     

       13
       +
           name = "encpipe-${version}";

     

       14
       +
           version = "0.5";

     

       15
       +
       

     

       16
       +
           nativeBuildInputs = [ git ];

     

       17
       +
       

     

       18
       +
           preBuild = ''

     

       19
       +
             cp -R ${libhydrogen}/* ext/libhydrogen/

     

       20
       +
             '';

     

       21
       +
       

     

       22
       +
           src = fetchGit {

     

       23
       +
             url = "https://github.com/jedisct1/encpipe.git";

     

       24
       +
             ref = "master";

     

       25
       +
           };

     

       26
       +
         };

     

       27
       +
       }

+2 -2

nix/.config/nixpkgs/overlays/erlang/erlang-ls.json

···

       1
        
       {

     

       2
        
           "owner": "erlang-ls",

     

       3
        
           "repo": "erlang_ls",

     

       4
       -
           "rev": "6a675ee5b43d53cf3ec393f225c61c7226c9da7b",

     

       5
       -
           "sha256": "0n43b6g2k8d5cbgvgc00mlz5v8cmyjidlxsjx540xhn6ybyyz710"

     

       6
        
       }

···

       1
        
       {

     

       2
        
           "owner": "erlang-ls",

     

       3
        
           "repo": "erlang_ls",

     

       4
       +
           "rev": "634cc2ad63f8b1c5675737ea9b62764fe912630c",

     

       5
       +
           "sha256": "0sqw5xn07np2cwsaw2hcsysrz123fdi014d46s49l6xfd96jrkyx"

     

       6
        
       }

+2 -2

nix/.config/nixpkgs/overlays/tokei.nix

···

       4
        
       

     

       5
        
       {

     

       6
        
         tokei = tokei.overrideDerivation (cfg: {

     

       7
       -
           buildInputs = stdenv.lib.optionals stdenv.isDarwin [

     

       8
        
             self.libiconv

     

       9
        
             self.darwin.apple_sdk.frameworks.Security

     

       10
       -
           ];

     

       11
        
         });

     

       12
        
       }

···

       4
        
       

     

       5
        
       {

     

       6
        
         tokei = tokei.overrideDerivation (cfg: {

     

       7
       +
           buildInputs = cfg.buildInputs ++ (stdenv.lib.optionals stdenv.isDarwin [

     

       8
        
             self.libiconv

     

       9
        
             self.darwin.apple_sdk.frameworks.Security

     

       10
       +
           ]);

     

       11
        
         });

     

       12
        
       }

-1

result

···

       1
       -
       /nix/store/b802k22mffrw1p4dvkv3nq2w8c0sqyff-darwin-system-20.03pre199995.895874d2145+darwin3.0000000

···

       0

+7

vim/.config/nvim/after/syntax/elixir.vim

···

       1
       +
       " setlocal conceallevel=1

     

       2
       +
       

     

       3
       +
       " syn match elixirPipe /|>/ contained containedin=elixirOperator conceal cchar=▷

     

       4
       +
       " syn match elixirJoin /<>/ contained containedin=elixirOperator conceal cchar=◇

     

       5
       +
       

     

       6
       +
       " hi link elixirPipe elixirOperator

     

       7
       +
       " hi link elixirJoin elixirOperator

+2 -1

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

···

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

     

       34
        
           " }}}

     

       35
        
           " Git {{{

     

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

     

       37
        
           " }}}

     

       38
        
           " Launch screen {{{

     

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

     
···

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

     

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

     

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

     

       0
        
       
     

       94
        
           " }}}

     

       95
        
       endfunc

···

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

     

       34
        
           " }}}

     

       35
        
           " Git {{{

     

       36
       +
           call minpac#add('tpope/vim-fugitive')

     

       37
        
           " }}}

     

       38
        
           " Launch screen {{{

     

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

     
···

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

     

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

     

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

     

       94
       +
           call minpac#add('reedes/vim-pencil')

     

       95
        
           " }}}

     

       96
        
       endfunc

+2 -1

vim/.config/nvim/init.vim

···

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

     

       13
        
       " }}}

     

       14
        
       " Identation {{{

     

       15
       -
       set shiftwidth=4 expandtab

     

       16
        
       

     

       17
        
       set textwidth=80

     

       18
        
       set nowrap linebreak formatoptions+=l

     
···

       87
        
       " Fuzzy file search {{{

     

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

     

       89
        
       

     

       0
        
       
     

       90
        
       let g:picker_custom_find_executable = 'rg'

     

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

     

       92
        
       let g:clap#provider#files# = {

···

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

     

       13
        
       " }}}

     

       14
        
       " Identation {{{

     

       15
       +
       set shiftwidth=2 expandtab

     

       16
        
       

     

       17
        
       set textwidth=80

     

       18
        
       set nowrap linebreak formatoptions+=l

     
···

       87
        
       " Fuzzy file search {{{

     

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

     

       89
        
       

     

       90
       +
       let g:picker_default_external_filter = 'fzy'

     

       91
        
       let g:picker_custom_find_executable = 'rg'

     

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

     

       93
        
       let g:clap#provider#files# = {

-3

vim/.config/nvim/plugin/pack-delayed.vim

···

       5
        
       

     

       6
        
       func! DelayedLoad(...) abort " No abort as we want to continue if any plugin fails

     

       7
        
           " Git

     

       8
       -
           packadd vim-fugitive

     

       9
       -
                       \ | call fugitive#detect(getcwd())

     

       10
       -
       

     

       11
        
           packadd vim-unimpaired

     

       12
        
           packadd targets.vim

     

       13

···

       5
        
       

     

       6
        
       func! DelayedLoad(...) abort " No abort as we want to continue if any plugin fails

     

       7
        
           " Git

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       8
        
           packadd vim-unimpaired

     

       9
        
           packadd targets.vim

     

       10

+2 -2

vim/.config/nvim/plugin/statusline.vim

···

       1
        
       scriptencoding utf-8

     

       2
        
       

     

       3
        
       let &statusline  = ' '

     

       4
       -
       let &statusline .= '» %{statusline#filename()}%{statusline#modified()} «%<'

     

       5
        
       let &statusline .= ' '

     

       6
        
       let &statusline .= '%#StatusLineNC#%{statusline#path()}%*'

     

       7
        
       let &statusline .= '%='

     

       8
       -
       let &statusline .= '%{statusline#quickfix()} %4c:%l'

···

       1
        
       scriptencoding utf-8

     

       2
        
       

     

       3
        
       let &statusline  = ' '

     

       4
       +
       let &statusline .= '» %{statusline#filename()}%{statusline#modified()} « %<'

     

       5
        
       let &statusline .= ' '

     

       6
        
       let &statusline .= '%#StatusLineNC#%{statusline#path()}%*'

     

       7
        
       let &statusline .= '%='

     

       8
       +
       let &statusline .= '%{FugitiveHead()} %{statusline#quickfix()} %4c:%l'