From d980651c7421aa54cef10ad4876e42c8b74647f3 Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Fri, 5 Nov 2021 16:09:08 +0100 Subject: [PATCH 1/4] only execute brew if installed --- files/fish/config.fish | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/files/fish/config.fish b/files/fish/config.fish index 9b23a79..000b930 100644 --- a/files/fish/config.fish +++ b/files/fish/config.fish @@ -3,7 +3,9 @@ set -g fish_user_paths "/usr/local/sbin" $fish_user_paths set -x PIPENV_VENV_IN_PROJECT true export GOPATH="$HOME/.go" -export GOROOT=(brew --prefix go)"/libexec" +if type -q $program + export GOROOT=(brew --prefix go)"/libexec" +end export PATH="$PATH:$GOPATH/bin:$GOROOT/bin:$HOME/.cargo/bin" # The next line updates PATH for the Google Cloud SDK. From 31051f7e34d42dd0456059a1b37f5e054a3b1fe2 Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Fri, 5 Nov 2021 16:10:00 +0100 Subject: [PATCH 2/4] irgnore plugins --- files/vim/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/files/vim/.gitignore b/files/vim/.gitignore index 4c618f5..3224c3c 100644 --- a/files/vim/.gitignore +++ b/files/vim/.gitignore @@ -1 +1,2 @@ undodir +plugged From 4fef43437dd978ef5a7aa8afd0b1343a876c5dad Mon Sep 17 00:00:00 2001 From: Nicco Date: Fri, 5 Nov 2021 16:14:20 +0100 Subject: [PATCH 3/4] Create README.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..43b9f1c --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# .files + +Collection of dotfiles. + +## Installation + +```bash +git clone https://github.com/cupcakearmy/dotfiles.git ~/.dotfiles +cd ~/.dotfiles +./install +``` From 612cb17f9a7125fd8fd39c8bc0fcc0d7dae10833 Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Fri, 5 Nov 2021 17:33:48 +0100 Subject: [PATCH 4/4] tabtab --- files/fish/config.fish | 4 ++++ files/tabtab/fish/__tabtab.fish | 4 ++++ files/tabtab/fish/pnpm.fish | 22 ++++++++++++++++++++++ install.conf.yaml | 21 +++++++++++---------- 4 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 files/tabtab/fish/__tabtab.fish create mode 100644 files/tabtab/fish/pnpm.fish diff --git a/files/fish/config.fish b/files/fish/config.fish index 000b930..58e4f60 100644 --- a/files/fish/config.fish +++ b/files/fish/config.fish @@ -10,3 +10,7 @@ export PATH="$PATH:$GOPATH/bin:$GOROOT/bin:$HOME/.cargo/bin" # The next line updates PATH for the Google Cloud SDK. if [ -f '$HOME/Desktop/google-cloud-sdk/path.fish.inc' ]; . '$HOME/Desktop/google-cloud-sdk/path.fish.inc'; end + +# tabtab source for packages +# uninstall by removing these lines +[ -f ~/.config/tabtab/fish/__tabtab.fish ]; and . ~/.config/tabtab/fish/__tabtab.fish; or true diff --git a/files/tabtab/fish/__tabtab.fish b/files/tabtab/fish/__tabtab.fish new file mode 100644 index 0000000..4990a5c --- /dev/null +++ b/files/tabtab/fish/__tabtab.fish @@ -0,0 +1,4 @@ + +# tabtab source for pnpm package +# uninstall by removing these lines +[ -f ~/.config/tabtab/fish/pnpm.fish ]; and . ~/.config/tabtab/fish/pnpm.fish; or true diff --git a/files/tabtab/fish/pnpm.fish b/files/tabtab/fish/pnpm.fish new file mode 100644 index 0000000..2b6c322 --- /dev/null +++ b/files/tabtab/fish/pnpm.fish @@ -0,0 +1,22 @@ +###-begin-pnpm-completion-### +function _pnpm_completion + set cmd (commandline -o) + set cursor (commandline -C) + set words (count $cmd) + + set completions (eval env DEBUG=\"" \"" COMP_CWORD=\""$words\"" COMP_LINE=\""$cmd \"" COMP_POINT=\""$cursor\"" pnpm completion -- $cmd) + + if [ "$completions" = "__tabtab_complete_files__" ] + set -l matches (commandline -ct)* + if [ -n "$matches" ] + __fish_complete_path (commandline -ct) + end + else + for completion in $completions + echo -e $completion + end + end +end + +complete -f -d 'pnpm' -c pnpm -a "(_pnpm_completion)" +###-end-pnpm-completion-### diff --git a/install.conf.yaml b/install.conf.yaml index bf0864c..82c161b 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -1,17 +1,18 @@ - defaults: - link: - create: true - relink: true - force: true + link: + create: true + relink: true + force: true - clean: ["~"] - link: - ~/.gitconfig: files/git/gitconfig - ~/.vim: files/vim - ~/.vimrc: files/vimrc - ~/.config/fish: files/fish - ~/.config/omf: files/omf + ~/.gitconfig: files/git/gitconfig + ~/.vim: files/vim + ~/.vimrc: files/vimrc + ~/.config/fish: files/fish + ~/.config/omf: files/omf + ~/.config/tabtab: files/tabtab - shell: - - [git submodule update --init --recursive, Installing submodules] + - [git submodule update --init --recursive, Installing submodules]