Browse Source

meta: replace fundle with git submodules

master
sentriz 8 months ago
parent
commit
386e559641
No known key found for this signature in database GPG Key ID: 9A8DAE1CA907B862
18 changed files with 88 additions and 500 deletions
  1. +0
    -7
      .gitignore
  2. +18
    -0
      .gitmodules
  3. +0
    -1
      conf_common/.config/fish/.gitignore
  4. +6
    -1
      conf_common/.config/fish/config.base.laptop.fish
  5. +11
    -12
      conf_common/.config/fish/config.fish
  6. +8
    -14
      conf_common/.config/fish/config.interactive.fish
  7. +0
    -453
      conf_common/.config/fish/functions/fundle.fish
  8. +1
    -0
      conf_common/.config/fish/plugins/brgmnn/fish-docker-compose
  9. +1
    -0
      conf_common/.config/fish/plugins/fisherman/done
  10. +1
    -0
      conf_common/.config/fish/plugins/fisherman/getopts
  11. +1
    -0
      conf_common/.config/fish/plugins/fishpkg/fish-humanize-duration
  12. +1
    -0
      conf_common/.config/fish/plugins/jethrokuan/fzf
  13. +1
    -0
      conf_common/.config/fish/plugins/jethrokuan/z
  14. +14
    -0
      fish-plugin-install
  15. +20
    -0
      fish-plugin-uninstall
  16. +0
    -7
      install-phone-all
  17. +4
    -4
      readme.md
  18. +1
    -1
      vim-plugin-uninstall

+ 0
- 7
.gitignore View File

@@ -1,7 +0,0 @@
public_extra/.local/share/applications
public_extra/.config/mpv/scripts/
public_common/.config/nvim/.netrwhist
public_common/.config/autostart/
public_common/.config/fish/fishd.*
public_common/.config/fish/functions/fundle.fish
public_common/.config/fish/fundle/

+ 18
- 0
.gitmodules View File

@@ -70,3 +70,21 @@
[submodule "conf_common/.local/share/nvim/site/pack/meta/opt/nanotee/sqls.nvim"]
path = conf_common/.local/share/nvim/site/pack/meta/opt/nanotee/sqls.nvim
url = https://github.com/nanotee/sqls.nvim
[submodule "conf_common/.config/fish/plugins/jethrokuan/fzf"]
path = conf_common/.config/fish/plugins/jethrokuan/fzf
url = https://github.com/jethrokuan/fzf
[submodule "conf_common/.config/fish/plugins/jethrokuan/z"]
path = conf_common/.config/fish/plugins/jethrokuan/z
url = https://github.com/jethrokuan/z
[submodule "conf_common/.config/fish/plugins/fisherman/done"]
path = conf_common/.config/fish/plugins/fisherman/done
url = https://github.com/fisherman/done
[submodule "conf_common/.config/fish/plugins/fishpkg/fish-humanize-duration"]
path = conf_common/.config/fish/plugins/fishpkg/fish-humanize-duration
url = https://github.com/fishpkg/fish-humanize-duration
[submodule "conf_common/.config/fish/plugins/fisherman/getopts"]
path = conf_common/.config/fish/plugins/fisherman/getopts
url = https://github.com/fisherman/getopts
[submodule "conf_common/.config/fish/plugins/brgmnn/fish-docker-compose"]
path = conf_common/.config/fish/plugins/brgmnn/fish-docker-compose
url = https://github.com/brgmnn/fish-docker-compose

+ 0
- 1
conf_common/.config/fish/.gitignore View File

@@ -1,2 +1 @@
fish_variables
fundle

+ 6
- 1
conf_common/.config/fish/config.base.laptop.fish View File

@@ -11,8 +11,13 @@ sed -nE 's/^([^=#]+)=(.*)/set -gx \1 \2/gp' <"$XDG_CONFIG_HOME/user-dirs.dirs" |
set -gx SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"

set -gx XDG_CURRENT_DESKTOP 'sway'
set -gx XDG_DATA_DIRS "/usr/local/share:/usr/share:/var/lib/flatpak/exports/share:$XDG_DATA_HOME/flatpak/exports/share"
set -gx XDG_SESSION_TYPE 'wayland'
set -gx XDG_DATA_DIRS (string join ":" \
'/usr/local/share' \
'/usr/share' \
'/var/lib/flatpak/exports/share' \
"$XDG_DATA_HOME/flatpak/exports/share"
)

