Browse Source

[fish] Remove files that shouldn't be tracked

Colin Powell 3 years ago
parent
commit
fa759f03d3

+ 0 - 34
fish/.config/fish/conf.d/.gitnow

@@ -1,34 +0,0 @@
-[ keybindings ]
-
-# Alt + S
-state = \es
-
-# Alt + E
-stage = \ee
-
-# Ctrl + E
-unstage = \ce
-
-# Alt + M
-show = \em
-
-# Alt + C
-commit-all = \ec
-
-# Alt + D
-pull = \ed
-
-# Alt + P
-push = \ep
-
-# Alt + U
-upstream = \eu
-
-# Alt + L
-logs = \el
-
-# Alt + F
-feature = \ef
-
-# Alt + H
-hotfix = \eh

+ 0 - 8
fish/.config/fish/conf.d/direnv.fish

@@ -1,8 +0,0 @@
-if type -q direnv
-  function __direnv_export_eval --on-variable PWD
-    status --is-command-substitution; and return
-    eval (direnv export fish)
-  end
-else
-  echo "Install direnv first! Check http://direnv.net" 2>&1
-end

+ 0 - 1
fish/.config/fish/conf.d/fish-gpg-tty_init.fish

@@ -1 +0,0 @@
-export GPG_TTY=(tty) 

+ 0 - 63
fish/.config/fish/conf.d/fzf.fish

@@ -1,63 +0,0 @@
-set -q FZF_TMUX_HEIGHT; or set -U FZF_TMUX_HEIGHT "40%"
-set -q FZF_DEFAULT_OPTS; or set -U FZF_DEFAULT_OPTS "--height $FZF_TMUX_HEIGHT"
-set -q FZF_LEGACY_KEYBINDINGS; or set -U FZF_LEGACY_KEYBINDINGS 1
-set -q FZF_DISABLE_KEYBINDINGS; or set -U FZF_DISABLE_KEYBINDINGS 0
-set -q FZF_PREVIEW_FILE_CMD; or set -U FZF_PREVIEW_FILE_CMD "head -n 10"
-set -q FZF_PREVIEW_DIR_CMD; or set -U FZF_PREVIEW_DIR_CMD "ls"
-
-if test "$FZF_DISABLE_KEYBINDINGS" -ne 1
-    if test "$FZF_LEGACY_KEYBINDINGS" -eq 1
-        bind \ct '__fzf_find_file'
-        bind \cr '__fzf_reverse_isearch'
-        bind \ec '__fzf_cd'
-        bind \eC '__fzf_cd --hidden'
-        bind \cg '__fzf_open'
-        bind \co '__fzf_open --editor'
-
-        if ! test "$fish_key_bindings" = fish_default_key_bindings
-            bind -M insert \ct '__fzf_find_file'
-            bind -M insert \cr '__fzf_reverse_isearch'
-            bind -M insert \ec '__fzf_cd'
-            bind -M insert \eC '__fzf_cd --hidden'
-            bind -M insert \cg '__fzf_open'
-            bind -M insert \co '__fzf_open --editor'
-        end
-    else
-        bind \co '__fzf_find_file'
-        bind \cr '__fzf_reverse_isearch'
-        bind \ec '__fzf_cd'
-        bind \eC '__fzf_cd --hidden'
-        bind \eO '__fzf_open'
-        bind \eo '__fzf_open --editor'
-
-        if ! test "$fish_key_bindings" = fish_default_key_bindings
-            bind -M insert \co '__fzf_find_file'
-            bind -M insert \cr '__fzf_reverse_isearch'
-            bind -M insert \ec '__fzf_cd'
-            bind -M insert \eC '__fzf_cd --hidden'
-            bind -M insert \eO '__fzf_open'
-            bind -M insert \eo '__fzf_open --editor'
-        end
-    end
-
-    if not bind --user \t >/dev/null 2>/dev/null
-        if set -q FZF_COMPLETE
-            bind \t '__fzf_complete'
-            if ! test "$fish_key_bindings" = fish_default_key_bindings
-                bind -M insert \t '__fzf_complete'
-            end
-        end
-    end
-end
-
-function _fzf_uninstall -e fzf_uninstall
-    bind --user \
-        | string replace --filter --regex -- "bind (.+)( '?__fzf.*)" 'bind -e $1' \
-        | source
-
-    set --names \
-        | string replace --filter --regex '(^FZF)' 'set --erase $1' \
-        | source
-
-    functions --erase _fzf_uninstall
-end

