this repo has no description
Remove Nix and Fin
+54
-239
+2
-2
Makefile
+2
-2
Makefile
+1
-9
bin/Makefile
+1
-9
bin/Makefile
···
1
-
FILES = docker-compose docker-machine
1
+
FILES = lein
2
2
3
3
PWD = $(shell pwd)
4
4
···
7
7
lein:
8
8
$(WGET) -O$@ https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
9
9
chmod +x $@
10
-
11
-
docker-compose:
12
-
$(WGET) -O$@ https://github.com/docker/compose/releases/download/1.5.1/docker-compose-$(shell uname -s)-$(shell uname -m)
13
-
chmod +x $@
14
-
15
-
docker-machine:
16
-
$(WGET) -O$@.zip https://github.com/docker/machine/releases/download/v0.5.0/docker-machine_linux-amd64.zip
17
-
unzip -f $@.zip
18
10
19
11
nvr:
20
12
$(WGET) -O$@ https://raw.githubusercontent.com/mhinz/neovim-remote/master/nvr
+2
fish/.gitignore
+2
fish/.gitignore
+3
-5
fish/Makefile
+3
-5
fish/Makefile
···
2
2
3
3
PWD = $(shell pwd)
4
4
5
-
install: fin
5
+
install:
6
6
$(LN) ${PWD} $(XDG_CONFIG_HOME)/fish
7
+
fish -c 'fin'
7
8
8
9
functions/fin.fish:
9
-
$(WGET) -O$@ https://raw.githubusercontent.com/fishery/fin/master/fin.fish
10
-
11
-
fin: functions/fin.fish
12
-
fish -c 'fin'
10
+
$(WGET) -O$@ https://raw.githubusercontent.com/fisherman/fin/master/fin.fish
13
11
14
12
.PHONY: install
+1
-1
fish/completions/work.fish
+1
-1
fish/completions/work.fish
···
1
-
complete -x -c work -a '(find -L "$WORKSPACE_SRC" -depth -maxdepth 5 -type d -and -name .git -prune -and -not -path "*/\.cargo/*" -prune -printf "%h\n" | sed -e "s:$WORKSPACE_SRC/*::" -e "s:/\.git::")'
1
+
complete -x -c work -a '(find -L "$WORKSPACE" -depth -maxdepth 5 -type d -and -name .git -prune -and -not -path "*/\.cargo/*" -prune -print | sed -e "s:$WORKSPACE/*::" -e "s:/\.git::")'
+7
-14
fish/config.fish
+7
-14
fish/config.fish
···
1
-
set NIX_LINK "$HOME/.nix-profile"
2
-
# Set the default profile.
3
-
if not [ -L "$NIX_LINK" ]
4
-
echo "creating $NIX_LINK" >&2
5
-
set _NIX_DEF_LINK /nix/var/nix/profiles/default
6
-
/nix/store/4lrli8ng5i54k14id152svvp1kvqsn92-coreutils-8.21/bin/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
1
+
if not functions -q fundle
2
+
eval (curl -sfL https://git.io/fundle-install)
7
3
end
8
-
set -x PATH $NIX_LINK/bin $NIX_LINK/sbin $PATH
9
-
# Append ~/.nix-defexpr/channels/nixpkgs to $NIX_PATH so that
10
-
# <nixpkgs> paths work when the user has fetched the Nixpkgs
11
-
# channel.
12
-
set -gx NIX_PATH nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs
4
+
5
+
fundle plugin 'hauleth/agnoster'
6
+
fundle plugin 'fishery/rbenv'
7
+
fundle plugin 'fishery/z'
13
8
14
-
for file in $HOME/.config/fish/conf.d/*.fish
15
-
source $file
16
-
end
9
+
fundle init
17
10
18
11
enable direnv hook fish
19
12
enable hub alias -s
-1
fish/functions/agnoster.fish
-1
fish/functions/agnoster.fish
···
1
-
/home/hauleth/.config/fin/agnoster/agnoster.fish
-1
fish/functions/fish_prompt.fish
-1
fish/functions/fish_prompt.fish
···
1
-
/home/hauleth/.config/fin/agnoster/fish_prompt.fish
+3
-3
fish/functions/fish_user_key_bindings.fish
+3
-3
fish/functions/fish_user_key_bindings.fish
+1
-1
fish/functions/fzf_key_bindings.fish
+1
-1
fish/functions/fzf_key_bindings.fish
-7
fish/functions/theme.fish
-7
fish/functions/theme.fish
+1
-1
fish/functions/work.fish
+1
-1
fish/functions/work.fish
-20
nix/Makefile
-20
nix/Makefile
···
1
-
PWD = $(shell pwd)
2
-
3
-
NIX_LINK = ${HOME}/.nix-profile
4
-
NIX_DEFAULT = /nix/var/nix/profiles/default
5
-
6
-
install: nix channels
7
-
$(LN) ${PWD} ${HOME}/.nixpkgs
8
-
${NIX_LINK}/bin/nix-channel --update
9
-
${NIX_LINK}/bin/nix-env -i runtime
10
-
11
-
nix: install.sh
12
-
test -d "/nix" || sh install.sh
13
-
14
-
path:
15
-
echo "Creating ${NIX_LINK}"
16
-
/nix/store/4lrli8ng5i54k14id152svvp1kvqsn92-coreutils-8.21/bin/ln -s "${NIX_DEFAULT}" "${NIX_LINK}"
17
-
export PATH=${NIX_LINK}/bin:${NIX_LINK}/sbin:${PATH}
18
-
19
-
channels:
20
-
echo "http://nixos.org/channels/nixpkgs-unstable nixpkgs" > ${HOME}/.nix-channels
-54
nix/config.nix
-54
nix/config.nix
···
1
-
rec {
2
-
allowUnfree = true;
3
-
4
-
packageOverrides = pkgs: rec {
5
-
all = pkgs.buildEnv {
6
-
name = "all";
7
-
paths = [
8
-
pkgs.nixops
9
-
editors
10
-
scm
11
-
tools
12
-
];
13
-
};
14
-
15
-
editors = pkgs.buildEnv {
16
-
name = "editors";
17
-
paths = [
18
-
pkgs.neovim
19
-
];
20
-
};
21
-
22
-
scm = pkgs.buildEnv {
23
-
name = "scm";
24
-
paths = [
25
-
pkgs.mercurial
26
-
27
-
pkgs.git
28
-
pkgs.gitAndTools.hub
29
-
pkgs.gitAndTools.git-imerge
30
-
];
31
-
};
32
-
33
-
tools = pkgs.buildEnv {
34
-
name = "tools";
35
-
paths = [
36
-
pkgs.wrk
37
-
tmux
38
-
39
-
# CLI tools
40
-
pkgs.tldr
41
-
pkgs.direnv
42
-
pkgs.silver-searcher
43
-
pkgs.jq
44
-
pkgs.python35Packages.pygments
45
-
46
-
universal-ctags
47
-
];
48
-
};
49
-
50
-
universal-ctags = pkgs.callPackage ./pkgs/universal-ctags {};
51
-
htop = pkgs.callPackage ./pkgs/htop {};
52
-
tmux = pkgs.callPackage ./pkgs/tmux.nix {};
53
-
};
54
-
}
-45
nix/install.sh
-45
nix/install.sh
···
1
-
#!/bin/sh
2
-
3
-
# This script installs the Nix package manager on your system by
4
-
# downloading a binary distribution and running its installer script
5
-
# (which in turn creates and populates /nix).
6
-
7
-
{ # Prevent execution if this script was only partially downloaded
8
-
9
-
unpack=nix-binary-tarball-unpack
10
-
11
-
require_util() {
12
-
type "$1" > /dev/null 2>&1 || which "$1" > /dev/null 2>&1 ||
13
-
oops "you do not have \`$1' installed, which i need to $2"
14
-
}
15
-
16
-
oops() {
17
-
echo "$0: $@" >&2
18
-
rm -rf "$unpack"
19
-
exit 1
20
-
}
21
-
22
-
case "$(uname -s).$(uname -m)" in
23
-
Linux.x86_64) system=x86_64-linux;;
24
-
Linux.i?86) system=i686-linux;;
25
-
Darwin.x86_64) system=x86_64-darwin;;
26
-
*) oops "sorry, there is no binary distribution of Nix for your platform";;
27
-
esac
28
-
29
-
url="https://nixos.org/releases/nix/nix-1.10/nix-1.10-$system.tar.bz2"
30
-
31
-
require_util curl "download the binary tarball"
32
-
require_util bzcat "decompress the binary tarball"
33
-
require_util tar "unpack the binary tarball"
34
-
35
-
echo "unpacking Nix binary tarball for $system from \`$url'..."
36
-
mkdir "$unpack" || oops "failed to create \`$unpack' directory"
37
-
curl -L "$url" | bzcat | tar x -C "$unpack" || oops "failed to unpack \`$url'"
38
-
39
-
[ -e "$unpack"/*/install ] ||
40
-
oops "installation script is missing from the binary tarball!"
41
-
42
-
"$unpack"/*/install
43
-
rm -rf "$unpack"
44
-
45
-
} # End of wrapping
-23
nix/pkgs/htop/default.nix
-23
nix/pkgs/htop/default.nix
···
1
-
{ stdenv, fetchzip, automake, autoconf, ncurses, libtool }:
2
-
3
-
stdenv.mkDerivation {
4
-
name = "htop-2.0.0";
5
-
6
-
buildInputs = [
7
-
automake
8
-
autoconf
9
-
libtool
10
-
ncurses
11
-
];
12
-
13
-
src = fetchzip {
14
-
url = "https://github.com/hishamhm/htop/archive/2.0.0.zip";
15
-
sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z";
16
-
};
17
-
18
-
preConfigure = "./autogen.sh";
19
-
configureFlags = [
20
-
"--enable-unicode"
21
-
"--enable-native-affinity"
22
-
];
23
-
}
-25
nix/pkgs/tmux.nix
-25
nix/pkgs/tmux.nix
···
1
-
{ stdenv, fetchgit, automake, autoconf, ncurses, pkgconfig, libevent }:
2
-
3
-
stdenv.mkDerivation {
4
-
name = "tmux-2.2-e9d369a0";
5
-
6
-
buildInputs = [
7
-
automake
8
-
autoconf
9
-
pkgconfig
10
-
ncurses
11
-
libevent
12
-
];
13
-
14
-
src = fetchgit {
15
-
url = "https://github.com/tmux/tmux.git";
16
-
rev = "e9d369a0";
17
-
sha256 = "7ae3811591a7ce45e4c85163dbd3c0925acd1fbd21d9eed714cfb6a290c71869";
18
-
};
19
-
20
-
preConfigure = "./autogen.sh";
21
-
configureFlags = [
22
-
"--with-truecolor"
23
-
];
24
-
}
25
-
+1
-1
nvim/Makefile
+1
-1
nvim/Makefile
+30
nvim/autoload/plug.vim
+30
nvim/autoload/plug.vim
···
402
402
endif
403
403
endfunction
404
404
405
+
function! s:dobufread(names)
406
+
for name in a:names
407
+
let path = s:rtp(g:plugs[name]).'/**'
408
+
for dir in ['ftdetect', 'ftplugin']
409
+
if len(finddir(dir, path))
410
+
return s:doautocmd('BufRead')
411
+
endif
412
+
endfor
413
+
endfor
414
+
endfunction
415
+
405
416
function! plug#load(...)
406
417
if a:0 == 0
407
418
return s:err('Argument missing: plugin name(s) required')
···
417
428
for name in a:000
418
429
call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
419
430
endfor
431
+
<<<<<<< Updated upstream
420
432
call s:doautocmd('BufRead')
433
+
=======
434
+
call s:dobufread(a:000)
435
+
>>>>>>> Stashed changes
421
436
return 1
422
437
endfunction
423
438
···
467
482
468
483
function! s:lod_cmd(cmd, bang, l1, l2, args, names)
469
484
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
485
+
<<<<<<< Updated upstream
470
486
call s:doautocmd('BufRead')
487
+
=======
488
+
call s:dobufread(a:names)
489
+
>>>>>>> Stashed changes
471
490
execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
472
491
endfunction
473
492
474
493
function! s:lod_map(map, names, prefix)
475
494
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
495
+
<<<<<<< Updated upstream
476
496
call s:doautocmd('BufRead')
497
+
=======
498
+
call s:dobufread(a:names)
499
+
>>>>>>> Stashed changes
477
500
let extra = ''
478
501
while 1
479
502
let c = getchar(0)
···
482
505
endif
483
506
let extra .= nr2char(c)
484
507
endwhile
508
+
if v:count
509
+
call feedkeys(v:count, 'n')
510
+
endif
511
+
call feedkeys('"'.v:register, 'n')
512
+
if mode(1) == 'no'
513
+
call feedkeys(v:operator)
514
+
endif
485
515
call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
486
516
endfunction
487
517
+2
tmux/init.tmux
+2
tmux/init.tmux
···
10
10
11
11
source "$HOME/.tmux/themes/agnoster.tmux"
12
12
13
+
set -g default-terminal "xterm-256color"
14
+
13
15
# Smart pane switching with awareness of vim splits
14
16
is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
15
17
bind -n C-h if-shell "$is_vim" "send-keys Escape \"[104;5u\"" "select-pane -L"