# set -gx GDK_BACKEND 'wayland'
set -gx CLUTTER_BACKEND 'wayland'


+ 11
- 12
conf_common/.config/fish/config.fish View File

@@ -1,3 +1,8 @@
set -gx HOSTNAME android
if type -qp hostname >/dev/null 2>&1
set -gx HOSTNAME (hostname)
end

function __source_if_exists
for possible in $argv
test ! -f "$possible"; and continue
@@ -5,20 +10,14 @@ function __source_if_exists
end
end

if string match -q -r '.*termux.*' "$HOME"
set -gx HOSTNAME android
else
set -gx HOSTNAME (hostname)
end

__source_if_exists \
~/.config/fish/config.base.fish \
~/.config/fish/config.base.$HOSTNAME.fish
"$__fish_config_dir/config.base.fish" \
"$__fish_config_dir/config.base.$HOSTNAME.fish"

status --is-login; and __source_if_exists \
~/.config/fish/config.login.fish \
~/.config/fish/config.login.$HOSTNAME.fish
"$__fish_config_dir/config.login.fish" \
"$__fish_config_dir/config.login.$HOSTNAME.fish"

status --is-interactive; and __source_if_exists \
~/.config/fish/config.interactive.fish \
~/.config/fish/config.interactive.$HOSTNAME.fish
"$__fish_config_dir/config.interactive.fish" \
"$__fish_config_dir/config.interactive.$HOSTNAME.fish"

+ 8
- 14
conf_common/.config/fish/config.interactive.fish View File

@@ -1,3 +1,11 @@
# load plugins
set plugins "$XDG_CONFIG_HOME/fish/plugins/"
set -a fish_function_path (find "$plugins" -maxdepth 3 -name "functions")
set -a fish_complete_path (find "$plugins" -maxdepth 3 -name "completions")
for file in (find "$plugins" -path "*conf.d/*" -name "*.fish")
source "$file"
end

# safety/better
alias rm 'rm -I --verbose --preserve-root'
alias wget 'wget --continue --content-disposition'
@@ -39,20 +47,6 @@ set -g fish_color_status red
set -g fish_color_user brgreen
set -g fish_color_valid_path --underline

# plugins
fundle plugin 'jethrokuan/z' --url 'git@github.com:jethrokuan/z.git#pre27'
fundle plugin 'fisherman/done'
fundle plugin 'fisherman/fzf'
fundle plugin 'fishpkg/fish-humanize-duration'
fundle plugin 'fisherman/getopts'
# fundle plugin 'sentriz/fish-pipenv'
fundle plugin 'brgmnn/fish-docker-compose'
fundle init

# plugin settings
set -g pipenv_fish_fancy 'no'
set -g VIRTUAL_ENV_DISABLE_PROMPT 'yes'

# jump to my projects easily with completion
function p --argument project
cd "$DOTS_PROJECTS_DIR/$project"


+ 0
- 453
conf_common/.config/fish/functions/fundle.fish View File

@@ -1,453 +0,0 @@
set __fundle_current_version '0.7.0'

function __fundle_seq -a upto
seq 1 1 $upto 2>/dev/null
end

function __fundle_next_arg -a index
set -l args $argv[2..-1]
set -l arg_index (math $index + 1)
if test (count $args) -lt $arg_index
echo "missing argument for $args[$index]"
return 1
end
set -l arg $args[$arg_index]
switch $arg
case '--*'
echo "expected argument for $args[$index], got $arg"; and return 1
case '*'
echo $arg; and return 0
end
end

function __fundle_compare_versions -a version1 -a version2
for i in (__fundle_seq 4)
set -l v1 (echo $version1 | cut -d '.' -f $i | sed -Ee 's/[a-z]+//g')
set -l v2 (echo $version2 | cut -d '.' -f $i | sed -Ee 's/[a-z]+//g')
if test \( -n $v1 -a -z $v2 \) -o \( -n $v1 -a -n $v2 -a $v1 -lt $v2 \)
echo -n "lt"; and return 0
else if test \( -z $v1 -a -n $v2 \) -o \( -n $v1 -a -n $v2 -a $v1 -gt $v2 \)
echo -n "gt"; and return 0
end
end
echo -n "eq"; and return 0
end

function __fundle_date -d "returns a date"
set -l d (date +%s%N)
if echo $d | string match -rvq 'N'
echo $d
else
gdate +%s%N
end
return 0
end