+ 0 - 711
fish/.config/fish/conf.d/gitnow.fish

@@ -1,711 +0,0 @@
-# GitNow — Speed up your Git workflow. 🐠
-# https://github.com/joseluisq/gitnow
-
-function __gitnow_install -e gitnow_install
-    echo (gitnow -v)" is installed and ready to use!"
-    echo "Just run the `gitnow` command if you want explore the API."
-end
-
-function __gitnow_uninstall -e gitnow_uninstall
-    echo "GitNow was uninstalled successfully."
-end
-
-function gitnow -d "Gitnow: Speed up your Git workflow. 🐠" -a xversion
-    if [ "$xversion" = "-v" ]; or [ "$xversion" = "--version" ]
-        echo "GitNow version $gitnow_version"
-    else
-        __gitnow_manual | command less -r
-        commandline -f repaint
-    end
-end
-
-function state -d "Gitnow: Show the working tree status in compact way"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "state"
-        return
-    end
-
-    command git status -sb
-    commandline -f repaint
-end
-
-function stage -d "Gitnow: Stage files in current working directory"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "stage"
-        return
-    end
-
-    set -l len (count $argv)
-    set -l opts .
-
-    if test $len -gt 0
-        set opts $argv
-    end
-
-    command git add $opts
-    commandline -f repaint
-end
-
-function unstage -d "Gitnow: Unstage files in current working directory"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "unstage"
-        return
-    end
-
-    set -l len (count $argv)
-    set -l opts .
-
-    if test $len -gt 0
-        set opts $argv
-    end
-
-    command git reset $opts
-    commandline -f repaint
-end
-
-function show -d "Gitnow: Show commit detail objects"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "show"
-        return
-    end
-
-    set -l len (count $argv)
-
-    if test $len -gt 0
-        command git show $argv
-    else
-        command git show --compact-summary --patch HEAD
-    end
-
-    commandline -f repaint
-end
-
-function untracked -d "Gitnow: Check for untracked files and directories on current working directory"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "untracked"
-        return
-    end
-
-    command git clean --dry-run -d
-
-    commandline -f repaint
-end
-
-function commit -d "Gitnow: Commit changes to the repository"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "commit"
-        return
-    end
-
-    set -l len (count $argv)
-
-    if test $len -gt 0
-        command git commit $argv
-    else
-        command git commit
-    end
-
-    commandline -f repaint
-end
-
-function commit-all -d "Gitnow: Add and commit all changes to the repository"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "commit-all"
-        return
-    end
-
-    stage
-    commit .
-end
-
-function pull -d "Gitnow: Pull changes from remote server but stashing uncommitted changes"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "pull"
-        return
-    end
-
-    set -l len (count $argv)
-    set -l xorigin (__gitnow_current_remote)
-    set -l xbranch (__gitnow_current_branch_name)
-    set -l xcmd ""
-
-    echo "⚡️ Pulling changes..."
-
-    set -l xdefaults --rebase --autostash --tags
-
-    if test $len -gt 2
-        set xcmd $argv
-
-        echo "Mode: Manual"
-        echo "Default flags: $xdefaults"
-        echo
-    else
-        echo "Mode: Auto"
-        echo "Default flags: $xdefaults"
-
-        if test $len -eq 1
-            set xbranch $argv[1]
-        end
-
-        if test $len -eq 2
-            set xorigin $argv[1]
-            set xbranch $argv[2]
-        end
-
-        set xcmd $xorigin $xbranch
-        set -l xremote_url (command git config --get "remote.$xorigin.url")
-
-        echo "Remote URL: $xorigin ($xremote_url)"
-        echo "Remote branch: $xbranch"
-        echo
-    end
-
-    command git pull $xcmd $xdefaults
-    commandline -f repaint
-end
-
-# Git push with --set-upstream
-# Shortcut inspired from https://github.com/jamiew/git-friendly
-function push -d "Gitnow: Push commit changes to remote repository"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "push"
-        return
-    end
-
-    set -l opts $argv
-    set -l xorigin (__gitnow_current_remote)
-    set -l xbranch (__gitnow_current_branch_name)
-
-
-    if test (count $opts) -eq 0
-        set opts $xorigin $xbranch
-        set -l xremote_url (command git config --get "remote.$xorigin.url")
-
-        echo "🚀 Pushing changes..."
-        echo "Mode: Auto"
-        echo "Remote URL: $xorigin ($xremote_url)"
-        echo "Remote branch: $xbranch"
-    else
-        set -l v_mode "auto"
-
-        for v in $argv
-            switch $v
-                case -t --tags
-                    set opts $xorigin $xbranch --follow-tags
-                    set -l xremote_url (command git config --get "remote.$xorigin.url")
-
-                    echo "🚀 Pushing changes..."
-                    echo "Mode: Auto (incl. tags)"
-                    echo "Remote URL: $xorigin ($xremote_url)"
-                    echo "Remote branch: $xbranch"
-                case -h --help
-                    echo "NAME"
-                    echo "      Gitnow: push - Push current branch to default origin"
-                    echo "OPTIONS:"
-                    echo "      -t --tags               (auto mode) include annotated tags that relate to the commits"
-                    echo "      -h --help               Show information about the options for this command"
-                    return
-                case -\*
-                case '*'
-                    set -l v_mode "manual"
-                    echo "Mode: Manual"
-            end
-        end
-    end
-
-    echo
-
-    command git push --set-upstream $opts
-    commandline -f repaint
-end
-
-function upstream -d "Gitnow: Commit all changes and push them to remote server"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "upstream"
-        return
-    end
-
-    commit-all
-    push
-end
-
-function feature -d "GitNow: Creates a new Gitflow feature branch from current branch" -a xbranch
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "feature"
-        return
-    end
-
-    __gitnow_gitflow_branch "feature" $xbranch
-    commandline -f repaint
-end
-
-function hotfix -d "GitNow: Creates a new Gitflow hotfix branch from current branch" -a xbranch
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "hotfix"
-        return
-    end
-
-    __gitnow_gitflow_branch "hotfix" $xbranch
-    commandline -f repaint
-end
-
-function bugfix -d "GitNow: Creates a new Gitflow bugfix branch from current branch" -a xbranch
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "bugfix"
-        return
-    end
-
-    __gitnow_gitflow_branch "bugfix" $xbranch
-    commandline -f repaint
-end
-
-function release -d "GitNow: Creates a new Gitflow release branch from current branch" -a xbranch
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "release"
-        return
-    end
-
-    __gitnow_gitflow_branch "release" $xbranch
-    commandline -f repaint
-end
-
-function merge -d "GitNow: Merges given branch into the active one"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "merge"
-        return
-    end
-
-    set -l len (count $argv)
-    if test $len -eq 0
-        echo "Merge: No argument given, needs one parameter"
-        return
-    end
-
-    set -l v_abort
-    set -l v_continue
-    set -l v_branch
-
-    for v in $argv
-        switch $v
-            case -a --abort
-                set v_abort $v
-            case -c --continue
-                set v_continue $v
-            case -h --help
-                echo "NAME"
-                echo "      Gitnow: merge - Merge given branch into the active one"
-                echo "EXAMPLES"
-                echo "      merge <branch to merge>"
-                echo "OPTIONS:"
-                echo "      -a --abort              Abort a conflicted merge"
-                echo "      -c --continue           Continue a conflicted merge"
-                echo "      -h --help               Show information about the options for this command"
-                return
-            case -\*
-            case '*'
-                set v_branch $v
-        end
-    end
-
-    # abort
-    if test "$v_abort";
-        echo "Abort the current merge"
-        command git merge --abort
-        commandline -f repaint
-        return
-    end
-
-    # continue
-    if test "$v_continue";
-        echo "Continue the current merge"
-        command git merge --continue
-        commandline -f repaint
-        return
-    end
-
-    # No branch defined
-    if not test -n "$v_branch"
-        echo "Provide a valid branch name to merge."
-        commandline -f repaint
-        return
-    end
-
-    set -l v_found (__gitnow_check_if_branch_exist $v_branch)
-
-    # Branch was not found
-    if test $v_found -eq 0;
-        echo "Local branch `$v_branch` was not found. Not possible to merge."
-
-        commandline -f repaint
-        return
-    end
-
-    # Detect merging current branch
-    if [ "$v_branch" = (__gitnow_current_branch_name) ]
-        echo "Branch `$v_branch` is the same as current branch. Nothing to do."
-        commandline -f repaint
-        return
-    end
-
-    command git merge $v_branch
-    commandline -f repaint
-end
-
-function move -d "GitNow: Switch from current branch to another but stashing uncommitted changes"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "move"
-        return
-    end
-
-    set -l v_upstream
-    set -l v_no_apply_stash
-    set -l v_branch
-
-    for v in $argv
-        switch $v
-            case -u --upstream
-                set v_upstream $v
-            case -n --no-apply-stash
-                set v_no_apply_stash $v
-            case -nu -un
-                set v_upstream "-u"
-                set v_no_apply_stash "-n"
-            case -h --help
-                echo "NAME"
-                echo "      Gitnow: move - Switch from current branch to another but stashing uncommitted changes"
-                echo "EXAMPLES"
-                echo "      move <branch to switch to>"
-                echo "OPTIONS:"
-                echo "      -n --no-apply-stash     Switch to a local branch but without applying current stash"
-                echo "      -u --upstream           Fetch a remote branch and switch to it applying current stash. It can be combined with --no-apply-stash"
-                echo "      -h --help               Show information about the options for this command"
-                return
-            case -\*
-            case '*'
-                set v_branch $v
-        end
-    end
-
-    # No branch defined
-    if not test -n "$v_branch"
-        echo "Provide a valid branch name to switch to."
-
-        commandline -f repaint
-        return
-    end
-
-    set -l v_fetched 0
-
-    # Fetch branch from remote
-    if test -n "$v_upstream"
-        set -l v_remote (__gitnow_current_remote)
-        command git fetch $v_remote $v_branch:refs/remotes/$v_remote/$v_branch
-        command git checkout --track $v_remote/$v_branch
-        commandline -f repaint
-        return
-    end
-
-    set -l v_found (__gitnow_check_if_branch_exist $v_branch)
-
-    # Branch was not found
-    if begin test $v_found -eq 0; and test $v_fetched -eq 0; end
-        echo "Branch `$v_branch` was not found locally. No possible to switch."
-        echo "Tip: Use -u (--upstream) flag to fetch a remote branch."
-
-        commandline -f repaint
-        return
-    end
-
-    # Prevent same branch switching
-    if [ "$v_branch" = (__gitnow_current_branch_name) ]
-        echo "Branch `$v_branch` is the same as current branch. Nothing to do."
-        commandline -f repaint
-        return
-    end
-
-    set -l v_uncommited (__gitnow_has_uncommited_changes)
-
-    # Stash changes before checkout for uncommited changes only
-    if test $v_uncommited
-        command git stash
-    end
-
-    command git checkout $v_branch
-
-    # --no-apply-stash
-    if test -n "$v_no_apply_stash"
-        echo "Stashed changes were not applied. Use `git stash pop` to apply them."
-    end
-
-    if begin test $v_uncommited; and not test -n "$v_no_apply_stash"; end
-        command git stash pop
-        echo "Stashed changes applied."
-    end
-
-    commandline -f repaint
-end
-
-function logs -d "Gitnow: Shows logs in a fancy way"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "logs"
-        return
-    end
-
-    set -l v_max_commits "80"
-    set -l v_args
-
-    for v in $argv
-        switch $v
-            case -h --help
-                echo "NAME"
-                echo "      Gitnow: logs - Show logs in a fancy way (first $v_max_commits commits by default)"
-                echo "EXAMPLES"
-                echo "      logs [git log options]"
-                echo "EXTRA OPTIONS:"
-                echo "      -h, --help      Show information about the options for this command"
-                return
-            case -\*
-            case '*'
-                set v_args $argv
-                break
-        end
-    end
-
-    if test -n "$v_args"
-        set v_max_commits
-    else
-        set v_max_commits "-$v_max_commits"
-    end
-
-    LC_ALL=C command git log $v_max_commits $v_args --color --graph \
-        --pretty=format:"%C(red)%h%C(reset)%C(yellow)%d%Creset %s %C(green italic)(%cr)%C(reset) %C(blue)%an%C(reset) %C(white dim)%GK %C(reset)" --abbrev-commit \
-        | command less -R
-end
-
-function tag -d "Gitnow: Tag commits following Semver"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "tag"
-        return
-    end
-
-    set -l v_major
-    set -l v_minor
-    set -l v_patch
-    set -l v_premajor
-    set -l v_preminor
-    set -l v_prepatch
-
-    set -l opts
-
-    # NOTE: this function only gets the latest *Semver release version* but no suffixed ones or others
-    set -l v_latest (__gitnow_get_latest_semver_release_tag)
-
-    for v in $argv
-        switch $v
-            case -x --major
-                set v_major $v
-            case -y --minor
-                set v_minor $v
-            case -z --patch
-                set v_patch $v
-            case -a --annotate
-                set opts $opts $v
-
-            # TODO: pre-release versions are not supported yet
-            # case -a --premajor
-            #     set v_premajor $v
-            # case -b --preminor
-            #     set v_preminor $v
-            # case -c --prepatch
-            #     set v_prepatch $v
-
-            case -l --latest
-                if not test -n "$v_latest"
-                    echo "There is no any tag created yet."
-                else
-                    echo $v_latest
-                end
-
-                return
-            case -h --help
-                echo "NAME"
-                echo "      Gitnow: tag - List or tag commits following The Semantic Versioning 2.0.0 (Semver) [1]"
-                echo "      [1] https://semver.org/"
-                echo "EXAMPLES"
-                echo "      List tags: tag"
-                echo "      Custom tag: tag <my tag name>"
-                echo "      Semver tag: tag --major"
-                echo "OPTIONS:"
-                echo "      Without options all tags are listed in a lexicographic order and tag names are treated as versions"
-                echo "      -x --major         Tag auto-incrementing a major version number"
-                echo "      -y --minor         Tag auto-incrementing a minor version number"
-                echo "      -z --patch         Tag auto-incrementing a patch version number"
-                echo "      -l --latest        Show only the latest Semver release tag version (no suffixed ones or others)"
-                echo "      -a --annotate      Create as annotated tag"
-                echo "      -h --help          Show information about the options for this command"
-
-                # TODO: pre-release versions are not supported yet
-                # echo "      -a --premajor      Tag auto-incrementing a premajor version number"
-                # echo "      -b --preminor      Tag auto-incrementing a preminor version number"
-                # echo "      -c --prepatch      Tag auto-incrementing a prepatch version number"
-
-                return
-            case -\*
-            case '*'
-                return
-        end
-    end
-
-    # List all tags in a lexicographic order and treating tag names as versions
-    if test -z "$argv"
-        __gitnow_get_tags_ordered
-        return
-    end
-
-    # Major version tags
-    if test -n "$v_major"
-        if not test -n "$v_latest"
-            command git tag $opts v1.0.0
-            echo "First major tag \"v1.0.0\" was created."
-            return
-        else
-            set -l vstr (__gitnow_get_valid_semver_release_value $v_latest)
-
-            # Validate Semver format before to proceed
-            if not test -n "$vstr"
-                echo "The latest tag \"$v_latest\" has no a valid Semver format."
-                return
-            end
-
-            set -l x (echo $vstr | LC_ALL=C command awk -F '.' '{print $1}')
-            set -l prefix (echo $v_latest | LC_ALL=C command awk -F "$vstr" '{print $1}')
-            set x (__gitnow_increment_number $x)
-            set -l xyz "$prefix$x.0.0"
-
-            command git tag $opts $xyz
-            echo "Major tag \"$xyz\" was created."
-            return
-        end
-    end
-
-
-    # Minor version tags
-    if test -n "$v_minor"
-        if not test -n "$v_latest"
-            command git tag $opts v0.1.0
-            echo "First minor tag \"v0.1.0\" was created."
-            return
-        else
-            set -l vstr (__gitnow_get_valid_semver_release_value $v_latest)
-
-            # Validate Semver format before to proceed
-            if not test -n "$vstr"
-                echo "The latest tag \"$v_latest\" has no a valid Semver format."
-                return
-            end
-
-            set -l x (echo $vstr | LC_ALL=C command awk -F '.' '{print $1}')
-            set -l y (echo $vstr | LC_ALL=C command awk -F '.' '{print $2}')
-            set -l prefix (echo $v_latest | LC_ALL=C command awk -F "$vstr" '{print $1}')
-            set y (__gitnow_increment_number $y)
-            set -l xyz "$prefix$x.$y.0"
-
-            command git tag $opts $xyz
-            echo "Minor tag \"$xyz\" was created."
-            return
-        end
-    end
-
-
-    # Patch version tags
-    if test -n "$v_patch"
-        if not test -n "$v_latest"
-            command git tag $opts v0.0.1
-            echo "First patch tag \"v0.1.0\" was created."
-            return
-        else
-            set -l vstr (__gitnow_get_valid_semver_release_value $v_latest)
-
-            # Validate Semver format before to proceed
-            if not test -n "$vstr"
-                echo "The latest tag \"$v_latest\" has no a valid Semver format."
-                return
-            end
-
-            set -l x (echo $vstr | LC_ALL=C command awk -F '.' '{print $1}')
-            set -l y (echo $vstr | LC_ALL=C command awk -F '.' '{print $2}')
-            set -l z (echo $vstr | LC_ALL=C command awk -F '.' '{print $3}')
-            set -l s (echo $z | LC_ALL=C command awk -F '-' '{print $1}')
-
-            if __gitnow_is_number $s
-                set -l prefix (echo $v_latest | LC_ALL=C command awk -F "$vstr" '{print $1}')
-                set s (__gitnow_increment_number $s)
-                set -l xyz "$prefix$x.$y.$s"
-
-                command git tag $opts $xyz
-                echo "Patch tag \"$xyz\" was created."
-            else
-                echo "No patch version found."
-            end
-
-            return
-        end
-    end
-
-
-    # TODO: pre-release versions are not supported yet
-    # TODO: Premajor version tags
-    # TODO: Preminor version tags
-    # TODO: Prepatch version tags
-
-
-    commandline -f repaint
-end
-
-function assume -d "Gitnow: Ignore files temporarily"
-    if not __gitnow_is_git_repository
-        __gitnow_msg_not_valid_repository "assume"
-        return
-    end
-
-    set -l v_assume_unchanged "--assume-unchanged"
-    set -l v_files
-
-    for v in $argv
-        switch $v
-            case -n --no-assume
-                set v_assume_unchanged "--no-assume-unchanged"
-            case -h --help
-                echo "NAME"
-                echo "      Gitnow: assume - Ignores changes in certain files temporarily"
-                echo "OPTIONS:"
-                echo "      -n --no-assume  No assume unchanged files to be ignored (revert option)"
-                echo "      -h --help       Show information about the options for this command"
-                return
-            case -\*
-            case '*'
-                set v_files $v_files $v
-        end
-    end
-
-    if test (count $v_files) -lt 1
-        echo "Provide files in order to ignore them temporarily. E.g `assume Cargo.lock`"
-        return
-    end
-
-    command git update-index $v_assume_unchanged $v_files
-end
-
-function github -d "Gitnow: Clone a GitHub repository using SSH"
-    set -l repo (__gitnow_clone_params $argv)
-    __gitnow_clone_repo $repo "github"
-
-    commandline -f repaint
-end
-
-function bitbucket -d "Gitnow: Clone a Bitbucket Cloud repository using SSH"
-    set -l repo (__gitnow_clone_params $argv)
-    __gitnow_clone_repo $repo "bitbucket"
-
-    commandline -f repaint
-end

