this repo has no description
Update Erlang LS
+55
-18
+5
-1
fish/.config/fish/functions/p.fish
+5
-1
fish/.config/fish/functions/p.fish
+2
-2
git/.config/git/config
+2
-2
git/.config/git/config
···
10
10
ci = commit
11
11
co = checkout
12
12
cob = checkout -b
13
-
lg = log --color --graph --oneline --abbrev-commit
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
14
pr = pull-request
15
15
rci = commit --amend --reuse-message HEAD
16
16
squash = rebase -i @{u}
···
23
23
skip = update-index --skip-worktree
24
24
unskip = update-index --no-skip-worktree
25
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"
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
27
28
28
[mergetool]
29
29
keepBackup = false
+1
nix/.config/nixpkgs/config.nix
+1
nix/.config/nixpkgs/config.nix
···
1
+
{ allowUnsupportedSystem = true; }
+2
-3
nix/.config/nixpkgs/darwin/configuration.nix
+2
-3
nix/.config/nixpkgs/darwin/configuration.nix
···
18
18
direnv
19
19
dnsmasq
20
20
entr
21
+
findutils
21
22
fzy
23
+
git-lfs
22
24
gitAndTools.diff-so-fancy
23
25
gitAndTools.git-imerge
24
26
gitAndTools.git-test
25
27
gitAndTools.hub
26
28
gitAndTools.tig
27
29
gitFuller
28
-
git-lfs
29
30
gnupg
30
31
httpie
31
32
imagemagick
32
33
jq
33
34
neovim
34
35
neovim-remote
35
-
nix-index
36
36
noti
37
37
ripgrep
38
38
universal-ctags
39
-
weechat
40
39
w3m
41
40
];
42
41
+27
nix/.config/nixpkgs/overlays/encpipe.nix
+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
+2
-2
nix/.config/nixpkgs/overlays/erlang/erlang-ls.json
···
1
1
{
2
2
"owner": "erlang-ls",
3
3
"repo": "erlang_ls",
4
-
"rev": "6a675ee5b43d53cf3ec393f225c61c7226c9da7b",
5
-
"sha256": "0n43b6g2k8d5cbgvgc00mlz5v8cmyjidlxsjx540xhn6ybyyz710"
4
+
"rev": "634cc2ad63f8b1c5675737ea9b62764fe912630c",
5
+
"sha256": "0sqw5xn07np2cwsaw2hcsysrz123fdi014d46s49l6xfd96jrkyx"
6
6
}
+2
-2
nix/.config/nixpkgs/overlays/tokei.nix
+2
-2
nix/.config/nixpkgs/overlays/tokei.nix
-1
result
-1
result
···
1
-
/nix/store/b802k22mffrw1p4dvkv3nq2w8c0sqyff-darwin-system-20.03pre199995.895874d2145+darwin3.0000000
+7
vim/.config/nvim/after/syntax/elixir.vim
+7
vim/.config/nvim/after/syntax/elixir.vim
+2
-1
vim/.config/nvim/autoload/plugins.vim
+2
-1
vim/.config/nvim/autoload/plugins.vim
···
33
33
call minpac#add('liuchengxu/vim-clap')
34
34
" }}}
35
35
" Git {{{
36
-
call minpac#add('tpope/vim-fugitive', { 'type': 'opt' })
36
+
call minpac#add('tpope/vim-fugitive')
37
37
" }}}
38
38
" Launch screen {{{
39
39
call minpac#add('mhinz/vim-startify') " Required during startup
···
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
+
call minpac#add('reedes/vim-pencil')
94
95
" }}}
95
96
endfunc
+2
-1
vim/.config/nvim/init.vim
+2
-1
vim/.config/nvim/init.vim
···
12
12
command! -bar PackStatus call plugins#reload() | call minpac#status()
13
13
" }}}
14
14
" Identation {{{
15
-
set shiftwidth=4 expandtab
15
+
set shiftwidth=2 expandtab
16
16
17
17
set textwidth=80
18
18
set nowrap linebreak formatoptions+=l
···
87
87
" Fuzzy file search {{{
88
88
nnoremap <Space><Space> :<C-u>Clap files<CR>
89
89
90
+
let g:picker_default_external_filter = 'fzy'
90
91
let g:picker_custom_find_executable = 'rg'
91
92
let g:picker_custom_find_flags = '--color never --files --hidden --glob !.git'
92
93
let g:clap#provider#files# = {
-3
vim/.config/nvim/plugin/pack-delayed.vim
-3
vim/.config/nvim/plugin/pack-delayed.vim
+2
-2
vim/.config/nvim/plugin/statusline.vim
+2
-2
vim/.config/nvim/plugin/statusline.vim
···
1
1
scriptencoding utf-8
2
2
3
3
let &statusline = ' '
4
-
let &statusline .= '» %{statusline#filename()}%{statusline#modified()} «%<'
4
+
let &statusline .= '» %{statusline#filename()}%{statusline#modified()} « %<'
5
5
let &statusline .= ' '
6
6
let &statusline .= '%#StatusLineNC#%{statusline#path()}%*'
7
7
let &statusline .= '%='
8
-
let &statusline .= '%{statusline#quickfix()} %4c:%l'
8
+
let &statusline .= '%{FugitiveHead()} %{statusline#quickfix()} %4c:%l'