function __fundle_self_update -d "updates fundle"
set -l fundle_repo_url "https://github.com/tuvistavie/fundle.git"
# This `sed` stays for now since doing it easily with `string` requires "--filter", which is only in 2.6.0
set -l latest (command git ls-remote --tags $fundle_repo_url | sed -n -e 's|.*refs/tags/v\(.*\)|\1|p' | tail -n 1)
if test (__fundle_compare_versions $latest (__fundle_version)) != "gt"
echo "fundle is already up to date"; and return 0
else
set -l file_url_template 'https://raw.githubusercontent.com/tuvistavie/fundle/VERSION/functions/fundle.fish'
set -l file_url (string replace 'VERSION' -- "v$latest" $file_url_template)
set -l tmp_file (mktemp /tmp/fundle.XXX)
set -l update_message "fundle has been updated to version $latest"
curl -Ls $file_url > $tmp_file; and mv $tmp_file (status -f); and echo $update_message; and return 0
end
end

function __fundle_url_rev -d "prints the revision from the url" -a git_url
set -l rev (echo $git_url | cut -d '#' -f 2 -s)
if test -n "$rev"
echo $rev
else
echo master
end
end

function __fundle_remote_url -d "prints the remote url from the full git url" -a git_url
echo $git_url | cut -d '#' -f 1
end

function __fundle_rev_parse -d "prints the revision if any" -a dir -a commitish
set -l sha (command git --git-dir $dir rev-parse -q --verify $commitish 2>/dev/null)
if test $status -eq 0
echo -n $sha
return 0
end
return 1
end

function __fundle_commit_sha -d "returns sha of the commit-ish" -a dir -a commitish
if test -d "$dir/.git"
set dir "$dir/.git"
end
if __fundle_rev_parse $dir "origin/$commitish"
return 0
end
__fundle_rev_parse $dir $commitish
end

function __fundle_plugins_dir -d "returns fundle directory"
if test -z "$fundle_plugins_dir"
if test -n "$XDG_CONFIG_HOME"
echo $XDG_CONFIG_HOME/fish/fundle
else
echo $HOME/.config/fish/fundle
end
else
echo $fundle_plugins_dir
end
end

function __fundle_no_git -d "check if git is installed"
# `command -q` is >= 2.5.0
if not command -s git > /dev/null 2>&1
echo "git needs to be installed and in the path"
return 0
end
return 1
end

function __fundle_check_date -d "check date"
if date +%s%N | string match -rvq 'N'
return 0
end
if command -s gdate > /dev/null 2>&1
return 0
end
echo "You need to have a GNU date compliant date installed to use profiling. Use 'brew install coreutils' on OSX"
return 1
end

function __fundle_get_url -d "returns the url for the given plugin" -a repo
echo "https://github.com/$repo.git"
end


function __fundle_plugin_index -d "returns the index of the plugin" -a plugin
for i in (__fundle_seq (count $__fundle_plugin_names))
if test "$__fundle_plugin_names[$i]" = "$plugin"
return $i
end
end
# NOTE: should never reach this point
echo "could not find plugin: $plugin"
exit 1
end

function __fundle_checkout_revision -a plugin -a git_url
set -l plugin_dir (__fundle_plugins_dir)/$plugin
set -l git_dir $plugin_dir/.git

set -l sha (__fundle_commit_sha $git_dir (__fundle_url_rev $git_url))
if test $status -eq 0
command git --git-dir="$git_dir" --work-tree="$plugin_dir" checkout -q -f $sha
else
echo "Could not checkout $plugin revision $sha"
return 1
end
end

function __fundle_update_plugin -d "update the given plugin" -a plugin -a git_url
echo "Updating $plugin"

set -l remote_url (__fundle_remote_url $git_url)
set -l git_dir (__fundle_plugins_dir)/$plugin/.git

command git --git-dir=$git_dir remote set-url origin $remote_url 2>/dev/null
command git --git-dir=$git_dir fetch -q 2>/dev/null

__fundle_checkout_revision $plugin $git_url
end

function __fundle_install_plugin -d "install the given plugin" -a plugin -a git_url
if __fundle_no_git
return 1
end

set -l plugin_dir (__fundle_plugins_dir)/$plugin
set -l git_dir $plugin_dir/.git
set -l remote_url (__fundle_remote_url $git_url)

if test -d $plugin_dir
echo "$argv[1] installed in $plugin_dir"
return 0
else
echo "Installing $plugin"
command git clone -q $remote_url $plugin_dir
__fundle_checkout_revision $plugin $git_url
end
end