+ 0 - 32
fish/.config/fish/conf.d/gitnow_config.fish

@@ -1,32 +0,0 @@
-# GitNow — Speed up your Git workflow. 🐠
-# https://github.com/joseluisq/gitnow
-
-set -g gitnow_version 2.8.0
-
-if set -q __fish_config_dir
-    set -g fish_config "$__fish_config_dir"
-else
-    set -q XDG_CONFIG_HOME
-        and set -g fish_config "$XDG_CONFIG_HOME/fish"
-        or set -g fish_config "~/.config/fish"
-end
-
-set -q fish_snippets; or set -g fish_snippets "$fish_config/conf.d"
-set -q fish_functions; or set -g fish_functions "$fish_config/functions"
-set -q fish_completions; or set -g fish_completions "$fish_config/completions"
-set -q GITNOW_CONFIG_FILE; or set -g GITNOW_CONFIG_FILE ~/.gitnow
-
-if functions -q __fundle_plugins_dir
-    set -l fundledir (__fundle_plugins_dir)
-    source "$fundledir/joseluisq/gitnow/functions/__gitnow_functions.fish"
-    source "$fundledir/joseluisq/gitnow/functions/__gitnow_manual.fish"
-    source "$fundledir/joseluisq/gitnow/functions/__gitnow_config_file.fish"
-    source "$fundledir/joseluisq/gitnow/completions/__gitnow_completions.fish"
-else
-    source "$fish_functions/__gitnow_functions.fish"
-    source "$fish_functions/__gitnow_manual.fish"
-    source "$fish_functions/__gitnow_config_file.fish"
-    source "$fish_completions/__gitnow_completions.fish"
-end
-
-__gitnow_read_config