function __fundle_update -d "update the given plugin, or all if unspecified" -a plugin
if test -n "$plugin"; and test ! -d (__fundle_plugins_dir)/$plugin/.git
echo "$plugin not installed. You may need to run 'fundle install'"
return 1
end

if test -n "$plugin"
set -l index (__fundle_plugin_index $plugin)
__fundle_update_plugin "$plugin" $__fundle_plugin_urls[$index]
else
for i in (__fundle_seq (count $__fundle_plugin_names))
__fundle_update_plugin $__fundle_plugin_names[$i] $__fundle_plugin_urls[$i]
end
end
end

function __fundle_show_doc_msg -d "show a link to fundle docs"
if test (count $argv) -ge 1
echo $argv
end
echo "See the docs for more info. https://github.com/tuvistavie/fundle"
end

function __fundle_load_plugin -a plugin -a path -a fundle_dir -a profile -d "load a plugin"
if begin; set -q __fundle_loaded_plugins; and contains $plugin $__fundle_loaded_plugins; end
return 0
end

set -l plugin_dir (string replace -r '/.$' '' -- "$fundle_dir/$plugin/$path")

if not test -d $plugin_dir
__fundle_show_doc_msg "$plugin not installed. You may need to run 'fundle install'"
return 0
end

# Take everything but "plugin-" from the last path component
set -l plugin_name (string replace -r '.*/(plugin-)?(.*)$' '$2' -- $plugin)
set -l init_file "$plugin_dir/init.fish"
set -l conf_dir "$plugin_dir/conf.d"
set -l bindings_file "$plugin_dir/key_bindings.fish"
set -l functions_dir "$plugin_dir/functions"
set -l completions_dir "$plugin_dir/completions"
set -l plugin_paths $__fundle_plugin_name_paths

if begin; test -d $functions_dir; and not contains $functions_dir $fish_function_path; end
set fish_function_path $fish_function_path[1] $functions_dir $fish_function_path[2..-1]
end

if begin; test -d $completions_dir; and not contains $completions_dir $fish_complete_path; end
set fish_complete_path $fish_complete_path[1] $completions_dir $fish_complete_path[2..-1]
end

if test -f $init_file
source $init_file
else if test -d $conf_dir
# read all *.fish files in conf.d
for f in $conf_dir/*.fish
source $f
end
else
# For compatibility with oh-my-fish themes, if there is no `init.fish` file in the plugin,
# which is the case with themses, the root directory of the plugin is trerated as a functions
# folder, so we include it in the `fish_function_path` variable.
if not contains $plugin_dir $fish_function_path
set fish_function_path $fish_function_path[1] $plugin_dir $fish_function_path[2..-1]
end
end

if test -f $bindings_file
set -g __fundle_binding_paths $bindings_file $__fundle_binding_paths
end

set -g __fundle_loaded_plugins $plugin $__fundle_loaded_plugins

set -l dependencies (printf '%s\n' $plugin_paths $__fundle_plugin_name_paths | sort | uniq -u)
for dependency in $dependencies
set -l name_path (string split : -- $dependency)
if test "$profile" -eq 1
set -l start_time (__fundle_date +%s%N)
__fundle_load_plugin $name_path[1] $name_path[2] $fundle_dir $profile
set -l ellapsed_time (math \((__fundle_date +%s%N) - $start_time\) / 1000)
echo "$name_path[1]": {$ellapsed_time}us
else
__fundle_load_plugin $name_path[1] $name_path[2] $fundle_dir $profile
end
end

emit "init_$plugin_name" $plugin_dir
end

function __fundle_bind -d "set up bindings"
if functions -q fish_user_key_bindings; and not functions -q __fish_user_key_bindings
functions -c fish_user_key_bindings __fish_user_key_bindings
end

function fish_user_key_bindings
for bindings in $__fundle_binding_paths
source $bindings
end
if functions -q __fish_user_key_bindings
__fish_user_key_bindings
end
end
end

function __fundle_init -d "initialize fundle"
set -l fundle_dir (__fundle_plugins_dir)

if test (count $__fundle_plugin_names) -eq 0
__fundle_show_doc_msg "No plugin registered. You need to call 'fundle plugin NAME' before using 'fundle init'. \

Try reloading your shell if you just edited your configuration."
return 1
end

set -l profile 0
if begin; contains -- -p $argv; or contains -- --profile $argv; and __fundle_check_date; end
set profile 1
end

for name_path in $__fundle_plugin_name_paths
set -l name_path (string split : -- $name_path)
if test "$profile" -eq 1
set -l start_time (__fundle_date +%s%N)
__fundle_load_plugin $name_path[1] $name_path[2] $fundle_dir $profile
set -l ellapsed_time (math \((__fundle_date +%s%N) - $start_time\) / 1000)
echo "$name_path[1]": {$ellapsed_time}us
else
__fundle_load_plugin $name_path[1] $name_path[2] $fundle_dir $profile
end
end

__fundle_bind
end

function __fundle_install -d "install plugin"
if test (count $__fundle_plugin_names) -eq 0
__fundle_show_doc_msg "No plugin registered. You need to call 'fundle plugin NAME' before using 'fundle install'"
end

for i in (__fundle_seq (count $__fundle_plugin_names))
__fundle_install_plugin $__fundle_plugin_names[$i] $__fundle_plugin_urls[$i] $argv
end

set -l original_plugins_count (count (__fundle_list -s))
__fundle_init

# if plugins count increase after init, new plugins have dependencies
# install new plugins dependencies if any
if test (count (__fundle_list -s)) -gt $original_plugins_count
__fundle_install $argv
end
end

function __fundle_clean -d "cleans fundle directory"
set -l fundle_dir (__fundle_plugins_dir)
set -l used_plugins (__fundle_list -s)
set -l installed_plugins $fundle_dir/*/*/
for installed_plugin in $installed_plugins
set -l plugin (string trim --chars="/" \
(string replace -r -- "$fundle_dir" "" $installed_plugin))
if not contains $plugin $used_plugins
echo "Removing $plugin"
rm -rf $fundle_dir/$plugin
end
end
end