+ 0 - 8
fish/.config/fish/conf.d/plugin-direnv_init.fish

@@ -1,8 +0,0 @@
-if type -q direnv
-  function __direnv_export_eval --on-variable PWD
-    status --is-command-substitution; and return
-    eval (direnv export fish)
-  end
-else
-  echo "Install direnv first! Check http://direnv.net" 2>&1
-end

+ 0 - 4
fish/.config/fish/conf.d/virtualfish-loader.fish

@@ -1,4 +0,0 @@
-set -g VIRTUALFISH_VERSION 2.4.0
-set -g VIRTUALFISH_PYTHON_EXEC /home/powellc/.asdf/installs/python/3.8.5/bin/python3.8
-source /home/powellc/.asdf/installs/python/3.8.5/lib/python3.8/site-packages/virtualfish/virtual.fish
-emit virtualfish_did_setup_plugins

+ 0 - 63
fish/.config/fish/conf.d/z.fish

@@ -1,63 +0,0 @@
-if test -z "$Z_DATA"
-    if test -z "$XDG_DATA_HOME"
-        set -U Z_DATA_DIR "$HOME/.local/share/z"
-    else
-        set -U Z_DATA_DIR "$XDG_DATA_HOME/z"
-    end
-    set -U Z_DATA "$Z_DATA_DIR/data"
-end
-
-if test ! -e "$Z_DATA"
-    if test ! -e "$Z_DATA_DIR"
-        mkdir -p -m 700 "$Z_DATA_DIR"
-    end
-    touch "$Z_DATA"
-end
-
-if test -z "$Z_CMD"
-    set -U Z_CMD z
-end
-
-set -U ZO_CMD "$Z_CMD"o
-
-if test ! -z $Z_CMD
-    function $Z_CMD -d "jump around"
-        __z $argv
-    end
-end
-
-if test ! -z $ZO_CMD
-    function $ZO_CMD -d "open target dir"
-        __z -d $argv
-    end
-end
-
-if not set -q Z_EXCLUDE
-    set -U Z_EXCLUDE "^$HOME\$"
-else if contains $HOME $Z_EXCLUDE
-    # Workaround: migrate old default values to a regex (see #90).
-    set Z_EXCLUDE (string replace -r -- "^$HOME\$" '^'$HOME'$$' $Z_EXCLUDE)
-end
-
-# Setup completions once first
-__z_complete
-
-function __z_on_variable_pwd --on-variable PWD
-    __z_add
-end
-
-function __z_uninstall --on-event z_uninstall
-    functions -e __z_on_variable_pwd
-    functions -e $Z_CMD
-    functions -e $ZO_CMD
-
-    if test ! -z "$Z_DATA"
-        printf "To completely erase z's data, remove:\n" >/dev/stderr
-        printf "%s\n" "$Z_DATA" >/dev/stderr
-    end
-
-    set -e Z_CMD
-    set -e ZO_CMD
-    set -e Z_DATA
-    set -e Z_EXCLUDE
-end

+ 0 - 29
fish/.config/fish/functions/bass.fish

@@ -1,29 +0,0 @@
-function bass
-  set -l bash_args $argv
-  set -l bass_debug
-  if test "$bash_args[1]_" = '-d_'
-    set bass_debug true
-    set -e bash_args[1]
-  end
-
-  set -l script_file (mktemp)
-  if command -v python3 >/dev/null 2>&1
-    command python3 -sS (dirname (status -f))/__bass.py $bash_args 3>$script_file
-  else
-    command python -sS (dirname (status -f))/__bass.py $bash_args 3>$script_file
-  end
-  set -l bass_status $status
-  if test $bass_status -ne 0
-    return $bass_status
-  end
-
-  if test -n "$bass_debug"
-    cat $script_file
-  end
-  source $script_file
-  command rm $script_file
-end
-
-function __bass_usage
-  echo "Usage: bass [-d] <bash-command>"
-end

+ 0 - 8
fish/.config/fish/functions/fish_greeting.fish

@@ -1,8 +0,0 @@
-# Configure greeting with:
-#   -> set -g simple_ass_prompt_greeting MyGreeting
-
-function fish_greeting
-  set -q simple_ass_prompt_greeting; or set -l simple_ass_prompt_greeting 'Where the hell is Science?!'
-
-  echo $simple_ass_prompt_greeting
-end