function __fundle_plugin -d "add plugin to fundle" -a name
set -l plugin_url ""
set -l plugin_path "."
set -l argv_count (count $argv)
set -l skip_next true
if test $argv_count -eq 0 -o -z "$argv"
echo "usage: fundle plugin NAME [[--url] URL] [--path PATH]"
return 1
else if test $argv_count -gt 1
for i in (__fundle_seq (count $argv))
test $skip_next = true; and set skip_next false; and continue
set -l arg $argv[$i]
switch $arg
case '--url'
set plugin_url (__fundle_next_arg $i $argv)
test $status -eq 1; and echo $plugin_url; and return 1
set skip_next true
case '--path'
set plugin_path (__fundle_next_arg $i $argv)
test $status -eq 1; and echo $plugin_path; and return 1
set skip_next true
case '--*'
echo "unknown flag $arg"; and return 1
case '*'
test $i -ne 2; and echo "invalid argument $arg"; and return 1
set plugin_url $arg
end
end
end
test -z "$plugin_url"; and set plugin_url (__fundle_get_url $name)

if not contains $name $__fundle_plugin_names
set -g __fundle_plugin_names $__fundle_plugin_names $name
set -g __fundle_plugin_urls $__fundle_plugin_urls $plugin_url
set -g __fundle_plugin_name_paths $__fundle_plugin_name_paths $name:$plugin_path
end
end

function __fundle_version -d "prints fundle version"
echo $__fundle_current_version
end

function __fundle_print_help -d "prints fundle help"
echo "usage: fundle (init | plugin | list | install | update | clean | self-update | version | help)"
end

function __fundle_list -d "list registered plugins"
if begin; contains -- -s $argv; or contains -- --short $argv; end
for name in $__fundle_plugin_names
echo $name
end
else
for i in (__fundle_seq (count $__fundle_plugin_names))
echo {$__fundle_plugin_names[$i]}\n\t{$__fundle_plugin_urls[$i]}
end
end
end

function fundle -d "run fundle"
if __fundle_no_git
return 1
end

set -l sub_args ""

switch (count $argv)
case 0
__fundle_print_help
return 1
case 1
case '*'
set sub_args $argv[2..-1]
end

switch $argv[1]
case "init"
__fundle_init $sub_args
case "plugin"
__fundle_plugin $sub_args
case "list"
__fundle_list $sub_args
case "plugins"
echo "'fundle plugins' has been replaced by 'fundle list'"
case "install"
__fundle_install $sub_args
case "update"
__fundle_update $sub_args
case "clean"
__fundle_clean
case "self-update"
__fundle_self_update
case "version" -v --version
__fundle_version
case "help" -h --help
__fundle_print_help
return 0
case "*"
__fundle_print_help
return 1
end
end