+ 0 - 119
fish/.config/fish/functions/fish_prompt.fish

@@ -1,119 +0,0 @@
-# Status Chars
-set __fish_git_prompt_char_dirtystate '!'
-set __fish_git_prompt_char_untrackedfiles '☡'
-set __fish_git_prompt_char_stashstate '↩'
-set __fish_git_prompt_char_cleanstate '✓'
-
-# Display the state of the branch when inside of a git repo
-function __simple_ass_prompt_parse_git_branch_state -d "Display the state of the branch"
-  git update-index --really-refresh -q 1> /dev/null
-
-  # Check for changes to be commited
-  if git_is_touched
-    echo -n "$__fish_git_prompt_char_dirtystate"
-  else
-    echo -n "$__fish_git_prompt_char_cleanstate"
-  end
-
-  # Check for untracked files
-  set -l git_untracked (command git ls-files --others --exclude-standard 2> /dev/null)
-  if [ -n "$git_untracked" ]
-    echo -n "$__fish_git_prompt_char_untrackedfiles"
-  end
-
-  # Check for stashed files
-  if git_is_stashed
-    echo -n "$__fish_git_prompt_char_stashstate"
-  end
-
-  # Check if branch is ahead, behind or diverged of remote
-  git_ahead
-end
-
-# Display current git branch
-function __simple_ass_prompt_git -d "Display the actual git branch"
-  set -l ref
-  set -l std_prompt (prompt_pwd)
-  set -l is_dot_git (string match '*/.git' $std_prompt)
-
-  if git_is_repo; and test -z $is_dot_git
-    printf 'on '
-    set_color purple
-
-    set -l git_branch (command git symbolic-ref --quiet --short HEAD 2> /dev/null; or git rev-parse --short HEAD 2> /dev/null; or echo -n '(unknown)')
-
-    printf '%s ' $git_branch
-
-    set state (__simple_ass_prompt_parse_git_branch_state)
-    set_color 0087ff
-    printf '[%s]' $state
-
-    set_color normal
-  end
-end
-
-# Print current user
-function __simple_ass_prompt_get_user -d "Print the user"
-  if test $USER = 'root'
-    set_color red
-  else
-    set_color d75f00
-  end
-  printf '%s' (whoami)
-end
-
-# Get Machines Hostname
-function __simple_ass_prompt_get_host -d "Get Hostname"
-  if test $SSH_TTY
-    tput bold
-    set_color red
-  else
-    set_color af8700
-  end
-  printf '%s' (hostname|cut -d . -f 1)
-end
-
-# Get Project Working Directory
-function __simple_ass_prompt_pwd -d "Get PWD"
-  set_color $fish_color_cwd
-  printf '%s ' (prompt_pwd)
-end
-
-# Simple-ass-prompt
-function fish_prompt
-  set -l code $status
-
-  # Logged in user
-  __simple_ass_prompt_get_user
-  set_color normal
-  printf ' at '
-
-  # Machine logged in to
-  __simple_ass_prompt_get_host
-  set_color normal
-  printf ' in '
-
-  # Path
-  __simple_ass_prompt_pwd
-  set_color normal
-
-  # Git info
-  __simple_ass_prompt_git
-
-  # Line 2
-  echo
-  if test -e "Cargo.toml"
-    printf "(rust:%s) " (set_color red)(rustup show | tail -n 3 | head -n 1 |  cut -d '-' -f 1)(set_color normal)
-  end
-
-  if test $VIRTUAL_ENV
-    printf "(python:%s) " (set_color blue)(basename $VIRTUAL_ENV)(set_color normal)
-  end
-
-  if test $code -eq 127
-    set_color red
-  end
-
-  printf '↪ '
-  set_color normal
-end

+ 0 - 3
fish/.config/fish/functions/fish_right_prompt.fish

@@ -1,3 +0,0 @@
-function fish_right_prompt
-
-end

+ 0 - 4
fish/.config/fish/functions/fish_title.fish

@@ -1,4 +0,0 @@
-function fish_title
-  # Customize the title bar of the terminal window.
-  printf '%s' (prompt_pwd)
-end