+ 1
- 0
conf_common/.config/fish/plugins/brgmnn/fish-docker-compose

@@ -0,0 +1 @@
Subproject commit 44a9a5ad593f05ac77e4c5024cfe4a8c55db31e3

+ 1
- 0
conf_common/.config/fish/plugins/fisherman/done

@@ -0,0 +1 @@
Subproject commit f7886fdc26cd849ddf21fb05d516548914dd060a

+ 1
- 0
conf_common/.config/fish/plugins/fisherman/getopts

@@ -0,0 +1 @@
Subproject commit 4b74206725c3e11d739675dc2bb84c77d893e901

+ 1
- 0
conf_common/.config/fish/plugins/fishpkg/fish-humanize-duration

@@ -0,0 +1 @@
Subproject commit 53b2adb4c6aff0da569c931a3cc006efcd0e7219

+ 1
- 0
conf_common/.config/fish/plugins/jethrokuan/fzf

@@ -0,0 +1 @@
Subproject commit 8ee7cf502637a9dd7d0cd96ead67c631a25e49d9

+ 1
- 0
conf_common/.config/fish/plugins/jethrokuan/z

@@ -0,0 +1 @@
Subproject commit e0e1b9dfdba362f8ab1ae8c1afc7ccf62b89f7eb

+ 14
- 0
fish-plugin-install View File

@@ -0,0 +1,14 @@
#!/usr/bin/env bash

set -e

if test $# -ne 1; then
echo "please provide a <repo>" >&2
exit 1
fi

repo="$1"
name="$(grep -Po '[^\/]+\/[^\/]+$' <<<"$repo")"
path="conf_common/.config/fish/plugins/$name"

git submodule add -f "$repo" "$path"

+ 20
- 0
fish-plugin-uninstall View File

@@ -0,0 +1,20 @@
#!/usr/bin/env bash

set -e

if test $# -ne 1; then
echo "please provide a <repo>" >&2
exit 1
fi

name="$1"
paths=(conf_common/.config/fish/plugins/"$name")
path="${paths[0]}"

if test ! -d "$path"; then
echo "plugin $name not found" >&2
exit 1
fi

git submodule deinit -f "$path"
git rm -f "$path"

+ 0
- 7
install-phone-all View File

@@ -13,7 +13,6 @@ fi
conf_dots_dir="$HOME/projects/dotfiles"
conf_priv_key="$1"

mkdir -p "$HOME/.config/fish/functions/" >/dev/null 2>&1
mkdir -p "$HOME/projects/dotfiles/" >/dev/null 2>&1

function once() {
@@ -40,12 +39,6 @@ function setup-priv-key() {
rm "$conf_priv_key"
}

function setup-shell() {
wget 'https://git.io/fundle' -O "$HOME/.config/fish/functions/fundle.fish"
fish -ic "fundle install"
chsh -s fish
}

function setup-dots() {
git clone --recurse-submodules "https://github.com/sentriz/dotfiles.git" "$conf_dots_dir"
cd "$conf_dots_dir"


+ 4
- 4
readme.md View File

@@ -1,7 +1,7 @@
**basic stuff**
```shell
$ install git stow
$ git clone https://github.com/sentriz/dotfiles.git ~/dotfiles
$ git clone --recurse-submodules https://github.com/sentriz/dotfiles.git ~/dotfiles
$ cd ~/dotfiles
$ ./install-common # always
$ ./install-extra # if gui system
@@ -18,14 +18,14 @@ $ find hooks/ -type f -exec ln -sf '../../{}' .git/hooks/ \;
```shell
$ rm ~/.bash* ~/.profile ~/whateverelse
$ chsh -s $(which fish)
$ wget https://git.io/fundle -O ~/.config/fish/functions/fundle.fish
$ fundle install
$ # plugins are loaded from git submodules automatically
```

**neovim stuff**
```shell
$ python3.x -m pip install --user pynvim
$ git submodule update --init # get vim plugins
$ vim
$ # plugins are loaded from git submodules automatically
```

**python stuff**


+ 1
- 1
vim-plugin-uninstall View File

@@ -8,7 +8,7 @@ if test $# -ne 1; then
fi

name="$1"
paths=(conf_common/.local/share/nvim/site/pack/*/opt/"$1")
paths=(conf_common/.local/share/nvim/site/pack/*/opt/"$name")
path="${paths[0]}"

if test ! -d "$path"; then


Loading…
Cancel
Save