diff --git a/.vscode/settings.json b/.vscode/settings.json index 28a2db24..435f7714 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,6 +19,7 @@ "tigrc", "tldr", "tmol", + "Unstowing", "zoxide" ], } diff --git a/Makefile b/Makefile index 64238fa6..5075fcf0 100644 --- a/Makefile +++ b/Makefile @@ -1,32 +1,69 @@ -STOW_PACKAGES := dots git fish nvim config warp vscode +STOW_PACKAGES := dots git fish nvim config local warp vscode +YELLOW := \033[33m +GREEN := \033[32m +WHITE := \033[37m +CLR := \033[0m -.PHONY: all -all: help +.PHONY: default +default: help .PHONY: help help: ## Show this help message (default) @awk 'BEGIN {FS = ":.*?## "}; \ /^[^\t][a-zA-Z0-9_-]+:.*?##/ \ - { printf "\033[36m%-24s\033[0m %s\n", $$1, $$2 } \ - /^##/ { printf "\033[33m%s\033[0m\n", substr($$0, 4) }' $(MAKEFILE_LIST) + { printf "\033[36m%-24s$(CLR) %s\n", $$1, $$2 } \ + /^##/ { printf "$(YELLOW)%s$(CLR)\n", substr($$0, 4) }' $(MAKEFILE_LIST) -.PHONY: stow -stow: ## Symlink all dotfiles managed by Stow +.PHONY: install +install: ## Bootsraps a new machine + @echo "$(YELLOW)Running bootstrap to provision the system...$(CLR)" + @./install.sh + @echo "$(GREEN)System provisioning complete!$(CLR)" + + +.PHONY: run +run: ## Symlink all dotfiles w/Stow @for pkg in $(STOW_PACKAGES); do \ stow $$pkg; \ done @echo "Dotfiles stowed successfully" +.PHONY: stow +stow: ## Add individual packages w/Stow + @if [ -z "${pkg}" ]; then \ + echo "Error: Please specify a package to stow. \n$(YELLOW)ie: $(YELLOW)make stow pkg=$(CLR) \n$(WHITE)Available packages:$(CLR) $(STOW_PACKAGES)"; \ + exit 1; \ + fi + @if [[ ! " ${STOW_PACKAGES} " =~ " ${pkg} " ]]; then \ + echo "Error: Package '${pkg}' not found in STOW_PACKAGES: $(STOW_PACKAGES)"; \ + exit 1; \ + fi + stow ${pkg} + @echo "${pkg} was added" + .PHONY: unstow -unstow: ## Remove all dotfiles managed by Stow +unstow: ## Remove individual packages w/Stow + @if [ -z "${pkg}" ]; then \ + echo "Error: Please specify a package to unstow. \n$(YELLOW)ie: $(YELLOW)make unstow pkg=$(CLR) \n$(WHITE)Available packages:$(CLR) $(STOW_PACKAGES)"; \ + exit 1; \ + fi + @if [[ ! " ${STOW_PACKAGES} " =~ " ${pkg} " ]]; then \ + echo "Error: Package '${pkg}' not found in STOW_PACKAGES: $(STOW_PACKAGES)"; \ + exit 1; \ + fi + stow --delete ${pkg} + @echo "${pkg} was removed" + +.PHONY: delete +delete: ## Delete all dotfiles w/Stow @for pkg in $(STOW_PACKAGES); do \ stow --delete $$pkg; \ done - @echo "Dotfiles zapped! ⚡️" + @echo "$(WHITE)Dotfiles zapped! ⚡️" .PHONY: update -update: ## Update dotfiles & remove broken symlinks managed by Stow +update: ## Sync & clean dead symlinks w/Stow @for pkg in $(STOW_PACKAGES); do \ stow --restow $$pkg; \ done - @echo "Dotfiles updated successfully" + @echo "$(GREEN)Dotfiles updated successfully$(CLR)" diff --git a/README.md b/README.md index 38601056..39fe9578 100755 --- a/README.md +++ b/README.md @@ -1,16 +1,20 @@ -dotfiles logo +dotfiles logo -### [Ed Heltzel's](https://github.com/edheltzel) personal configuration (.dotfiles) for MacOS using Fish shell. +### My personal configuration (.dotfiles) for  macOS using 🐠 Fish shell. -This is my personal configuration (.dotfiles) for macOS that involves web development and devops which are deployed using [GNU Stow](https://www.gnu.org/software/stow/). There are also files for provisioning a new machine and setting up my environment. +This is my personal configuration (.dotfiles) for macOS that involves web development and devops which are deployed using [GNU Stow][STOW]. There are also files for provisioning a new machine and setting up my environment. Zach Holman wrote a nice post about how [dotfiles](https://zachholman.com/2010/08/dotfiles-are-meant-to-be-forked/) should be forked, I agree with this to a point, but I'm more of a fan of take what you like and leave the rest. Because dotfiles are highly personalized and built over time, so what works for me probably won't work for you. But take inspiration all you want and make it your own. _**So proceed with caution, and use at your own risk**_. -## So what's next? +## Get Started -Zach Holman wrote a great article about [dotfiles](https://zachholman.com/2010/08/dotfiles-are-meant-to-be-forked/) and how they are meant to be forked. I agree with this to a point... I'm more of a fan of the idea that you should take what you like and leave the rest, since dotfiles are highly personalized, and built over time so what works for me probably wont't work for you, but take inspiration all you want and make it your own. - -Again, this is My personal setup – _**So proceed with caution, and use at your own risk**_. +
+ Single Line Install + I have not tested this on a fresh install, so this could break your setup. I'd suggest you read through the `bootstrap.sh` and `install.sh` scripts and the `Makefile` before running this command. -## ⚙️ Usage and the Install + In theory this will clone the repository and install everything outlined below. Again, In theory. + ```shell + bash -c "`curl -fsSL https://raw.githubusercontent.com/edheltzel/dotfiles/master/bootstrap.sh`" + ``` +
Caveats for non-Apple Silicon (Intel) @@ -38,158 +42,192 @@ Again, this is My personal setup – _**So proceed with caution, and use at your 7. `csrutil status` -> should read `System Integrity Protection status: disabled.`
+### 👋 For future, Ed: -### SSH Keys -I use [ssh keys](https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/) to authenticate with GitHub and other services. You generally want to create new keys for each device you use, but you can also use the same key on multiple devices. **I have started using two different keys for my multi-machine work flow.** One key is for my personal devices and the other is for my work devices. This allows me to easily revoke access to my work devices if I discontinue a relationship with a company or customer, and not have to worry about my personal keys being compromised or having to change them. +Since we have a bad habit of forgetting things: -If you look at the `.gitconfig` you'll see the use of an include `path = ~/.gitconfig.local` this file is created during the provisioning process and is populated with the correct configuration based on the hostname. +1. Installing Xcode Command Line Tools `sudo softwardupdate -i -a && xcode-select --install` + - This will install `git` and `make` if not already installed. +2. Generate a new SSH key for GitHub + - [Generate a new ssh keys][GENSSHKEY] or restore existing key if needed. +3. Clone this repository `git clone https://github.com/edheltzel/dotfiles.git ~/.dotfiles` +4. Use the [`Makefile`](makefile) to install the dotfiles and packages + - `cd ~/.dotfiles` + - `make install` + - Alternatively, you can run the `install.sh` script `cd ~/.dotfiles && ./install.sh` -1. [Generate a new ssh keys](https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/) and add to your GitHub account. - _Optional_ - - If you want to restore your key I'd do that before moving on. +## What's Inside -2. Clone this repository +### GNU Stow -``` -git clone git@github.com:edheltzel/dotfiles.git -``` +Originally I used a series of custom scripts to create symlinks, it worked but I've since switched to using [GNU Stow][STOW]. This is way more manageable and easier to understand. + +### Makefile -3. Run the `bootstrap.sh` script - 1. Alternatively, only run the `setup.sh` scripts in specific subfolder if you don't need everything - You must start with the `./packages/.setup.sh` script first. This will prevent any installation errors. -4. Install [Fisher](https://github.com/jorgebucaran/fisher) and Plugins -- _Optional_ +So with the addition of Stow, I added a `makefile` – I treat this like NPM scripts. You need to be in the root of `~/.dotfiles` to execute any of the `make` commands. -```bash -curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher -fisher +The following commands are available: + +```shell +help Show this help message (default) +install Bootstraps a new machine +run Symlink all dotfiles w/Stow +stow Add individual packages w/Stow +unstow Remove individual packages w/Stow +delete Delete all dotfiles w/Stow +update Sync & clean dead symlinks w/Stow ``` -#### Commit and Tag Signing +#### Bootstrapping -##### SSH Signing +- `make install` task, it will execute the `bootstrap.sh` script. This script will install the necessary package managers, packages with dependencies, applications, clone the necessary repositories, configure the `~/.gitconfig.local` and symlink dotfiles using Stow. -I use SSH commit signing over GPG. GPG is there if I need it, but I prefer SSH. For a few resources to help get this setup: +#### Stowing and Unstowing -- [Git Merge Workshop - Simplify Signing with SSH](https://github.com/git-merge-workshops/simplify-signing-with-ssh/tree/main) -- [Gitlab SSH Commit Signing Doc](https://docs.gitlab.com/ee/user/project/repository/ssh_signed_commits/) +There are two options for managing packages with Stow: -The `.gitconfig` includes `.gitconfig.local` +1. Just use Stow: `stow nvim` or `stow -D nvim` _(unstow)_ +2. Use the Makefile: `make stow pkg=nvim` or `make unstow pkg=nvim` + - The `pkg=` variable must be specified. -```shell - [meta] - isLocalConfig = true - [user] - signingkey = PATH_TO_YOUR_KEY - [gpg "ssh"] - allowedSignersFile = PATH_TO_YOUR_ALLOWED_SIGNERS_FILE -``` -If you choose to use this make sure you look at that `./git/git.sh`, this script is where the provisioning of `.gitconfig.local` happens. +## Stow Packages -
- GPG Commit Signing - optional +- dots (dots/) + - misc dotfiles that are stored in the $HOME directory +- git (git/) + - git configuration +- fish (fish/) + - XDG Base Directory – Reference: [XDG Base Directory][XDGRef] for more information. To edit/set the XDG Base Directory variables, you can edit the `~/fish/.config/fish/conf.d/paths.fish` file. Hopefully, this will keep the `$HOME` directory clean and organized. +- nvim (nvim/) + - When I need Vim, I use [LazyVim](https://www.lazyvim.org/) - lightly customized. +- config (config/) + - Configuration files for various applications +- local (local/) + - User specific data not configuration related. ie: dictionaries, wallpapers, misc items that mean nothing, etc. +- warp (warp/) + - I like Warp but I really like iTerm2 +- vscode (vscode/) + - I use the [ sync settings ][vscodeSyncSettings] feature in vscode to keep my settings and extensions in sync across platforms. The `settings.json` and `keybindings.json` are symlinked out of habit. - GPG signing is set to `TRUE` by default. If you rather not enable GPG then execute: `git config --global commit.gpgsign false` and remove the GPG packages from the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile). +## Scripts - [renew expired gpg](https://gist.github.com/krisleech/760213ed287ea9da85521c7c9aac1df0) +Any of the scripts can be run individually at any time to update/reset as needed. - [Generate new key and assign to global git config](https://gist.github.com/paolocarrasco/18ca8fe6e63490ae1be23e84a7039374#:~:text=It%20means%20that%20is%20not,secret%20keys%20available%20in%20GPG.) +### macOS (macos/) - main take away: +`macos.sh` - Executes a long list of commands pertaining to macOS Preferences – **DO NOT** blindly run this script - it is a WIP with each macOS update things change. - - `gpg --list-secret-keys --keyid-format=long` - - Copy key - - set key for your git user - - `git config --global user.signingkey ` - - If you need help setting this up GPG: - - follow the Github article for [Signing Commits](https://help.github.com/en/articles/signing-commits) to set up you GPG key(s). - - I found this [GIST helpful](https://gist.github.com/cezaraugusto/2c91d141ddec026753051ffcace3f1f2) - - To get VSCode setup follow this [article](https://dev.to/devmount/signed-git-commits-in-vs-code-36do) - - **Please Note** if you used the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile), Cask installed the macOS [GPG Suite](https://gpgtools.org/) via `cask 'gpg-suite-no-mail'` -- _(alternatively)_ update the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile) with `cask 'gpg-suite' to include GPGMail. +### packages (packages/) -
+- `packages.sh` - Installs the Brewfile and each package manager's packages based on the `.txt` files. +### repositories (repos/) -### GNU Stow +- `repos.sh` - Clones the repositories in the `` files at the corresponding locations -Originally I used a series of custom scripts to create symlinks, it worked but I've since switched to using [GNU Stow](https://www.gnu.org/software/stow/). I feel like everything is way more manageable and easier to understand – I previously would have to review each script to make sure I wasn't going to break my system. +### private (private/) -### Makefile +- `private.sh` - Left empty on purpose -So with the addition of Stow, I've added a makefile to help with the process of managing each Stow package. +### duti (duti/) -The following commands are available: +- `duti.sh` - Sets the default applications for file types + - run `./duti/duti.sh` to reset the default applications for file types -- `all` - This is the Default, the same as `make stow` -- `stow` - Symlink all dotfiles managed by Stow -- `unstow` - Remove all dotfiles managed by Stow -- `update` - Update all dotfiles and remove broken symlinks managed by Stow +### misc (misc/) +There isn't anything of substance in the `misc/` directory, it's just a place to store files that don't fit anywhere else and I like to keep handy. +### Helper Scripts (scripts/) -### macOS Preferences (macos/) +- `functions.sh` - Contains helper functions for symlinked files and printing progress messages -- setup.sh - Executes a long list of commands pertaining to macOS Preferences - - **I can not stress enough to read this and change this for what works for you.** - - **DO NOT** blindly run this script - it is a WIP with each macOS update things change. +## Troubleshooting +
+ Fish: Fisher Plugin Manager + In the past, Fisher (fish plugin manager) will do something weird or will introduce a breaking change - just reinstall Fisher. -### Misc Dotfiles (misc/) + ```bash + curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher + ``` +
+
+ Node Development + Node Version switching for Node development, takes advantage of [fnm](https://github.com/Schniz/fnm) for managing Node versions, which supports both `.nvmrc` and `.node-version` files. -- setup.sh - Symlinks all the associated rc and other dot files to your `~/` _(home directory)_ -- Special Mentions: - - `.tigrc` - [tig](https://jonas.github.io/tig/) – configured with pretty colors and layout for git diff and logs - - `.eslintrc` - has specific configuration for my JS workflow - - `bat/config` - [bat](https://github.com/sharkdp/bat) – a clone of cat with syntax highlighting - - + - Install happens in the `Brewfile` by running -### Packages (packages/) + ```shell + brew install fnm + ``` -- setup.sh - Installs the contents of the package manager files and the Brewfile + For Completions run: -### Repositories (repos/) + ```shell + fnm completions --shell fish + ``` -- setup.sh - Clones the repositories in the `` files at the corresponding - locations + Make sure you run: -### Vim (nvim/) + ```shell + ./fish/./setup.sh + ``` -I use NeoVim, when I need Vim. The distribution I use is [LazyVim](https://www.lazyvim.org/) + This will symlink the `fnm.fish` file in `~/.config/fish/conf.d` _(It might be helpful to `source ~/.config/fish/config.fish`)_ -- setup.sh - Clone LazyVim to `~/.config/nvim` + **Note:** FNM has the ability to auto switch Node versions if there is a `.node-version` or `.nvmrc` file - this is enabled by default -### Helper Scripts (scripts/) + ```shell + # automatically run fnm use + fnm env --use-on-cd | source + ``` -- functions.sh - Contains helper functions for symlinked files and printing - progress messages -### Node development + > Please note that when you change your default Node version, you will need to run `npm install --global (cat node_packages.txt)` to include `corepack` in the global packages. This will ensure that `pnpm` and `yarn` are available. +
+
+ Git: Commit and Tag Signing -Node Version switching for Node development, takes advantage of [fnm](https://github.com/Schniz/fnm) for managing Node versions, which supports both `.nvmrc` and `.node-version` files. + **SSH Signing** -- Install happens in the `Brewfile` by running + I use SSH commit signing over GPG. GPG is there if I need it, but I prefer SSH. For a few resources to help get this setup: -```shell -brew install fnm -``` + - [Git Merge Workshop - Simplify Signing with SSH](https://github.com/git-merge-workshops/simplify-signing-with-ssh/tree/main) + - [Gitlab SSH Commit Signing Doc](https://docs.gitlab.com/ee/user/project/repository/ssh_signed_commits/) -For Completions run: + The `.gitconfig` includes `.gitconfig.local` -```shell -fnm completions --shell fish -``` + ```shell + [meta] + isLocalConfig = true + [user] + signingkey = PATH_TO_YOUR_KEY + [gpg "ssh"] + allowedSignersFile = PATH_TO_YOUR_ALLOWED_SIGNERS_FILE + ``` + If you choose to use this make sure you look at that `./git/git.sh`, this script is where the provisioning of `.gitconfig.local` happens. +
+ GPG Commit Signing - optional -Make sure you run: + GPG signing is set to `TRUE` by default. If you rather not enable GPG then execute: `git config --global commit.gpgsign false` and remove the GPG packages from the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile). -```shell -./fish/./setup.sh -``` + [renew expired gpg](https://gist.github.com/krisleech/760213ed287ea9da85521c7c9aac1df0) -This will symlink the `fnm.fish` file in `~/.config/fish/conf.d` _(It might be helpful to `source ~/.config/fish/config.fish`)_ + [Generate new key and assign to global git config](https://gist.github.com/paolocarrasco/18ca8fe6e63490ae1be23e84a7039374#:~:text=It%20means%20that%20is%20not,secret%20keys%20available%20in%20GPG.) -**Note:** FNM has the ability to auto switch Node versions if there is a `.node-version` or `.nvmrc` file - this is enabled by default + main take away: -```shell -# automatically run fnm use -fnm env --use-on-cd | source -``` + - `gpg --list-secret-keys --keyid-format=long` + - Copy key + - set key for your git user + - `git config --global user.signingkey ` + - If you need help setting this up GPG: + - follow the Github article for [Signing Commits](https://help.github.com/en/articles/signing-commits) to set up you GPG key(s). + - I found this [GIST helpful](https://gist.github.com/cezaraugusto/2c91d141ddec026753051ffcace3f1f2) + - To get VSCode setup follow this [article](https://dev.to/devmount/signed-git-commits-in-vs-code-36do) + - **Please Note** if you used the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile), Cask installed the macOS [GPG Suite](https://gpgtools.org/) via `cask 'gpg-suite-no-mail'` -- _(alternatively)_ update the [Brewfile](https://github.com/edheltzel/dotfiles/blob/master/packages/Brewfile) with `cask 'gpg-suite' to include GPGMail. -> Please note that when you change your default Node version, you will need to run `npm install --global (cat node_packages.txt)` to include `corepack` in the global packages. This will ensure that `pnpm` and `yarn` are available. +
+
#### 🙏 Special Thanks @@ -199,14 +237,21 @@ Gotta thanks to [kalis.me blog post](https://kalis.me/dotfiles-automating-macos- ## 📝 TODOs -- [ ] create a single line install script to execute bootstrap.sh -- [ ] update install.sh to include duti, packages, repos, and set local git config -- [ ] use makefile to execute bootstrap.sh and install.sh -- [ ] update README - - [ ] include Stow info - - [ ] include Make info - - [ ] include New bootstrap process - - [ ] include New install process (makefile) +- [ ] Look into [Tuckr](https://github.com/RaphGL/Tuckr) +- [x] create a single line install script to execute bootstrap.sh +- [x] use makefile to execute bootstrap.sh and install.sh +- [x] update make unstow to include only the available stow package or all - [x] add customizations to lazyvim - [x] add vscode settings and symlink to dotfiles -- [ ] Look into [Tuckr](https://github.com/RaphGL/Tuckr) +- [x] add XDG Base Directory support +- [x] update README + - [x] include XDG info + - [x] include Stow info + - [x] include Make info + - [x] include New bootstrap process + - [x] include New install process (makefile) + +[XDGRef]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html +[STOW]: https://www.gnu.org/software/stow/ +[GENSSHKEY]: https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent +[vscodeSyncSetting]: https://code.visualstudio.com/docs/editor/settings-sync diff --git a/bootstrap.sh b/bootstrap.sh index f684c820..3ceb020c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,46 +1,47 @@ -#!/bin/bash +#!/usr/bin/env bash -# Define variables -DOTFILES_REPO="https://github.com/edheltzel/dotfiles.git" -PROJECTS_DIR="$HOME/Developer" -DOTFILES_DIR="$HOME/.dotfiles" +# Define the source and target locations +SOURCE="https://github.com/edheltzel/dotfiles" +TARBALL="$SOURCE/tarball/main" +TARGET="$HOME/.dotfiles" +TAR_CMD="tar -xzv -C \"$TARGET\" --strip-components=1 --exclude='{.gitignore}'" -# Define functions for prompts, banners, and errors -print_prompt() { - echo -e "\033[1m$1\033[0m" +# Function to check if a command is executable +is_executable() { + type "$1" > /dev/null 2>&1 } -function print_banner() { - local message="$1" - echo -e "${YELLOW}====================================================${NC}" - echo -e "${YELLOW} NOTE: $message${NC}" - echo -e "${YELLOW}====================================================${NC}" -} - -print_error() { - local message="$1" - echo -e "${YELLOW}====================================================${NC}" - echo -e "${YELLOW} ERROR: $message${NC}" - echo -e "${YELLOW}====================================================${NC}" -} - -## - -# Create the Developer directory if it does not exist -if [ ! -d "$PROJECTS_DIR" ]; then - mkdir "$PROJECTS_DIR" +# Determine the download command based on available tools +if is_executable "git"; then + CMD="git clone $SOURCE $TARGET" +elif is_executable "curl"; then + CMD="curl -#L $TARBALL | $TAR_CMD" +elif is_executable "wget"; then + CMD="wget --no-check-certificate -O - $TARBALL | $TAR_CMD" fi -# Clone the dotfiles repository -if ! git clone $DOTFILES_REPO $DOTFILES_DIR &> /dev/null; then - print_error "Failed to clone dotfiles repository. Please check your internet connection and try again." +# Execute the download command or abort if no tools are available +if [ -z "$CMD" ]; then + echo "No git, curl, or wget available. Aborting." +else + echo "Installing dotfiles..." + mkdir -p "$TARGET" + eval "$CMD" + + # Check if install.sh exists + if [ -f "$TARGET/install.sh" ]; then + # Prompt the user for confirmation before proceeding + read -p "Do you want to continue with the installation? [y/N] " -n 1 -r + echo # Move to a new line + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo "Running install script..." + bash "$TARGET/install.sh" + else + echo "Installation aborted by user." + exit 1 + fi + else + echo "Error: install.sh not found in the dotfiles repository." exit 1 + fi fi - -# Run the installation script in the dotfiles directory -if ! bash $DOTFILES_DIR/install.sh &> /dev/null; then - print_error "Failed to install dotfiles. Please check the installation script and try again." - exit 1 -fi - -print_banner "You should restart your computer at this point for all the changes to take effect." diff --git a/config/.config/gh/config.yml b/config/.config/gh/config.yml index 59fe4de7..2e323485 100644 --- a/config/.config/gh/config.yml +++ b/config/.config/gh/config.yml @@ -12,6 +12,13 @@ pager: # Aliases allow you to create nicknames for gh commands aliases: co: pr checkout + diff: pr diff + merge: pr merge + close: issue close + add: issue create --title + todo: issue create -a @me --title + mine: issue list -a @me + # The path to a unix socket through which send HTTP connections. If blank, HTTP traffic will be handled by net/http.DefaultTransport. http_unix_socket: # What web browser gh should use when opening URLs. If blank, will refer to environment. diff --git a/config/.config/iterm/com.googlecode.iterm2.plist b/config/.config/iterm2/com.googlecode.iterm2.plist similarity index 88% rename from config/.config/iterm/com.googlecode.iterm2.plist rename to config/.config/iterm2/com.googlecode.iterm2.plist index 3dc8eb85..a04479b7 100644 --- a/config/.config/iterm/com.googlecode.iterm2.plist +++ b/config/.config/iterm2/com.googlecode.iterm2.plist @@ -4,6 +4,8 @@ AllowClipboardAccess + AllowTabbarInTitlebarAccessoryBigSur + Custom Color Presets lunar-eclipse @@ -1476,7 +1478,7 @@ Default Arrangement Name - Center + Center - Center Default Bookmark Guid 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 DimBackgroundWindows @@ -1880,7 +1882,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 10.32718583776596 Bold Color Alpha Component @@ -2484,12 +2488,30 @@ Close Shortcut + Show Status Bar + Silence Bell Smart Cursor Color Space -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + Sync Title Tab Color @@ -2514,7 +2536,7 @@ Close Title Components 1 Transparency - 0.0 + 0.078211436170212797 Underline Color Alpha Component @@ -2551,7 +2573,7 @@ Close Visual Bell Window Type - 0 + 12 Working Directory /Users/ed @@ -3416,7 +3438,7 @@ Close Send Code When Idle Shortcut - T + A Silence Bell Smart Cursor Color @@ -4671,7 +4693,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 7.7231050531914907 Bold Color Alpha Component @@ -4741,7 +4765,7 @@ Close Custom Command No Custom Directory - No + Recycle Default Bookmark No Description @@ -4766,7 +4790,7 @@ Close 0.46274510025978088 Guid - AFF490DE-6E98-4035-92F5-DA0F8247C6F3 + 82B9D80D-E52C-4BFE-948D-A151315446DA Has Hotkey Horizontal Spacing @@ -5228,7 +5252,7 @@ Close Mouse Reporting Name - No Titles + triplets Non Ascii Font FiraCodeNFM-Reg 18 Non-ASCII Anti Aliased @@ -5278,13 +5302,31 @@ Close Send Code When Idle Shortcut - N - Silence Bell + T + Show Status Bar + Silence Bell + Smart Cursor Color Space -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + Sync Title Tab Color @@ -5309,7 +5351,7 @@ Close Title Components 1 Transparency - 0.0 + 0.1464345079787234 Underline Color Alpha Component @@ -5409,26 +5451,50 @@ Close ShowFullScreenTabBar ShowNewOutputIndicator - + ShowPaneTitles - + + Snippets + + + guid + 7C07C0A3-DA4E-43E5-884F-2717C60A2003 + title + Git: delete local branch + value + git branch -d <branch> + version + 1 + + + guid + D814E65E-90B0-448C-A6CA-7866568F48AA + title + Git: delete remote branch + value + git push <remote> --delete <branch> + version + 1 + + SoundForEsc SplitPaneDimmingAmount - 0.29999905188106796 + 0.40338554308252422 StatusBarPosition 0 StretchTabsToFillBar TabStyleWithAutomaticOption - 5 + 6 TabViewType 0 TabsHaveCloseButton - + ToolbeltTools - Profiles + Snippets + Notes UseBorder @@ -5438,7 +5504,7 @@ Close Window Arrangements - Center + Center - Center Desired Columns @@ -5448,7 +5514,7 @@ Close Has Toolbelt Height - 942 + 1273 Hide After Opening Hiding Toolbelt Should Resize Window @@ -5458,7 +5524,7 @@ Close Is Hotkey Window Saved Window Type - 13 + 12 Screen 0 Scroller Width @@ -5471,7 +5537,7 @@ Close Root Splitter ID - 7D11A2FB-3953-4277-97BC-766F4E5D7981 + 187A38FD-9C49-4FDC-8D71-DDBF49BB61AD Subviews @@ -5734,7 +5800,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 7.7231050531914907 Bold Color Alpha Component @@ -5802,7 +5870,7 @@ Close Custom Command No Custom Directory - No + Recycle Default Bookmark No Description @@ -5827,7 +5895,7 @@ Close 0.46274510025978088 Guid - B25D20F7-D759-4867-8019-4D4CD289875A + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Horizontal Spacing 1 Icon @@ -6298,8 +6366,6 @@ Close FiraCodeNFM-Reg 18 Option Key Sends 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Prompt Before Closing 2 Right Option Key Sends @@ -6340,12 +6406,30 @@ Close Shortcut - Silence Bell + Show Status Bar + Silence Bell + Smart Cursor Color Space -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + Sync Title Tab Color @@ -6368,9 +6452,9 @@ Close Thin Strokes 4 Title Components - 3 + 1 Transparency - 0.0 + 0.1464345079787234 Underline Color Alpha Component @@ -6407,30 +6491,22 @@ Close Visual Bell Window Type - 0 + 12 Working Directory /Users/ed Columns - 154 + 208 Commands Directories /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed/.dotfiles - /Users/ed/.dotfiles - /Users/ed - /Users/ed Environment PWD - /Users/ed/.dotfiles + /Users/ed Hostname to Shell @@ -6442,42 +6518,6 @@ Close User name - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - Is UTF-8 @@ -6490,25 +6530,19 @@ Close window title stack - Overridden Fields - - Original Guid - Guid - Title Components - Program Type Shell Launcher Rows - 39 + 55 Session GUID - CA98991A-B8C0-4FC3-8606-F6696BFFF740 + 06523E1A-3D5E-4BD8-AEB4-EAA2DE1BCDAD Short Lived Single Use Should Expect Current Dir Updates - + Should Expect Prompt Marks Substitutions @@ -6519,16 +6553,16 @@ Close Working Directory /Users/ed Working Directory Poller Disabled - + View Type SessionView frame height - 904 + 1273 width - 1706 + 2304 x 0.0 y @@ -6541,23 +6575,23 @@ Close frame height - 904 + 1273 width - 1706 + 2304 x 0.0 y 0.0 isVertical - + Tab GUID - E62FC409-A280-4A30-B569-02BF273DD39B + 74879D11-9ECB-49C0-93C7-A96B9C4866C7 TerminalGuid - pty-DB0FBDB0-E82F-4B6A-BC0B-99D020D51832 + pty-632549CA-BB28-4B87-8664-F35606758BBF Toolbelt Toolbelt Proportions @@ -6566,25 +6600,31 @@ Close heightAsFraction - 1 + 0.50314465408805031 + name + Snippets + + + heightAsFraction + 0.49685534591194969 name - Command History + Notes Use Transparency Width - 1706 + 2304 Window Type - 13 + 12 X Origin - 427 + 128 Y Origin - 236 + 71 - Center - Triple + Center - Small Desired Columns @@ -6594,7 +6634,7 @@ Close Has Toolbelt Height - 942 + 924 Hide After Opening Hiding Toolbelt Should Resize Window @@ -6604,7 +6644,7 @@ Close Is Hotkey Window Saved Window Type - 13 + 12 Screen 0 Scroller Width @@ -6617,12 +6657,12 @@ Close Root Splitter ID - 7D11A2FB-3953-4277-97BC-766F4E5D7981 + 187A38FD-9C49-4FDC-8D71-DDBF49BB61AD Subviews Is Active - 0 + 1 Session Bookmark @@ -6880,7 +6920,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 7.7231050531914907 Bold Color Alpha Component @@ -6948,7 +6990,7 @@ Close Custom Command No Custom Directory - No + Recycle Default Bookmark No Description @@ -6973,7 +7015,7 @@ Close 0.46274510025978088 Guid - B25D20F7-D759-4867-8019-4D4CD289875A + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Horizontal Spacing 1 Icon @@ -7444,8 +7486,6 @@ Close FiraCodeNFM-Reg 18 Option Key Sends 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Prompt Before Closing 2 Right Option Key Sends @@ -7486,12 +7526,30 @@ Close Shortcut - Silence Bell + Show Status Bar + Silence Bell + Smart Cursor Color Space -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + Sync Title Tab Color @@ -7514,9 +7572,9 @@ Close Thin Strokes 4 Title Components - 3 + 1 Transparency - 0.0 + 0.1464345079787234 Underline Color Alpha Component @@ -7553,32 +7611,22 @@ Close Visual Bell Window Type - 0 + 12 Working Directory /Users/ed Columns - 76 + 145 Commands Directories /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed/.dotfiles - /Users/ed/.dotfiles - /Users/ed - /Users/ed - /Users/ed - /Users/ed Environment PWD - /Users/ed/.dotfiles + /Users/ed Hostname to Shell @@ -7590,42 +7638,6 @@ Close User name - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - Is UTF-8 @@ -7638,25 +7650,19 @@ Close window title stack - Overridden Fields - - Original Guid - Guid - Title Components - Program Type Shell Launcher Rows - 38 + 40 Session GUID - CA98991A-B8C0-4FC3-8606-F6696BFFF740 + 06523E1A-3D5E-4BD8-AEB4-EAA2DE1BCDAD Short Lived Single Use Should Expect Current Dir Updates - + Should Expect Prompt Marks Substitutions @@ -7667,2081 +7673,1141 @@ Close Working Directory /Users/ed Working Directory Poller Disabled - + View Type SessionView frame height - 904 + 924 width - 853 + 1605 x 0.0 y 0.0 - - Splitter ID - 4EB72854-C711-46B6-8341-2CBA0E7B21E8 - Subviews - - - Is Active - 0 - Session - - Bookmark - - ASCII Anti Aliased - - ASCII Ligatures - - Allow Title Setting - - Ambiguous Double Width - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.54117649793624878 - Color Space - sRGB - Green Component - 0.50980395078659058 - Red Component - 0.38823530077934265 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.27450981736183167 - Color Space - sRGB - Green Component - 0.0 - Red Component - 1 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.41568627953529358 - Color Space - sRGB - Green Component - 0.85490196943283081 - Red Component - 0.14509804546833038 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.015686275437474251 - Color Space - sRGB - Green Component - 0.75686275959014893 - Red Component - 1 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.72549021244049072 - Red Component - 0.25490197539329529 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.9529411792755127 - Color Space - sRGB - Green Component - 0.35294118523597717 - Red Component - 0.78039216995239258 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.83921569585800171 - Color Space - sRGB - Green Component - 0.85490196943283081 - Red Component - 0.086274512112140656 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.93333333730697632 - Red Component - 0.89019608497619629 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.34509804844856262 - Color Space - sRGB - Green Component - 0.68235296010971069 - Red Component - 0.17647059261798859 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.61176472902297974 - Red Component - 0.81176471710205078 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.92941176891326904 - Color Space - sRGB - Green Component - 0.63137257099151611 - Red Component - 0.035294119268655777 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.85098040103912354 - Color Space - sRGB - Green Component - 0.0 - Red Component - 0.91764706373214722 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.47450980544090271 - Red Component - 0.68627452850341797 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.94509804248809814 - Color Space - sRGB - Green Component - 0.89411765336990356 - Red Component - 0.86666667461395264 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.25882354378700256 - Color Space - sRGB - Green Component - 0.21568627655506134 - Red Component - 0.18823529779911041 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.52941179275512695 - Color Space - sRGB - Green Component - 0.18039216101169586 - Red Component - 1 - - Application Keypad Allowed - - BM Growl - - Background Color - - Alpha Component - 1 - Blue Component - 0.098039217293262482 - Color Space - sRGB - Green Component - 0.066666670143604279 - Red Component - 0.062745101749897003 - - Background Image Location - - Badge Color - - Alpha Component - 0.5 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.1491314172744751 - Red Component - 1 - - Blink Allowed - - Blinking Cursor - - Blur - - Bold Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.93333333730697632 - Red Component - 0.89019608497619629 - - Brighten Bold Text - - Character Encoding - 4 - Close Sessions On End - - Columns - 80 - Command - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.62352943420410156 - Color Space - sRGB - Green Component - 0.62352943420410156 - Red Component - 0.60000002384185791 - - Cursor Guide Color - - Alpha Component - 0.11764705882352941 - Blue Component - 0.25490197539329529 - Color Space - sRGB - Green Component - 0.18823529779911041 - Red Component - 0.17647059261798859 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.20784313976764679 - Color Space - sRGB - Green Component - 0.035294119268655777 - Red Component - 0.047058824449777603 - - Cursor Type - 2 - Custom Command - No - Custom Directory - No - Default Bookmark - No - Description - Default - Disable Window Resizing - - Draw Powerline Glyphs - - Flashing Bell - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.65490198135375977 - Color Space - sRGB - Green Component - 0.49803921580314636 - Red Component - 0.46274510025978088 - - Guid - ED5165B3-CDC8-444C-8F45-B830792E76ED - Horizontal Spacing - 1 - Icon - 1 - Idle Code - 0 - Jobs to Ignore - - rlogin - ssh - slogin - telnet - - Keyboard Map - - 0x2a-0x200000 - - Action - 12 - Text - * - - 0x2b-0x200000 - - Action - 12 - Text - + - - 0x2d-0x200000 - - Action - 12 - Text - - - - 0x2d-0x40000 - - Action - 11 - Text - 0x1f - - 0x2e-0x200000 - - Action - 12 - Text - . - - 0x2f-0x200000 - - Action - 12 - Text - / - - 0x3-0x200000 - - Action - 11 - Text - 0xd - - 0x30-0x200000 - - Action - 12 - Text - 0 - - 0x31-0x200000 - - Action - 12 - Text - 1 - - 0x32-0x200000 - - Action - 12 - Text - 2 - - 0x32-0x40000 - - Action - 11 - Text - 0x00 - - 0x33-0x200000 - - Action - 12 - Text - 3 - - 0x33-0x40000 - - Action - 11 - Text - 0x1b - - 0x34-0x200000 - - Action - 12 - Text - 4 - - 0x34-0x40000 - - Action - 11 - Text - 0x1c - - 0x35-0x200000 - - Action - 12 - Text - 5 - - 0x35-0x40000 - - Action - 11 - Text - 0x1d - - 0x36-0x200000 - - Action - 12 - Text - 6 - - 0x36-0x40000 - - Action - 11 - Text - 0x1e - - 0x37-0x200000 - - Action - 12 - Text - 7 - - 0x37-0x40000 - - Action - 11 - Text - 0x1f - - 0x38-0x200000 - - Action - 12 - Text - 8 - - 0x38-0x40000 - - Action - 11 - Text - 0x7f - - 0x39-0x200000 - - Action - 12 - Text - 9 - - 0x7f-0x100000 - - Action - 11 - Text - 0x15 - - 0x7f-0x80000 - - Action - 11 - Text - 0x1b 0x7f - - 0xf700-0x220000 - - Action - 10 - Text - [1;2A - - 0xf700-0x240000 - - Action - 10 - Text - [1;5A - - 0xf700-0x260000 - - Action - 10 - Text - [1;6A - - 0xf701-0x220000 - - Action - 10 - Text - [1;2B - - 0xf701-0x240000 - - Action - 10 - Text - [1;5B - - 0xf701-0x260000 - - Action - 10 - Text - [1;6B - - 0xf702-0x220000 - - Action - 10 - Text - [1;2D - - 0xf702-0x240000 - - Action - 10 - Text - [1;5D - - 0xf702-0x260000 - - Action - 10 - Text - [1;6D - - 0xf702-0x280000 - - Action - 10 - Text - b - - 0xf702-0x300000 - - Action - 11 - Text - 0x1 - - 0xf703-0x220000 - - Action - 10 - Text - [1;2C - - 0xf703-0x240000 - - Action - 10 - Text - [1;5C - - 0xf703-0x260000 - - Action - 10 - Text - [1;6C - - 0xf703-0x280000 - - Action - 10 - Text - f - - 0xf703-0x300000 - - Action - 11 - Text - 0x5 - - 0xf704-0x20000 - - Action - 10 - Text - [1;2P - - 0xf705-0x20000 - - Action - 10 - Text - [1;2Q - - 0xf706-0x20000 - - Action - 10 - Text - [1;2R - - 0xf707-0x20000 - - Action - 10 - Text - [1;2S - - 0xf708-0x20000 - - Action - 10 - Text - [15;2~ - - 0xf709-0x20000 - - Action - 10 - Text - [17;2~ - - 0xf70a-0x20000 - - Action - 10 - Text - [18;2~ - - 0xf70b-0x20000 - - Action - 10 - Text - [19;2~ - - 0xf70c-0x20000 - - Action - 10 - Text - [20;2~ - - 0xf70d-0x20000 - - Action - 10 - Text - [21;2~ - - 0xf70e-0x20000 - - Action - 10 - Text - [23;2~ - - 0xf70f-0x20000 - - Action - 10 - Text - [24;2~ - - 0xf728-0x0 - - Action - 11 - Text - 0x4 - - 0xf728-0x80000 - - Action - 10 - Text - d - - 0xf729-0x20000 - - Action - 10 - Text - [1;2H - - 0xf729-0x40000 - - Action - 10 - Text - [1;5H - - 0xf72b-0x20000 - - Action - 10 - Text - [1;2F - - 0xf72b-0x40000 - - Action - 10 - Text - [1;5F - - 0xf739-0x0 - - Action - 13 - Text - - - - Link Color - - Alpha Component - 1 - Blue Component - 0.73423302173614502 - Color Space - sRGB - Green Component - 0.35916060209274292 - Red Component - 0.0 - - Mouse Reporting - - Name - Default - Non Ascii Font - FiraCodeNFM-Reg 18 - Non-ASCII Anti Aliased - - Non-ASCII Ligatures - - Normal Font - FiraCodeNFM-Reg 18 - Option Key Sends - 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 - Prompt Before Closing 2 - - Right Option Key Sends - 2 - Rows - 25 - Screen - 0 - Scrollback Lines - 0 - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.20784313976764679 - Color Space - sRGB - Green Component - 0.035294119268655777 - Red Component - 0.047058824449777603 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.61176472902297974 - Red Component - 0.81176471710205078 - - Send Code When Idle - - Shortcut - - Silence Bell - - Smart Cursor Color - - Space - -1 - Sync Title - - Tab Color - - Alpha Component - 1 - Blue Component - 0.18823529779911041 - Color Space - sRGB - Green Component - 0.13725490868091583 - Red Component - 0.13333334028720856 - - Tags - - Terminal Type - xterm-256color - Thin Strokes - 4 - Title Components - 3 - Transparency - 0.0 - Underline Color - - Alpha Component - 1 - Blue Component - 0.50980395078659058 - Color Space - sRGB - Green Component - 0.21176466345787048 - Red Component - 0.82745105028152466 - - Unicode Version - 9 - Unlimited Scrollback - - Use Bold Font - - Use Bright Bold - - Use Cursor Guide - - Use Custom Tab Title - - Use Italic Font - - Use Non-ASCII Font - - Use Tab Color - - Vertical Spacing - 1 - Visual Bell - - Window Type - 0 - Working Directory - /Users/ed - - Columns - 76 - Commands - - Directories - - /Users/ed - - Environment - - PWD - /Users/ed - - Hostname to Shell - - Hosts - - - Host name - BigMac - User name - - - - Is UTF-8 - - Key Labels - - Name Controller State - - icon title stack - - window title stack - - - Overridden Fields - - Original Guid - Guid - Title Components - - Program - - Command - login -fqp "ed" - Type - Command - - Rows - 18 - Session GUID - 1ECA13CA-8BEE-405A-A345-2B881F42F5CF - Short Lived Single Use - - Should Expect Current Dir Updates - - Should Expect Prompt Marks - - Substitutions - - $$$$ - $$ - - Working Directory - /Users/ed - Working Directory Poller Disabled - - - View Type - SessionView - frame - - height - 452 - width - 852 - x - 0.0 - y - 0.0 - - - - Is Active - 1 - Session - - Bookmark - - ASCII Anti Aliased - - ASCII Ligatures - - Allow Title Setting - - Ambiguous Double Width - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.54117649793624878 - Color Space - sRGB - Green Component - 0.50980395078659058 - Red Component - 0.38823530077934265 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.27450981736183167 - Color Space - sRGB - Green Component - 0.0 - Red Component - 1 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.41568627953529358 - Color Space - sRGB - Green Component - 0.85490196943283081 - Red Component - 0.14509804546833038 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.015686275437474251 - Color Space - sRGB - Green Component - 0.75686275959014893 - Red Component - 1 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 1 - Color Space - sRGB - Green Component - 0.72549021244049072 - Red Component - 0.25490197539329529 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.9529411792755127 - Color Space - sRGB - Green Component - 0.35294118523597717 - Red Component - 0.78039216995239258 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.83921569585800171 - Color Space - sRGB - Green Component - 0.85490196943283081 - Red Component - 0.086274512112140656 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.93333333730697632 - Red Component - 0.89019608497619629 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.34509804844856262 - Color Space - sRGB - Green Component - 0.68235296010971069 - Red Component - 0.17647059261798859 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.61176472902297974 - Red Component - 0.81176471710205078 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.92941176891326904 - Color Space - sRGB - Green Component - 0.63137257099151611 - Red Component - 0.035294119268655777 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.85098040103912354 - Color Space - sRGB - Green Component - 0.0 - Red Component - 0.91764706373214722 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.47450980544090271 - Red Component - 0.68627452850341797 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.94509804248809814 - Color Space - sRGB - Green Component - 0.89411765336990356 - Red Component - 0.86666667461395264 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.25882354378700256 - Color Space - sRGB - Green Component - 0.21568627655506134 - Red Component - 0.18823529779911041 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.52941179275512695 - Color Space - sRGB - Green Component - 0.18039216101169586 - Red Component - 1 - - Application Keypad Allowed - - BM Growl - - Background Color - - Alpha Component - 1 - Blue Component - 0.098039217293262482 - Color Space - sRGB - Green Component - 0.066666670143604279 - Red Component - 0.062745101749897003 - - Background Image Location - - Badge Color - - Alpha Component - 0.5 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.1491314172744751 - Red Component - 1 - - Blink Allowed - - Blinking Cursor - - Blur - - Bold Color - - Alpha Component - 1 - Blue Component - 0.99607843160629272 - Color Space - sRGB - Green Component - 0.93333333730697632 - Red Component - 0.89019608497619629 - - Brighten Bold Text - - Character Encoding - 4 - Close Sessions On End - - Columns - 80 - Command - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.62352943420410156 - Color Space - sRGB - Green Component - 0.62352943420410156 - Red Component - 0.60000002384185791 - - Cursor Guide Color - - Alpha Component - 0.11764705882352941 - Blue Component - 0.25490197539329529 - Color Space - sRGB - Green Component - 0.18823529779911041 - Red Component - 0.17647059261798859 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.20784313976764679 - Color Space - sRGB - Green Component - 0.035294119268655777 - Red Component - 0.047058824449777603 - - Cursor Type - 2 - Custom Command - No - Custom Directory - No - Default Bookmark - No - Description - Default - Disable Window Resizing - - Draw Powerline Glyphs - - Flashing Bell - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.65490198135375977 - Color Space - sRGB - Green Component - 0.49803921580314636 - Red Component - 0.46274510025978088 - - Guid - E889CD5E-C670-49B1-BF2D-090580798977 - Horizontal Spacing - 1 - Icon - 1 - Idle Code - 0 - Jobs to Ignore - - rlogin - ssh - slogin - telnet - - Keyboard Map - - 0x2a-0x200000 - - Action - 12 - Text - * - - 0x2b-0x200000 - - Action - 12 - Text - + - - 0x2d-0x200000 - - Action - 12 - Text - - - - 0x2d-0x40000 - - Action - 11 - Text - 0x1f - - 0x2e-0x200000 - - Action - 12 - Text - . - - 0x2f-0x200000 - - Action - 12 - Text - / - - 0x3-0x200000 - - Action - 11 - Text - 0xd - - 0x30-0x200000 - - Action - 12 - Text - 0 - - 0x31-0x200000 - - Action - 12 - Text - 1 - - 0x32-0x200000 - - Action - 12 - Text - 2 - - 0x32-0x40000 - - Action - 11 - Text - 0x00 - - 0x33-0x200000 - - Action - 12 - Text - 3 - - 0x33-0x40000 - - Action - 11 - Text - 0x1b - - 0x34-0x200000 - - Action - 12 - Text - 4 - - 0x34-0x40000 - - Action - 11 - Text - 0x1c - - 0x35-0x200000 - - Action - 12 - Text - 5 - - 0x35-0x40000 - - Action - 11 - Text - 0x1d - - 0x36-0x200000 - - Action - 12 - Text - 6 - - 0x36-0x40000 - - Action - 11 - Text - 0x1e - - 0x37-0x200000 - - Action - 12 - Text - 7 - - 0x37-0x40000 - - Action - 11 - Text - 0x1f - - 0x38-0x200000 - - Action - 12 - Text - 8 - - 0x38-0x40000 - - Action - 11 - Text - 0x7f - - 0x39-0x200000 - - Action - 12 - Text - 9 - - 0x7f-0x100000 - - Action - 11 - Text - 0x15 - - 0x7f-0x80000 - - Action - 11 - Text - 0x1b 0x7f - - 0xf700-0x220000 - - Action - 10 - Text - [1;2A - - 0xf700-0x240000 - - Action - 10 - Text - [1;5A - - 0xf700-0x260000 - - Action - 10 - Text - [1;6A - - 0xf701-0x220000 - - Action - 10 - Text - [1;2B - - 0xf701-0x240000 - - Action - 10 - Text - [1;5B - - 0xf701-0x260000 - - Action - 10 - Text - [1;6B - - 0xf702-0x220000 - - Action - 10 - Text - [1;2D - - 0xf702-0x240000 - - Action - 10 - Text - [1;5D - - 0xf702-0x260000 - - Action - 10 - Text - [1;6D - - 0xf702-0x280000 - - Action - 10 - Text - b - - 0xf702-0x300000 - - Action - 11 - Text - 0x1 - - 0xf703-0x220000 - - Action - 10 - Text - [1;2C - - 0xf703-0x240000 - - Action - 10 - Text - [1;5C - - 0xf703-0x260000 - - Action - 10 - Text - [1;6C - - 0xf703-0x280000 - - Action - 10 - Text - f - - 0xf703-0x300000 - - Action - 11 - Text - 0x5 - - 0xf704-0x20000 - - Action - 10 - Text - [1;2P - - 0xf705-0x20000 - - Action - 10 - Text - [1;2Q - - 0xf706-0x20000 - - Action - 10 - Text - [1;2R - - 0xf707-0x20000 - - Action - 10 - Text - [1;2S - - 0xf708-0x20000 - - Action - 10 - Text - [15;2~ - - 0xf709-0x20000 - - Action - 10 - Text - [17;2~ - - 0xf70a-0x20000 - - Action - 10 - Text - [18;2~ - - 0xf70b-0x20000 - - Action - 10 - Text - [19;2~ - - 0xf70c-0x20000 - - Action - 10 - Text - [20;2~ - - 0xf70d-0x20000 - - Action - 10 - Text - [21;2~ - - 0xf70e-0x20000 - - Action - 10 - Text - [23;2~ - - 0xf70f-0x20000 - - Action - 10 - Text - [24;2~ - - 0xf728-0x0 - - Action - 11 - Text - 0x4 - - 0xf728-0x80000 - - Action - 10 - Text - d - - 0xf729-0x20000 - - Action - 10 - Text - [1;2H - - 0xf729-0x40000 - - Action - 10 - Text - [1;5H - - 0xf72b-0x20000 - - Action - 10 - Text - [1;2F - - 0xf72b-0x40000 - - Action - 10 - Text - [1;5F - - 0xf739-0x0 - - Action - 13 - Text - - - - Link Color - - Alpha Component - 1 - Blue Component - 0.73423302173614502 - Color Space - sRGB - Green Component - 0.35916060209274292 - Red Component - 0.0 - - Mouse Reporting - - Name - Default - Non Ascii Font - FiraCodeNFM-Reg 18 - Non-ASCII Anti Aliased - - Non-ASCII Ligatures - - Normal Font - FiraCodeNFM-Reg 18 - Option Key Sends - 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 - Prompt Before Closing 2 - - Right Option Key Sends - 2 - Rows - 25 - Screen - 0 - Scrollback Lines - 0 - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.20784313976764679 - Color Space - sRGB - Green Component - 0.035294119268655777 - Red Component - 0.047058824449777603 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.61176472902297974 - Red Component - 0.81176471710205078 - - Send Code When Idle - - Shortcut - - Silence Bell - - Smart Cursor Color - - Space - -1 - Sync Title - - Tab Color - - Alpha Component - 1 - Blue Component - 0.18823529779911041 - Color Space - sRGB - Green Component - 0.13725490868091583 - Red Component - 0.13333334028720856 - - Tags - - Terminal Type - xterm-256color - Thin Strokes - 4 - Title Components - 3 - Transparency - 0.0 - Underline Color - - Alpha Component - 1 - Blue Component - 0.50980395078659058 - Color Space - sRGB - Green Component - 0.21176466345787048 - Red Component - 0.82745105028152466 - - Unicode Version - 9 - Unlimited Scrollback - - Use Bold Font - - Use Bright Bold - - Use Cursor Guide - - Use Custom Tab Title - - Use Italic Font - - Use Non-ASCII Font - - Use Tab Color - - Vertical Spacing - 1 - Visual Bell - - Window Type - 0 - Working Directory - /Users/ed + + View Type + Splitter + frame + + height + 924 + width + 1605 + x + 0.0 + y + 0.0 + + isVertical + + + Tab GUID + 74879D11-9ECB-49C0-93C7-A96B9C4866C7 + + + TerminalGuid + pty-632549CA-BB28-4B87-8664-F35606758BBF + Toolbelt + + Toolbelt Proportions + + proportions + + + heightAsFraction + 0.50259067357512954 + name + Snippets + + + heightAsFraction + 0.49740932642487046 + name + Notes + + + + Use Transparency + + Width + 1605 + Window Type + 12 + X Origin + 477 + Y Origin + 245 + + + Center - Small Left + + + Desired Columns + 80 + Desired Rows + 25 + Has Toolbelt + + Height + 924 + Hide After Opening + + Hiding Toolbelt Should Resize Window + + Initial Profile + + Is Hotkey Window + + Saved Window Type + 12 + Screen + 1 + Scroller Width + 0.0 + Selected Tab Index + 0 + Tabs + + + Root + + Splitter ID + 187A38FD-9C49-4FDC-8D71-DDBF49BB61AD + Subviews + + + Is Active + 1 + Session + + Bookmark + + ASCII Anti Aliased + + ASCII Ligatures + + Allow Title Setting + + Ambiguous Double Width + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.54117649793624878 + Color Space + sRGB + Green Component + 0.50980395078659058 + Red Component + 0.38823530077934265 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.27450981736183167 + Color Space + sRGB + Green Component + 0.0 + Red Component + 1 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.41568627953529358 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.14509804546833038 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.015686275437474251 + Color Space + sRGB + Green Component + 0.75686275959014893 + Red Component + 1 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.72549021244049072 + Red Component + 0.25490197539329529 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.9529411792755127 + Color Space + sRGB + Green Component + 0.35294118523597717 + Red Component + 0.78039216995239258 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.83921569585800171 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.086274512112140656 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.34509804844856262 + Color Space + sRGB + Green Component + 0.68235296010971069 + Red Component + 0.17647059261798859 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.92941176891326904 + Color Space + sRGB + Green Component + 0.63137257099151611 + Red Component + 0.035294119268655777 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.85098040103912354 + Color Space + sRGB + Green Component + 0.0 + Red Component + 0.91764706373214722 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.47450980544090271 + Red Component + 0.68627452850341797 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.94509804248809814 + Color Space + sRGB + Green Component + 0.89411765336990356 + Red Component + 0.86666667461395264 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.25882354378700256 + Color Space + sRGB + Green Component + 0.21568627655506134 + Red Component + 0.18823529779911041 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.52941179275512695 + Color Space + sRGB + Green Component + 0.18039216101169586 + Red Component + 1 + + Application Keypad Allowed + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.098039217293262482 + Color Space + sRGB + Green Component + 0.066666670143604279 + Red Component + 0.062745101749897003 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.1491314172744751 + Red Component + 1 + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 7.7231050531914907 + Bold Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Brighten Bold Text + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.62352943420410156 + Color Space + sRGB + Green Component + 0.62352943420410156 + Red Component + 0.60000002384185791 + + Cursor Guide Color + + Alpha Component + 0.11764705882352941 + Blue Component + 0.25490197539329529 + Color Space + sRGB + Green Component + 0.18823529779911041 + Red Component + 0.17647059261798859 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Cursor Type + 2 + Custom Command + No + Custom Directory + Recycle + Default Bookmark + No + Description + Default + Disable Window Resizing + + Draw Powerline Glyphs + + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.65490198135375977 + Color Space + sRGB + Green Component + 0.49803921580314636 + Red Component + 0.46274510025978088 + + Guid + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 + Horizontal Spacing + 1 + Icon + 1 + Idle Code + 0 + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2a-0x200000 + + Action + 12 + Text + * + + 0x2b-0x200000 + + Action + 12 + Text + + + + 0x2d-0x200000 + + Action + 12 + Text + - + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x2e-0x200000 + + Action + 12 + Text + . + + 0x2f-0x200000 + + Action + 12 + Text + / + + 0x3-0x200000 + + Action + 11 + Text + 0xd + + 0x30-0x200000 + + Action + 12 + Text + 0 + + 0x31-0x200000 + + Action + 12 + Text + 1 + + 0x32-0x200000 + + Action + 12 + Text + 2 + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x200000 + + Action + 12 + Text + 3 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x200000 + + Action + 12 + Text + 4 + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x200000 + + Action + 12 + Text + 5 + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x200000 + + Action + 12 + Text + 6 + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x200000 + + Action + 12 + Text + 7 + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x200000 + + Action + 12 + Text + 8 + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0x39-0x200000 + + Action + 12 + Text + 9 + + 0x7f-0x100000 + + Action + 11 + Text + 0x15 + + 0x7f-0x80000 + + Action + 11 + Text + 0x1b 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x300000 + + Action + 11 + Text + 0x1 - Columns - 76 - Commands - - Directories - - /Users/ed - - Environment + 0xf703-0x220000 - PWD - /Users/ed + Action + 10 + Text + [1;2C - Hostname to Shell - - Hosts - - - Host name - BigMac - User name - - - - Is UTF-8 - - Key Labels - - Name Controller State + 0xf703-0x240000 - icon title stack - - window title stack - + Action + 10 + Text + [1;5C - Overridden Fields - - Original Guid - Guid - Title Components - - Program + 0xf703-0x260000 - Command - login -fqp "ed" - Type - Command + Action + 10 + Text + [1;6C - Rows - 18 - Session GUID - 7360D63B-4C3A-41CA-B378-90982BB68E1D - Short Lived Single Use - - Should Expect Current Dir Updates - - Should Expect Prompt Marks - - Substitutions + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x300000 + + Action + 11 + Text + 0x5 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf728-0x0 + + Action + 11 + Text + 0x4 + + 0xf728-0x80000 + + Action + 10 + Text + d + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + 0xf739-0x0 + + Action + 13 + Text + + + + Link Color + + Alpha Component + 1 + Blue Component + 0.73423302173614502 + Color Space + sRGB + Green Component + 0.35916060209274292 + Red Component + 0.0 + + Mouse Reporting + + Name + Default + Non Ascii Font + FiraCodeNFM-Reg 18 + Non-ASCII Anti Aliased + + Non-ASCII Ligatures + + Normal Font + FiraCodeNFM-Reg 18 + Option Key Sends + 2 + Prompt Before Closing 2 + + Right Option Key Sends + 2 + Rows + 25 + Screen + 0 + Scrollback Lines + 0 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Send Code When Idle + + Shortcut + + Show Status Bar + + Silence Bell + + Smart Cursor Color + + Space + -1 + Status Bar Layout + + advanced configuration - $$$$ - $$ + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + - Working Directory - /Users/ed - Working Directory Poller Disabled - + components + - View Type - SessionView - frame + Sync Title + + Tab Color - height - 451 - width - 852 - x - 0.0 - y - 453 + Alpha Component + 1 + Blue Component + 0.18823529779911041 + Color Space + sRGB + Green Component + 0.13725490868091583 + Red Component + 0.13333334028720856 + + Tags + + Terminal Type + xterm-256color + Thin Strokes + 4 + Title Components + 1 + Transparency + 0.1464345079787234 + Underline Color + + Alpha Component + 1 + Blue Component + 0.50980395078659058 + Color Space + sRGB + Green Component + 0.21176466345787048 + Red Component + 0.82745105028152466 + Unicode Version + 9 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Custom Tab Title + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 12 + Working Directory + /Users/ed - + Columns + 145 + Commands + + Directories + + /Users/ed + + Environment + + PWD + /Users/ed + + Hostname to Shell + + Hosts + + + Host name + BigMac + User name + + + + Is UTF-8 + + Key Labels + + Name Controller State + + icon title stack + + window title stack + + + Program + + Type + Shell Launcher + + Rows + 40 + Session GUID + 06523E1A-3D5E-4BD8-AEB4-EAA2DE1BCDAD + Short Lived Single Use + + Should Expect Current Dir Updates + + Should Expect Prompt Marks + + Substitutions + + $$$$ + $$ + + Working Directory + /Users/ed + Working Directory Poller Disabled + + View Type - Splitter + SessionView frame height - 904 + 924 width - 852 + 1605 x - 854 + 0.0 y 0.0 - isVertical - View Type @@ -9749,23 +8815,23 @@ Close frame height - 904 + 924 width - 1706 + 1605 x 0.0 y 0.0 isVertical - + Tab GUID - E62FC409-A280-4A30-B569-02BF273DD39B + 74879D11-9ECB-49C0-93C7-A96B9C4866C7 TerminalGuid - pty-DB0FBDB0-E82F-4B6A-BC0B-99D020D51832 + pty-632549CA-BB28-4B87-8664-F35606758BBF Toolbelt Toolbelt Proportions @@ -9774,25 +8840,31 @@ Close heightAsFraction - 1 + 0.50270855904658718 + name + Snippets + + + heightAsFraction + 0.49729144095341277 name - Command History + Notes Use Transparency Width - 1706 + 1605 Window Type - 13 + 12 X Origin - 427 + -2083 Y Origin - 236 + 245 - Left - Middle + Center - Small Right Desired Columns @@ -9802,7 +8874,7 @@ Close Has Toolbelt Height - 1415 + 924 Hide After Opening Hiding Toolbelt Should Resize Window @@ -9812,9 +8884,9 @@ Close Is Hotkey Window Saved Window Type - 13 + 12 Screen - 1 + 2 Scroller Width 0.0 Selected Tab Index @@ -9825,7 +8897,7 @@ Close Root Splitter ID - 7D11A2FB-3953-4277-97BC-766F4E5D7981 + 187A38FD-9C49-4FDC-8D71-DDBF49BB61AD Subviews @@ -10088,7 +9160,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 7.7231050531914907 Bold Color Alpha Component @@ -10156,7 +9230,7 @@ Close Custom Command No Custom Directory - No + Recycle Default Bookmark No Description @@ -10181,7 +9255,7 @@ Close 0.46274510025978088 Guid - B25D20F7-D759-4867-8019-4D4CD289875A + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Horizontal Spacing 1 Icon @@ -10652,8 +9726,6 @@ Close FiraCodeNFM-Reg 18 Option Key Sends 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Prompt Before Closing 2 Right Option Key Sends @@ -10694,12 +9766,30 @@ Close Shortcut - Silence Bell + Show Status Bar + Silence Bell + Smart Cursor Color Space -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + Sync Title Tab Color @@ -10722,9 +9812,9 @@ Close Thin Strokes 4 Title Components - 3 + 1 Transparency - 0.0 + 0.1464345079787234 Underline Color Alpha Component @@ -10761,80 +9851,27 @@ Close Visual Bell Window Type - 0 + 12 Working Directory /Users/ed Columns - 115 + 145 Commands Directories /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed/.dotfiles - /Users/ed/.dotfiles - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed Environment - PWD - /Users/ed/.dotfiles - - Hostname to Shell - - Hosts - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - + PWD + /Users/ed + + Hostname to Shell + + Hosts + Host name BigMac @@ -10853,25 +9890,19 @@ Close window title stack - Overridden Fields - - Original Guid - Guid - Title Components - Program Type Shell Launcher Rows - 59 + 40 Session GUID - CA98991A-B8C0-4FC3-8606-F6696BFFF740 + 06523E1A-3D5E-4BD8-AEB4-EAA2DE1BCDAD Short Lived Single Use Should Expect Current Dir Updates - + Should Expect Prompt Marks Substitutions @@ -10882,16 +9913,16 @@ Close Working Directory /Users/ed Working Directory Poller Disabled - + View Type SessionView frame height - 1377 + 924 width - 1280 + 1605 x 0.0 y @@ -10904,23 +9935,23 @@ Close frame height - 1377 + 924 width - 1280 + 1605 x 0.0 y 0.0 isVertical - + Tab GUID - E62FC409-A280-4A30-B569-02BF273DD39B + 74879D11-9ECB-49C0-93C7-A96B9C4866C7 TerminalGuid - pty-DB0FBDB0-E82F-4B6A-BC0B-99D020D51832 + pty-632549CA-BB28-4B87-8664-F35606758BBF Toolbelt Toolbelt Proportions @@ -10929,25 +9960,31 @@ Close heightAsFraction - 1 + 0.50270855904658718 + name + Snippets + + + heightAsFraction + 0.49729144095341277 name - Command History + Notes Use Transparency Width - 1280 + 1605 Window Type - 13 + 12 X Origin - -1920 + 3037 Y Origin - 0.0 + 245 - Right - Middle + Triplets Desired Columns @@ -10957,7 +9994,7 @@ Close Has Toolbelt Height - 1415 + 1273 Hide After Opening Hiding Toolbelt Should Resize Window @@ -10967,9 +10004,9 @@ Close Is Hotkey Window Saved Window Type - 13 + 12 Screen - 2 + 0 Scroller Width 0.0 Selected Tab Index @@ -10980,7 +10017,7 @@ Close Root Splitter ID - 7D11A2FB-3953-4277-97BC-766F4E5D7981 + 187A38FD-9C49-4FDC-8D71-DDBF49BB61AD Subviews @@ -11243,7 +10280,9 @@ Close Blinking Cursor Blur - + + Blur Radius + 7.7231050531914907 Bold Color Alpha Component @@ -11311,7 +10350,7 @@ Close Custom Command No Custom Directory - No + Recycle Default Bookmark No Description @@ -11336,7 +10375,7 @@ Close 0.46274510025978088 Guid - B25D20F7-D759-4867-8019-4D4CD289875A + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 Horizontal Spacing 1 Icon @@ -11739,319 +10778,2356 @@ Close 0xf728-0x80000 - Action - 10 - Text - d + Action + 10 + Text + d + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + 0xf739-0x0 + + Action + 13 + Text + + + + Link Color + + Alpha Component + 1 + Blue Component + 0.73423302173614502 + Color Space + sRGB + Green Component + 0.35916060209274292 + Red Component + 0.0 + + Mouse Reporting + + Name + Default + Non Ascii Font + FiraCodeNFM-Reg 18 + Non-ASCII Anti Aliased + + Non-ASCII Ligatures + + Normal Font + FiraCodeNFM-Reg 18 + Option Key Sends + 2 + Prompt Before Closing 2 + + Right Option Key Sends + 2 + Rows + 25 + Screen + 0 + Scrollback Lines + 0 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Send Code When Idle + + Shortcut + + Show Status Bar + + Silence Bell + + Smart Cursor Color + + Space + -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + + Sync Title + + Tab Color + + Alpha Component + 1 + Blue Component + 0.18823529779911041 + Color Space + sRGB + Green Component + 0.13725490868091583 + Red Component + 0.13333334028720856 + + Tags + + Terminal Type + xterm-256color + Thin Strokes + 4 + Title Components + 1 + Transparency + 0.1464345079787234 + Underline Color + + Alpha Component + 1 + Blue Component + 0.50980395078659058 + Color Space + sRGB + Green Component + 0.21176466345787048 + Red Component + 0.82745105028152466 + + Unicode Version + 9 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Custom Tab Title + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 12 + Working Directory + /Users/ed + + Columns + 103 + Commands + + Directories + + /Users/ed + + Environment + + PWD + /Users/ed + + Hostname to Shell + + Hosts + + + Host name + BigMac + User name + + + + Is UTF-8 + + Key Labels + + Name Controller State + + icon title stack + + window title stack + + + Program + + Type + Shell Launcher + + Rows + 55 + Session GUID + 06523E1A-3D5E-4BD8-AEB4-EAA2DE1BCDAD + Short Lived Single Use + + Should Expect Current Dir Updates + + Should Expect Prompt Marks + + Substitutions + + $$$$ + $$ + + Working Directory + /Users/ed + Working Directory Poller Disabled + + + View Type + SessionView + frame + + height + 1273 + width + 1150 + x + 0.0 + y + 0.0 + + + + Splitter ID + D7ED5C69-B69B-4742-9158-AB1D3D737232 + Subviews + + + Is Active + 0 + Session + + Bookmark + + ASCII Anti Aliased + + ASCII Ligatures + + Allow Title Setting + + Ambiguous Double Width + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.54117649793624878 + Color Space + sRGB + Green Component + 0.50980395078659058 + Red Component + 0.38823530077934265 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.27450981736183167 + Color Space + sRGB + Green Component + 0.0 + Red Component + 1 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.41568627953529358 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.14509804546833038 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.015686275437474251 + Color Space + sRGB + Green Component + 0.75686275959014893 + Red Component + 1 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.72549021244049072 + Red Component + 0.25490197539329529 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.9529411792755127 + Color Space + sRGB + Green Component + 0.35294118523597717 + Red Component + 0.78039216995239258 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.83921569585800171 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.086274512112140656 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.34509804844856262 + Color Space + sRGB + Green Component + 0.68235296010971069 + Red Component + 0.17647059261798859 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.92941176891326904 + Color Space + sRGB + Green Component + 0.63137257099151611 + Red Component + 0.035294119268655777 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.85098040103912354 + Color Space + sRGB + Green Component + 0.0 + Red Component + 0.91764706373214722 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.47450980544090271 + Red Component + 0.68627452850341797 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.94509804248809814 + Color Space + sRGB + Green Component + 0.89411765336990356 + Red Component + 0.86666667461395264 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.25882354378700256 + Color Space + sRGB + Green Component + 0.21568627655506134 + Red Component + 0.18823529779911041 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.52941179275512695 + Color Space + sRGB + Green Component + 0.18039216101169586 + Red Component + 1 + + Application Keypad Allowed + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.098039217293262482 + Color Space + sRGB + Green Component + 0.066666670143604279 + Red Component + 0.062745101749897003 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.1491314172744751 + Red Component + 1 + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 7.7231050531914907 + Bold Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Brighten Bold Text + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.62352943420410156 + Color Space + sRGB + Green Component + 0.62352943420410156 + Red Component + 0.60000002384185791 + + Cursor Guide Color + + Alpha Component + 0.11764705882352941 + Blue Component + 0.25490197539329529 + Color Space + sRGB + Green Component + 0.18823529779911041 + Red Component + 0.17647059261798859 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Cursor Type + 2 + Custom Command + No + Custom Directory + Recycle + Default Bookmark + No + Description + Default + Disable Window Resizing + + Draw Powerline Glyphs + + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.65490198135375977 + Color Space + sRGB + Green Component + 0.49803921580314636 + Red Component + 0.46274510025978088 + + Guid + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 + Horizontal Spacing + 1 + Icon + 1 + Idle Code + 0 + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2a-0x200000 + + Action + 12 + Text + * + + 0x2b-0x200000 + + Action + 12 + Text + + + + 0x2d-0x200000 + + Action + 12 + Text + - + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x2e-0x200000 + + Action + 12 + Text + . + + 0x2f-0x200000 + + Action + 12 + Text + / + + 0x3-0x200000 + + Action + 11 + Text + 0xd + + 0x30-0x200000 + + Action + 12 + Text + 0 + + 0x31-0x200000 + + Action + 12 + Text + 1 + + 0x32-0x200000 + + Action + 12 + Text + 2 + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x200000 + + Action + 12 + Text + 3 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x200000 + + Action + 12 + Text + 4 + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x200000 + + Action + 12 + Text + 5 + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x200000 + + Action + 12 + Text + 6 + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x200000 + + Action + 12 + Text + 7 + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x200000 + + Action + 12 + Text + 8 + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0x39-0x200000 + + Action + 12 + Text + 9 + + 0x7f-0x100000 + + Action + 11 + Text + 0x15 + + 0x7f-0x80000 + + Action + 11 + Text + 0x1b 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x300000 + + Action + 11 + Text + 0x1 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x300000 + + Action + 11 + Text + 0x5 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf728-0x0 + + Action + 11 + Text + 0x4 + + 0xf728-0x80000 + + Action + 10 + Text + d + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + 0xf739-0x0 + + Action + 13 + Text + + + + Link Color + + Alpha Component + 1 + Blue Component + 0.73423302173614502 + Color Space + sRGB + Green Component + 0.35916060209274292 + Red Component + 0.0 + + Mouse Reporting + + Name + Default + Non Ascii Font + FiraCodeNFM-Reg 18 + Non-ASCII Anti Aliased + + Non-ASCII Ligatures + + Normal Font + FiraCodeNFM-Reg 18 + Option Key Sends + 2 + Prompt Before Closing 2 + + Right Option Key Sends + 2 + Rows + 25 + Screen + 0 + Scrollback Lines + 0 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Send Code When Idle + + Shortcut + + Show Status Bar + + Silence Bell + + Smart Cursor Color + + Space + -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + + Sync Title + + Tab Color + + Alpha Component + 1 + Blue Component + 0.18823529779911041 + Color Space + sRGB + Green Component + 0.13725490868091583 + Red Component + 0.13333334028720856 + + Tags + + Terminal Type + xterm-256color + Thin Strokes + 4 + Title Components + 1 + Transparency + 0.1464345079787234 + Underline Color + + Alpha Component + 1 + Blue Component + 0.50980395078659058 + Color Space + sRGB + Green Component + 0.21176466345787048 + Red Component + 0.82745105028152466 + + Unicode Version + 9 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Custom Tab Title + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 12 + Working Directory + /Users/ed - 0xf729-0x20000 + Columns + 103 + Commands + + Directories + + /Users/ed + + Environment - Action - 10 - Text - [1;2H + PWD + /Users/ed - 0xf729-0x40000 + Hostname to Shell + + Hosts + + + Host name + BigMac + User name + + + + Is UTF-8 + + Key Labels + + Name Controller State - Action - 10 - Text - [1;5H + icon title stack + + window title stack + - 0xf72b-0x20000 + Program - Action - 10 - Text - [1;2F + Type + Shell Launcher - 0xf72b-0x40000 + Rows + 28 + Session GUID + 5BF1126E-35CF-444C-9C8A-6B4FB7EF9128 + Short Lived Single Use + + Should Expect Current Dir Updates + + Should Expect Prompt Marks + + Substitutions - Action - 10 - Text - [1;5F + $$$$ + $$ - 0xf739-0x0 + Working Directory + /Users/ed + Working Directory Poller Disabled + + + View Type + SessionView + frame + + height + 670 + width + 1153 + x + 0.0 + y + 0.0 + + + + Is Active + 0 + Session + + Bookmark - Action - 13 - Text + ASCII Anti Aliased + + ASCII Ligatures + + Allow Title Setting + + Ambiguous Double Width + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.54117649793624878 + Color Space + sRGB + Green Component + 0.50980395078659058 + Red Component + 0.38823530077934265 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.27450981736183167 + Color Space + sRGB + Green Component + 0.0 + Red Component + 1 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.41568627953529358 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.14509804546833038 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.015686275437474251 + Color Space + sRGB + Green Component + 0.75686275959014893 + Red Component + 1 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 1 + Color Space + sRGB + Green Component + 0.72549021244049072 + Red Component + 0.25490197539329529 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.9529411792755127 + Color Space + sRGB + Green Component + 0.35294118523597717 + Red Component + 0.78039216995239258 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.83921569585800171 + Color Space + sRGB + Green Component + 0.85490196943283081 + Red Component + 0.086274512112140656 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.34509804844856262 + Color Space + sRGB + Green Component + 0.68235296010971069 + Red Component + 0.17647059261798859 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.92941176891326904 + Color Space + sRGB + Green Component + 0.63137257099151611 + Red Component + 0.035294119268655777 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.85098040103912354 + Color Space + sRGB + Green Component + 0.0 + Red Component + 0.91764706373214722 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.47450980544090271 + Red Component + 0.68627452850341797 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.94509804248809814 + Color Space + sRGB + Green Component + 0.89411765336990356 + Red Component + 0.86666667461395264 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.25882354378700256 + Color Space + sRGB + Green Component + 0.21568627655506134 + Red Component + 0.18823529779911041 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.52941179275512695 + Color Space + sRGB + Green Component + 0.18039216101169586 + Red Component + 1 + + Application Keypad Allowed + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.098039217293262482 + Color Space + sRGB + Green Component + 0.066666670143604279 + Red Component + 0.062745101749897003 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.1491314172744751 + Red Component + 1 + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 7.7231050531914907 + Bold Color + + Alpha Component + 1 + Blue Component + 0.99607843160629272 + Color Space + sRGB + Green Component + 0.93333333730697632 + Red Component + 0.89019608497619629 + + Brighten Bold Text + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.62352943420410156 + Color Space + sRGB + Green Component + 0.62352943420410156 + Red Component + 0.60000002384185791 + + Cursor Guide Color + + Alpha Component + 0.11764705882352941 + Blue Component + 0.25490197539329529 + Color Space + sRGB + Green Component + 0.18823529779911041 + Red Component + 0.17647059261798859 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Cursor Type + 2 + Custom Command + No + Custom Directory + Recycle + Default Bookmark + No + Description + Default + Disable Window Resizing + + Draw Powerline Glyphs + + Flashing Bell + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.65490198135375977 + Color Space + sRGB + Green Component + 0.49803921580314636 + Red Component + 0.46274510025978088 + + Guid + 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 + Horizontal Spacing + 1 + Icon + 1 + Idle Code + 0 + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2a-0x200000 + + Action + 12 + Text + * + + 0x2b-0x200000 + + Action + 12 + Text + + + + 0x2d-0x200000 + + Action + 12 + Text + - + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x2e-0x200000 + + Action + 12 + Text + . + + 0x2f-0x200000 + + Action + 12 + Text + / + + 0x3-0x200000 + + Action + 11 + Text + 0xd + + 0x30-0x200000 + + Action + 12 + Text + 0 + + 0x31-0x200000 + + Action + 12 + Text + 1 + + 0x32-0x200000 + + Action + 12 + Text + 2 + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x200000 + + Action + 12 + Text + 3 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x200000 + + Action + 12 + Text + 4 + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x200000 + + Action + 12 + Text + 5 + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x200000 + + Action + 12 + Text + 6 + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x200000 + + Action + 12 + Text + 7 + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x200000 + + Action + 12 + Text + 8 + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0x39-0x200000 + + Action + 12 + Text + 9 + + 0x7f-0x100000 + + Action + 11 + Text + 0x15 + + 0x7f-0x80000 + + Action + 11 + Text + 0x1b 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x300000 + + Action + 11 + Text + 0x1 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x300000 + + Action + 11 + Text + 0x5 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf728-0x0 + + Action + 11 + Text + 0x4 + + 0xf728-0x80000 + + Action + 10 + Text + d + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + 0xf739-0x0 + + Action + 13 + Text + + + + Link Color + + Alpha Component + 1 + Blue Component + 0.73423302173614502 + Color Space + sRGB + Green Component + 0.35916060209274292 + Red Component + 0.0 + + Mouse Reporting + + Name + Default + Non Ascii Font + FiraCodeNFM-Reg 18 + Non-ASCII Anti Aliased + + Non-ASCII Ligatures + + Normal Font + FiraCodeNFM-Reg 18 + Option Key Sends + 2 + Prompt Before Closing 2 + + Right Option Key Sends + 2 + Rows + 25 + Screen + 0 + Scrollback Lines + 0 + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.20784313976764679 + Color Space + sRGB + Green Component + 0.035294119268655777 + Red Component + 0.047058824449777603 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.61176472902297974 + Red Component + 0.81176471710205078 + + Send Code When Idle + + Shortcut + Show Status Bar + + Silence Bell + + Smart Cursor Color + + Space + -1 + Status Bar Layout + + advanced configuration + + algorithm + 0 + auto-rainbow style + 3 + font + FiraCodeNFM-Bold 12 + remove empty components + + + components + + + Sync Title + + Tab Color + + Alpha Component + 1 + Blue Component + 0.18823529779911041 + Color Space + sRGB + Green Component + 0.13725490868091583 + Red Component + 0.13333334028720856 + + Tags + + Terminal Type + xterm-256color + Thin Strokes + 4 + Title Components + 1 + Transparency + 0.1464345079787234 + Underline Color + + Alpha Component + 1 + Blue Component + 0.50980395078659058 + Color Space + sRGB + Green Component + 0.21176466345787048 + Red Component + 0.82745105028152466 + + Unicode Version + 9 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Cursor Guide + + Use Custom Tab Title + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 12 + Working Directory + /Users/ed + Columns + 103 + Commands + + Directories + + /Users/ed + + Environment + + PWD + /Users/ed + + Hostname to Shell + + Hosts + + + Host name + BigMac + User name + + + + Is UTF-8 + + Key Labels + + Name Controller State + + icon title stack + + window title stack + + + Program + + Type + Shell Launcher + + Rows + 26 + Session GUID + B0C4D953-E1E1-41EF-B2FA-B2FB2E658A5A + Short Lived Single Use + + Should Expect Current Dir Updates + + Should Expect Prompt Marks + + Substitutions + + $$$$ + $$ + + Working Directory + /Users/ed + Working Directory Poller Disabled + - Link Color - - Alpha Component - 1 - Blue Component - 0.73423302173614502 - Color Space - sRGB - Green Component - 0.35916060209274292 - Red Component - 0.0 - - Mouse Reporting - - Name - Default - Non Ascii Font - FiraCodeNFM-Reg 18 - Non-ASCII Anti Aliased - - Non-ASCII Ligatures - - Normal Font - FiraCodeNFM-Reg 18 - Option Key Sends - 2 - Original Guid - 0115BE8F-8E10-4C7F-860D-D893BBE3AA33 - Prompt Before Closing 2 - - Right Option Key Sends - 2 - Rows - 25 - Screen - 0 - Scrollback Lines - 0 - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.20784313976764679 - Color Space - sRGB - Green Component - 0.035294119268655777 - Red Component - 0.047058824449777603 - - Selection Color + View Type + SessionView + frame - Alpha Component - 1 - Blue Component + height + 602 + width + 1153 + x 0.0 - Color Space - sRGB - Green Component - 0.61176472902297974 - Red Component - 0.81176471710205078 - - Send Code When Idle - - Shortcut - - Silence Bell - - Smart Cursor Color - - Space - -1 - Sync Title - - Tab Color - - Alpha Component - 1 - Blue Component - 0.18823529779911041 - Color Space - sRGB - Green Component - 0.13725490868091583 - Red Component - 0.13333334028720856 - - Tags - - Terminal Type - xterm-256color - Thin Strokes - 4 - Title Components - 3 - Transparency - 0.0 - Underline Color - - Alpha Component - 1 - Blue Component - 0.50980395078659058 - Color Space - sRGB - Green Component - 0.21176466345787048 - Red Component - 0.82745105028152466 - - Unicode Version - 9 - Unlimited Scrollback - - Use Bold Font - - Use Bright Bold - - Use Cursor Guide - - Use Custom Tab Title - - Use Italic Font - - Use Non-ASCII Font - - Use Tab Color - - Vertical Spacing - 1 - Visual Bell - - Window Type - 0 - Working Directory - /Users/ed - - Columns - 115 - Commands - - Directories - - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed/.dotfiles - /Users/ed/.dotfiles - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - /Users/ed - - Environment - - PWD - /Users/ed/.dotfiles - - Hostname to Shell - - Hosts - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - - - - Host name - BigMac - User name - + y + 671 - - Is UTF-8 - - Key Labels - - Name Controller State - - icon title stack - - window title stack - - - Overridden Fields - - Original Guid - Guid - Title Components - - Program - - Type - Shell Launcher - - Rows - 59 - Session GUID - CA98991A-B8C0-4FC3-8606-F6696BFFF740 - Short Lived Single Use - - Should Expect Current Dir Updates - - Should Expect Prompt Marks - - Substitutions - - $$$$ - $$ - Working Directory - /Users/ed - Working Directory Poller Disabled - - + View Type - SessionView + Splitter frame height - 1377 + 1273 width - 1280 + 1153 x - 0.0 + 1151 y 0.0 + isVertical + View Type @@ -12059,9 +13135,9 @@ Close frame height - 1377 + 1273 width - 1280 + 2304 x 0.0 y @@ -12071,11 +13147,11 @@ Close Tab GUID - E62FC409-A280-4A30-B569-02BF273DD39B + 74879D11-9ECB-49C0-93C7-A96B9C4866C7 TerminalGuid - pty-DB0FBDB0-E82F-4B6A-BC0B-99D020D51832 + pty-632549CA-BB28-4B87-8664-F35606758BBF Toolbelt Toolbelt Proportions @@ -12084,22 +13160,28 @@ Close heightAsFraction - 1 + 0.50314465408805031 + name + Snippets + + + heightAsFraction + 0.49685534591194969 name - Command History + Notes Use Transparency Width - 1280 + 2304 Window Type - 13 + 12 X Origin - 3200 + 128 Y Origin - 0.0 + 71 diff --git a/config/.config/raycast/Raycast 2024-02-04 10.21.52.rayconfig b/config/.config/raycast/Raycast 2024-02-04 10.21.52.rayconfig new file mode 100644 index 00000000..c57746c1 Binary files /dev/null and b/config/.config/raycast/Raycast 2024-02-04 10.21.52.rayconfig differ diff --git a/fish/.config/fish/completions/artisan.fish b/fish/.config/fish/completions/artisan.fish deleted file mode 100755 index 0180a93a..00000000 --- a/fish/.config/fish/completions/artisan.fish +++ /dev/null @@ -1,14 +0,0 @@ -complete -c artisan -s h -l help -d 'Display this help message' -f -complete -c artisan -s q -l quiet -d 'Do not output any message' -f -complete -c artisan -s V -l version -d 'Display this application version' -f -complete -c artisan -s n -l no-interaction -d 'Do not ask any interactive question' -f -complete -c artisan -s v -l verbose -d 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug' -f -complete -c artisan -l ansi -d 'Force ANSI output' -f -complete -c artisan -l no-ansi -d 'Disable ANSI output' -f -complete -c artisan -l env -d 'The environment the command should run under' -f - -function __artisan_entries - php artisan --no-ansi | sed "1,/Available commands/d" | string match -i -r '\s+.+?\s+' | string trim -end - -complete -f -c artisan -a '(__artisan_entries)' diff --git a/fish/.config/fish/completions/bun.fish b/fish/.config/fish/completions/bun.fish deleted file mode 100644 index 2158790a..00000000 --- a/fish/.config/fish/completions/bun.fish +++ /dev/null @@ -1,163 +0,0 @@ -# This is terribly complicated -# It's because: -# 1. bun run has to have dynamic completions -# 2. there are global options -# 3. bun {install add remove} gets special options -# 4. I don't know how to write fish completions well -# Contributions very welcome!! - -function __fish__get_bun_bins - string split ' ' (bun getcompletes b) -end - -function __fish__get_bun_scripts - set -lx SHELL bash - set -lx MAX_DESCRIPTION_LEN 40 - string trim (string split '\n' (string split '\t' (bun getcompletes z))) -end - -function __fish__get_bun_packages - if test (commandline -ct) != "" - set -lx SHELL fish - string split ' ' (bun getcompletes a (commandline -ct)) - end -end - -function __history_completions - set -l tokens (commandline --current-process --tokenize) - history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | string replace -r \^$tokens[2]\\s\* "" | string split ' ' -end - -function __fish__get_bun_bun_js_files - string split ' ' (bun getcompletes j) -end - -function bun_fish_is_nth_token --description 'Test if current token is on Nth place' --argument-names n - set -l tokens (commandline -poc) - set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens) - test (count $tokens) -eq "$n" -end - -function __bun_command_count --argument-names n - set -l cmds (commandline -poc) - - test (count cmds) -eq "$n" -end - -function __bun_last_cmd --argument-names n - set -l cmds (commandline -poc) - - test "(cmds[-1])" = "$n" -end - -set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global -set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependenices" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder" - -set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add init link unlink pm x -set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add init pm x -set -l bun_builtin_cmds_without_bun dev create help upgrade run discord install remove add init pm x -set -l bun_builtin_cmds_without_create dev help bun upgrade discord run install remove add init pm x -set -l bun_builtin_cmds_without_install create dev help bun upgrade discord run remove add init pm x -set -l bun_builtin_cmds_without_remove create dev help bun upgrade discord run install add init pm x -set -l bun_builtin_cmds_without_add create dev help bun upgrade discord run remove install init pm x -set -l bun_builtin_cmds_without_pm create dev help bun upgrade discord run init pm x - -# clear -complete -e -c bun - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '(__fish__get_bun_scripts)' -d 'script' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bins)' -d 'package bin' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_scripts)' -d 'script' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bun_js_files)' -d 'Bun.js' -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'run' -f -d 'Run a script or bin' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'p' -l 'port' -r -d 'Port number to start server from' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'use' -r -d 'Use a framework (ex: next)' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'dev' -d 'Start dev server' -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'next' -d 'new Next.js project' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'react' -d 'new React project' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'upgrade' -d 'Upgrade bun to the latest version' -x -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '--help' -d 'See all commands and flags' -x - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -l "version" -s "v" -a '--version' -d 'Bun\'s version' -x -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x - - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); __fish_use_subcommand" -a 'bun' -d 'Generate a new bundle' - - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from bun" -F -d 'Bundle this' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create; and not __fish_seen_subcommand_from (__fish__get_bun_bins); and not __fish_seen_subcommand_from (__fish__get_bun_scripts); and __fish_seen_subcommand_from react; or __fish_seen_subcommand_from next" -F -d "Create in directory" - - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'add' -F -d 'Add a package to package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'remove' -F -d 'Remove a package from package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand add remove" -F - - -for i in (seq (count $bun_install_boolean_flags)) - complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l "$bun_install_boolean_flags[$i]" -d "$bun_install_boolean_flags_descriptions[$i]" -end - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cwd' -d 'Change working directory' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cache-dir' -d 'Choose a cache directory (default: $HOME/.bun/install/cache)' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'Popular' -a '(__fish__get_bun_packages)' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'History' -a '(__history_completions)' - -complete -c bun \ - -n "__fish_seen_subcommand_from pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) cache;" -a 'bin ls cache hash hash-print hash-string' -f - -complete -c bun \ - -n "__fish_seen_subcommand_from pm; and __fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts);" -a 'rm' -f - -complete -c bun -n "not __fish_seen_subcommand_from $bun_builtin_cmds (__fish__get_bun_bins) (__fish__get_bun_scripts)" -a "$bun_builtin_cmds" -f \ No newline at end of file diff --git a/fish/.config/fish/completions/fisher.fish b/fish/.config/fish/completions/fisher.fish deleted file mode 100644 index 6d23ce49..00000000 --- a/fish/.config/fish/completions/fisher.fish +++ /dev/null @@ -1,7 +0,0 @@ -complete --command fisher --exclusive --long help --description "Print help" -complete --command fisher --exclusive --long version --description "Print version" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins" -complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex" -complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)" diff --git a/fish/.config/fish/completions/fzf_configure_bindings.fish b/fish/.config/fish/completions/fzf_configure_bindings.fish deleted file mode 100644 index b38ef927..00000000 --- a/fish/.config/fish/completions/fzf_configure_bindings.fish +++ /dev/null @@ -1,8 +0,0 @@ -complete fzf_configure_bindings --no-files -complete fzf_configure_bindings --long help --short h --description "Print help" --condition "not __fish_seen_argument --help -h" -complete fzf_configure_bindings --long directory --description "Change the key binding for Search Directory" --condition "not __fish_seen_argument --directory" -complete fzf_configure_bindings --long git_log --description "Change the key binding for Search Git Log" --condition "not __fish_seen_argument --git_log" -complete fzf_configure_bindings --long git_status --description "Change the key binding for Search Git Status" --condition "not __fish_seen_argument --git_status" -complete fzf_configure_bindings --long history --description "Change the key binding for Search History" --condition "not __fish_seen_argument --history" -complete fzf_configure_bindings --long processes --description "Change the key binding for Search Processes" --condition "not __fish_seen_argument --processes" -complete fzf_configure_bindings --long variables --description "Change the key binding for Search Variables" --condition "not __fish_seen_argument --variables" diff --git a/fish/.config/fish/completions/gh.fish b/fish/.config/fish/completions/gh.fish deleted file mode 100644 index 80fbdebd..00000000 --- a/fish/.config/fish/completions/gh.fish +++ /dev/null @@ -1,177 +0,0 @@ -# fish completion for gh -*- shell-script -*- - -function __gh_debug - set -l file "$BASH_COMP_DEBUG_FILE" - if test -n "$file" - echo "$argv" >> $file - end -end - -function __gh_perform_completion - __gh_debug "Starting __gh_perform_completion" - - # Extract all args except the last one - set -l args (commandline -opc) - # Extract the last arg and escape it in case it is a space - set -l lastArg (string escape -- (commandline -ct)) - - __gh_debug "args: $args" - __gh_debug "last arg: $lastArg" - - # Disable ActiveHelp which is not supported for fish shell - set -l requestComp "GH_ACTIVE_HELP=0 $args[1] __complete $args[2..-1] $lastArg" - - __gh_debug "Calling $requestComp" - set -l results (eval $requestComp 2> /dev/null) - - # Some programs may output extra empty lines after the directive. - # Let's ignore them or else it will break completion. - # Ref: https://github.com/spf13/cobra/issues/1279 - for line in $results[-1..1] - if test (string trim -- $line) = "" - # Found an empty line, remove it - set results $results[1..-2] - else - # Found non-empty line, we have our proper output - break - end - end - - set -l comps $results[1..-2] - set -l directiveLine $results[-1] - - # For Fish, when completing a flag with an = (e.g., -n=) - # completions must be prefixed with the flag - set -l flagPrefix (string match -r -- '-.*=' "$lastArg") - - __gh_debug "Comps: $comps" - __gh_debug "DirectiveLine: $directiveLine" - __gh_debug "flagPrefix: $flagPrefix" - - for comp in $comps - printf "%s%s\n" "$flagPrefix" "$comp" - end - - printf "%s\n" "$directiveLine" -end - -# This function does two things: -# - Obtain the completions and store them in the global __gh_comp_results -# - Return false if file completion should be performed -function __gh_prepare_completions - __gh_debug "" - __gh_debug "========= starting completion logic ==========" - - # Start fresh - set --erase __gh_comp_results - - set -l results (__gh_perform_completion) - __gh_debug "Completion results: $results" - - if test -z "$results" - __gh_debug "No completion, probably due to a failure" - # Might as well do file completion, in case it helps - return 1 - end - - set -l directive (string sub --start 2 $results[-1]) - set --global __gh_comp_results $results[1..-2] - - __gh_debug "Completions are: $__gh_comp_results" - __gh_debug "Directive is: $directive" - - set -l shellCompDirectiveError 1 - set -l shellCompDirectiveNoSpace 2 - set -l shellCompDirectiveNoFileComp 4 - set -l shellCompDirectiveFilterFileExt 8 - set -l shellCompDirectiveFilterDirs 16 - - if test -z "$directive" - set directive 0 - end - - set -l compErr (math (math --scale 0 $directive / $shellCompDirectiveError) % 2) - if test $compErr -eq 1 - __gh_debug "Received error directive: aborting." - # Might as well do file completion, in case it helps - return 1 - end - - set -l filefilter (math (math --scale 0 $directive / $shellCompDirectiveFilterFileExt) % 2) - set -l dirfilter (math (math --scale 0 $directive / $shellCompDirectiveFilterDirs) % 2) - if test $filefilter -eq 1; or test $dirfilter -eq 1 - __gh_debug "File extension filtering or directory filtering not supported" - # Do full file completion instead - return 1 - end - - set -l nospace (math (math --scale 0 $directive / $shellCompDirectiveNoSpace) % 2) - set -l nofiles (math (math --scale 0 $directive / $shellCompDirectiveNoFileComp) % 2) - - __gh_debug "nospace: $nospace, nofiles: $nofiles" - - # If we want to prevent a space, or if file completion is NOT disabled, - # we need to count the number of valid completions. - # To do so, we will filter on prefix as the completions we have received - # may not already be filtered so as to allow fish to match on different - # criteria than the prefix. - if test $nospace -ne 0; or test $nofiles -eq 0 - set -l prefix (commandline -t | string escape --style=regex) - __gh_debug "prefix: $prefix" - - set -l completions (string match -r -- "^$prefix.*" $__gh_comp_results) - set --global __gh_comp_results $completions - __gh_debug "Filtered completions are: $__gh_comp_results" - - # Important not to quote the variable for count to work - set -l numComps (count $__gh_comp_results) - __gh_debug "numComps: $numComps" - - if test $numComps -eq 1; and test $nospace -ne 0 - # We must first split on \t to get rid of the descriptions to be - # able to check what the actual completion will be. - # We don't need descriptions anyway since there is only a single - # real completion which the shell will expand immediately. - set -l split (string split --max 1 \t $__gh_comp_results[1]) - - # Fish won't add a space if the completion ends with any - # of the following characters: @=/:., - set -l lastChar (string sub -s -1 -- $split) - if not string match -r -q "[@=/:.,]" -- "$lastChar" - # In other cases, to support the "nospace" directive we trick the shell - # by outputting an extra, longer completion. - __gh_debug "Adding second completion to perform nospace directive" - set --global __gh_comp_results $split[1] $split[1]. - __gh_debug "Completions are now: $__gh_comp_results" - end - end - - if test $numComps -eq 0; and test $nofiles -eq 0 - # To be consistent with bash and zsh, we only trigger file - # completion when there are no other completions - __gh_debug "Requesting file completion" - return 1 - end - end - - return 0 -end - -# Since Fish completions are only loaded once the user triggers them, we trigger them ourselves -# so we can properly delete any completions provided by another script. -# Only do this if the program can be found, or else fish may print some errors; besides, -# the existing completions will only be loaded if the program can be found. -if type -q "gh" - # The space after the program name is essential to trigger completion for the program - # and not completion of the program name itself. - # Also, we use '> /dev/null 2>&1' since '&>' is not supported in older versions of fish. - complete --do-complete "gh " > /dev/null 2>&1 -end - -# Remove any pre-existing completions for the program since we will be handling all of them. -complete -c gh -e - -# The call to __gh_prepare_completions will setup __gh_comp_results -# which provides the program's completion choices. -complete -c gh -n '__gh_prepare_completions' -f -a '$__gh_comp_results' - diff --git a/fish/.config/fish/completions/gt.fish b/fish/.config/fish/completions/gt.fish deleted file mode 100644 index a310ec57..00000000 --- a/fish/.config/fish/completions/gt.fish +++ /dev/null @@ -1,31 +0,0 @@ -### Installation: gt fish >> ~/.config/fish/completions/gt.fish -# git helpers adapted from fish git completion -function __fish_git_local_branches - command git for-each-ref --format='%(refname:strip=2)' refs/heads/ 2>/dev/null -end - -function __fish_git_remote_branches - command git for-each-ref --format="%(refname:strip=3)" refs/remotes/ 2>/dev/null -end - -# graphite helpers -function __gt_command_completions - set -lx SHELL (type -p fish) - set -l command (commandline -opc) - # uncomment to include options, e.g. -q, --help - # $command --get-yargs-completions - # uncomment to exclude options (default) - $command --get-yargs-completions | string replace -r '\-.*' '' -end - -# disable file completions for the entire command -complete -c gt -f - -# add completions as provided by CLI -complete -c gt -a "(__gt_command_completions)" - -# commands that take branches -complete -c gt -x -n "__fish_seen_subcommand_from checkout co bco delete dl rename rn onto --onto -o tr utr track untrack" -a "(__fish_git_local_branches)" - -# gt downstack get takes remote branches -complete -c gt -x -n "__fish_seen_subcommand_from ds dsg get g" -n "__fish_seen_subcommand_from get dsg" -a "(__fish_git_remote_branches)" diff --git a/fish/.config/fish/completions/merge.fish b/fish/.config/fish/completions/merge.fish deleted file mode 100644 index 903ac39e..00000000 --- a/fish/.config/fish/completions/merge.fish +++ /dev/null @@ -1,20 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -# Merge command - -__gitnow_load_git_functions - -complete -f -x -c merge -a '(__fish_git_branches)' - -complete -f -x -c merge \ - -s h -l help \ - -d "Show information about the options for this command" - -complete -f -x -c merge \ - -s a -l abort \ - -d "Abort conflicted merge" - -complete -f -x -c merge \ - -s c -l continue \ - -d "Continue merge" diff --git a/fish/.config/fish/completions/move.fish b/fish/.config/fish/completions/move.fish deleted file mode 100644 index 88350ae9..00000000 --- a/fish/.config/fish/completions/move.fish +++ /dev/null @@ -1,26 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -# Move command - -__gitnow_load_git_functions - -complete -f -x -c move -a '(__fish_git_branches)' - -complete -f -x -c move \ - -s h -l help \ - -d "Show information about the options for this command" - -complete -f -x -c move \ - -s p -l prev \ - -d "Switch to a previous branch using the `--no-apply-stash` option (equivalent to \"move -\")" - -complete -f -x -c move \ - -s n -l no-apply-stash \ - -a '(__fish_git_branches)' \ - -d "Switch to a local branch but without applying current stash" - -complete -f -x -c move \ - -s u -l upstream \ - -a '(__fish_git_branches)' \ - -d "Fetch a remote branch and switch to it applying current stash" diff --git a/fish/.config/fish/completions/rbenv.fish b/fish/.config/fish/completions/rbenv.fish deleted file mode 100644 index dfd97116..00000000 --- a/fish/.config/fish/completions/rbenv.fish +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2013 Sam Stephenson -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -function __fish_rbenv_needs_command - set cmd (commandline -opc) - if [ (count $cmd) -eq 1 -a $cmd[1] = 'rbenv' ] - return 0 - end - return 1 -end - -function __fish_rbenv_using_command - set cmd (commandline -opc) - if [ (count $cmd) -gt 1 ] - if [ $argv[1] = $cmd[2] ] - return 0 - end - end - return 1 -end - -complete -f -c rbenv -n '__fish_rbenv_needs_command' -a '(rbenv commands)' -for cmd in (rbenv commands) - complete -f -c rbenv -n "__fish_rbenv_using_command $cmd" -a \ - "(rbenv completions (commandline -opc)[2..-1])" -end diff --git a/fish/.config/fish/completions/tag.fish b/fish/.config/fish/completions/tag.fish deleted file mode 100644 index 7046d768..00000000 --- a/fish/.config/fish/completions/tag.fish +++ /dev/null @@ -1,31 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -# Tag command - -__gitnow_load_git_functions - -complete -f -x -c tag \ - -d "List all tags in a lexicographic order and treating tag names as versions" - -complete -f -x -c tag -a '(__fish_git_tags)' - -complete -f -x -c tag \ - -s h -l help \ - -d "Show information about the options for this command" - -complete -f -x -c tag \ - -s l -l latest \ - -d "Show only the latest Semver release tag version (no suffixed ones or others)" - -complete -f -x -c tag \ - -s x -l major \ - -d "Tag auto-incrementing a major version number" - -complete -f -x -c tag \ - -s y -l minor \ - -d "Tag auto-incrementing a minor version number" - -complete -f -x -c tag \ - -s z -l patch \ - -d "Tag auto-incrementing a patch version number" diff --git a/fish/.config/fish/conf.d/.gitnow b/fish/.config/fish/conf.d/.gitnow deleted file mode 100644 index 748ca9d5..00000000 --- a/fish/.config/fish/conf.d/.gitnow +++ /dev/null @@ -1,40 +0,0 @@ -[ options ] - -# Read text from system clipboard or from the standard input -# only when using Gitflow keybindings -clipboard = false - -[ 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 diff --git a/fish/.config/fish/conf.d/abbr.fish b/fish/.config/fish/conf.d/abbr.fish index 592f9f75..875cfb2b 100644 --- a/fish/.config/fish/conf.d/abbr.fish +++ b/fish/.config/fish/conf.d/abbr.fish @@ -5,10 +5,11 @@ if status is-interactive abbr --add brews 'brew list' abbr --add casks 'brew list --cask' abbr --add cl clear - abbr --add cls '~/Library/CloudStorage/Dropbox-RDM/Clients' + abbr --add cls '$DROPBOX/Clients' abbr --add co 'code-insiders ' abbr --add con 'code-insiders -n .' abbr --add config '~/.config/' + abbr --add local '~/.local/' abbr --add coo 'code-insiders -r .' abbr --add dls '~/Downloads/' abbr --add gems 'gem list' diff --git a/fish/.config/fish/conf.d/brew.fish b/fish/.config/fish/conf.d/brew.fish deleted file mode 100644 index 287d0469..00000000 --- a/fish/.config/fish/conf.d/brew.fish +++ /dev/null @@ -1,16 +0,0 @@ -set -l brew_paths /opt/homebrew/bin /usr/local/bin /usr/bin /bin /opt/homebrew/sbin /usr/local/sbin /usr/sbin /sbin /home/linuxbrew/.linuxbrew/bin - -for brew_path in $brew_paths - if contains $brew_path $PATH - continue - end - - if test -f $brew_path/brew - set PATH $brew_path $PATH - break - end -end - -if not type -q brew - echo "Please install 'brew' first!" -end diff --git a/fish/.config/fish/conf.d/fish-ssh-agent.fish b/fish/.config/fish/conf.d/fish-ssh-agent.fish deleted file mode 100644 index 719087a1..00000000 --- a/fish/.config/fish/conf.d/fish-ssh-agent.fish +++ /dev/null @@ -1,7 +0,0 @@ -if test -z "$SSH_ENV" - set -xg SSH_ENV $HOME/.ssh/environment -end - -if not __ssh_agent_is_started - __ssh_agent_start -end diff --git a/fish/.config/fish/conf.d/fnm.fish b/fish/.config/fish/conf.d/fnm.fish deleted file mode 100644 index ad7db57c..00000000 --- a/fish/.config/fish/conf.d/fnm.fish +++ /dev/null @@ -1,5 +0,0 @@ -# fnm -set PATH "/Users/ed/Library/Application Support/fnm" $PATH - -# automatically run fnm use -fnm env --use-on-cd | source diff --git a/fish/.config/fish/conf.d/fzf.fish b/fish/.config/fish/conf.d/fzf.fish deleted file mode 100644 index 8156c11b..00000000 --- a/fish/.config/fish/conf.d/fzf.fish +++ /dev/null @@ -1,28 +0,0 @@ -# fzf.fish is only meant to be used in interactive mode. If not in interactive mode and not in CI, skip the config to speed up shell startup -if not status is-interactive && test "$CI" != true - exit -end - -# Because of scoping rules, to capture the shell variables exactly as they are, we must read -# them before even executing _fzf_search_variables. We use psub to store the -# variables' info in temporary files and pass in the filenames as arguments. -# This variable is global so that it can be referenced by fzf_configure_bindings and in tests -set --global _fzf_search_vars_command '_fzf_search_variables (set --show | psub) (set --names | psub)' - - -# Install the default bindings, which are mnemonic and minimally conflict with fish's preset bindings -fzf_configure_bindings - -# Doesn't erase autoloaded _fzf_* functions because they are not easily accessible once key bindings are erased -function _fzf_uninstall --on-event fzf_uninstall - _fzf_uninstall_bindings - - set --erase _fzf_search_vars_command - functions --erase _fzf_uninstall _fzf_migration_message _fzf_uninstall_bindings fzf_configure_bindings - complete --erase fzf_configure_bindings - - set_color cyan - echo "fzf.fish uninstalled." - echo "You may need to manually remove fzf_configure_bindings from your config.fish if you were using custom key bindings." - set_color normal -end diff --git a/fish/.config/fish/conf.d/github-copilot-cli.fish b/fish/.config/fish/conf.d/github-copilot-cli.fish deleted file mode 100644 index 391ec5ab..00000000 --- a/fish/.config/fish/conf.d/github-copilot-cli.fish +++ /dev/null @@ -1,62 +0,0 @@ -function __fish_add_history - set -l cmd (string replace -- \n \\n (string join ' ' $argv) | string replace \\ \\\\) - if test -z $cmd - return - end - begin - echo -- '- cmd:' $cmd - and date +' when: %s' - end >>$__fish_user_data_dir/fish_history - and history merge -end - -function __copilot_what-the-shell - set TMPFILE (mktemp) - trap 'rm -f $TMPFILE' EXIT - if github-copilot-cli what-the-shell $argv --shellout $TMPFILE - if test -e $TMPFILE - set FIXED_CMD (cat $TMPFILE) - __fish_add_history $FIXED_CMD - eval $FIXED_CMD - else - echo "Apologies! Extracting command failed" - end - else - return 1 - end -end -alias '!!'='__copilot_what-the-shell' - -function __copilot_git-assist - set TMPFILE (mktemp) - trap 'rm -f $TMPFILE' EXIT - if github-copilot-cli git-assist $argv --shellout $TMPFILE - if test -e $TMPFILE - set FIXED_CMD (cat $TMPFILE) - __fish_add_history $FIXED_CMD - eval $FIXED_CMD - else - echo "Apologies! Extracting command failed" - end - else - return 1 - end -end -alias 'git!'='__copilot_git-assist' - -function __copilot_gh-assist - set TMPFILE (mktemp) - trap 'rm -f $TMPFILE' EXIT - if github-copilot-cli gh-assist $argv --shellout $TMPFILE - if test -e $TMPFILE - set FIXED_CMD (cat $TMPFILE) - __fish_add_history $FIXED_CMD - eval $FIXED_CMD - else - echo "Apologies! Extracting command failed" - end - else - return 1 - end -end -alias 'gh!'='__copilot_gh-assist' diff --git a/fish/.config/fish/conf.d/gitnow.fish b/fish/.config/fish/conf.d/gitnow.fish deleted file mode 100644 index 34690f8e..00000000 --- a/fish/.config/fish/conf.d/gitnow.fish +++ /dev/null @@ -1,713 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -set -g gitnow_version 2.12.0 - -# Default global variables -set -q GITNOW_CONFIG_FILE; or set -g GITNOW_CONFIG_FILE ~/.gitnow -set -g gitnow_commands 'all' 'assume' 'bitbucket' 'bugfix' 'commit' 'commit-all' 'feature' 'github' 'gitnow' 'hotfix' 'logs' 'merge' 'move' 'pull' 'push' 'release' 'show' 'stage' 'state' 'tag' 'unstage' 'untracked' 'upstream' - -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" - -__gitnow_load_config - -# Other specific global variables -set -g g_current_branch - -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 - 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 -end - -function stage -d "Gitnow: Stage files in current working directory" -w 'git add' - 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 -end - -function unstage -d "Gitnow: Unstage files in current working directory" -w 'git reset' - 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 -end - -function show -d "Gitnow: Show commit detail objects" -w 'git show' - 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 -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 - -end - -function commit -d "Gitnow: Commit changes to the repository" -w 'git commit' - 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 -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" -w 'git pull' - 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 -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" -w 'git push' - 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 -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 -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 -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 -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 -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 " - 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 - return - end - - # continue - if test "$v_continue"; - echo "Continue the current merge" - command git merge --continue - return - end - - # No branch defined - if not test -n "$v_branch" - echo "Provide a valid branch name to merge." - 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." - - 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." - return - end - - command git merge $v_branch -end - -function move -d "GitNow: Switch from current branch to another but stashing uncommitted changes" -a args - 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 - set -l v_prev - - 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 -p --prev - set v_prev "true" - case -h --help - echo "NAME" - echo " Gitnow: move - Switch from current branch to another but stashing uncommitted changes" - echo "EXAMPLES" - echo " move " - echo " move -" - 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 " -p --prev Switch to a previous branch if different than the current one (equivalent to \"move -\"). It uses `--no-apply-stash` option by default." - echo " -h --help Show information about the options for this command" - return - case -\* - case '*' - set v_branch $v - end - end - - # Move to prev branch either via the --prev option or the "-" shorthand char - if begin test -n "$v_prev"; or [ "$args" = "-" ]; end - if begin test -z "$g_current_branch"; or [ "$g_current_branch" = (__gitnow_current_branch_name) ]; end - echo "Previous branch not found or the same as current one. Nothing to do." - echo "Tip: Previous branch switching only works via the `move` command." - return - end - - echo "Previous branch found, switching to `$g_current_branch` (using `--no-apply-stash` option)." - move -n $g_current_branch - return - end - - # No branch defined - if not test -n "$v_branch" - echo "Provide a valid branch name to switch to." - 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 - 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." - 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." - 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 - - set g_current_branch (__gitnow_current_branch_name) - command git checkout $v_branch - - # --no-apply-stash - if test -n "$v_no_apply_stash" - echo "Changes were stashed but not applied by default. 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 were applied." - end -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 " - 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 -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" -end - -function bitbucket -d "Gitnow: Clone a Bitbucket Cloud repository using SSH" - set -l repo (__gitnow_clone_params $argv) - __gitnow_clone_repo $repo "bitbucket" -end diff --git a/fish/.config/fish/conf.d/paths.fish b/fish/.config/fish/conf.d/paths.fish index 7c843a30..51b3e424 100644 --- a/fish/.config/fish/conf.d/paths.fish +++ b/fish/.config/fish/conf.d/paths.fish @@ -2,6 +2,17 @@ set -e fish_user_paths ## ADD to PATH ## +# set XDG Base Directory Specification - there could be a better way to do this +set -gx XDG_CACHE_HOME $HOME/.cache +set -gx XDG_CONFIG_HOME $HOME/.config +set -gx XDG_DATA_HOME $HOME/.local/share +set -gx XDG_DESKTOP_DIR $HOME/Desktop +set -gx XDG_DOWNLOAD_DIR $HOME/Downloads +set -gx XDG_DOCUMENTS_DIR $HOME/Documents +set -gx XDG_MUSIC_DIR $HOME/Music +set -gx XDG_PICTURES_DIR $HOME/Pictures +set -gx XDG_VIDEOS_DIR $HOME/Videos + # Homebrew generated by `brew shellenv` set -gx HOMEBREW_PREFIX /opt/homebrew set -gx HOMEBREW_CELLAR /opt/homebrew/Cellar diff --git a/fish/.config/fish/conf.d/pisces.fish b/fish/.config/fish/conf.d/pisces.fish deleted file mode 100644 index b0986947..00000000 --- a/fish/.config/fish/conf.d/pisces.fish +++ /dev/null @@ -1,42 +0,0 @@ -set -l _pisces_bind_mode default -switch $fish_key_bindings - case 'fish_vi_key_bindings' 'fish_hybrid_key_bindings' - set _pisces_bind_mode insert -end - -set -q pisces_pairs -or set -U pisces_pairs '(,)' '[,]' '{,}' '","' "','" - -for pair in $pisces_pairs - _pisces_bind_pair $_pisces_bind_mode (string split -- ',' $pair) -end - -# normal backspace, also known as \010 or ^H: -bind -M $_pisces_bind_mode \b _pisces_backspace -# Terminal.app sends DEL code on ⌫: -bind -M $_pisces_bind_mode \177 _pisces_backspace - -# overrides TAB to provide completion of vars before a closing '"' -bind -M $_pisces_bind_mode \t _pisces_complete - - -function _pisces_uninstall --on-event pisces_uninstall - # NOTE: won't work as expected if user has changed the mode after installation - set -l _pisces_bind_mode default - switch $fish_key_bindings - case 'fish_vi_key_bindings' 'fish_hybrid_key_bindings' - set _pisces_bind_mode insert - end - - for pair in $pisces_pairs - for c in (string split -- ',' $pair) - bind -e -M $_pisces_bind_mode $c - end - end - - bind -M $_pisces_bind_mode \b backward-delete-char - bind -M $_pisces_bind_mode \177 backward-delete-char - bind -M $_pisces_bind_mode \t complete - - set -e pisces_pairs -end diff --git a/fish/.config/fish/conf.d/sponge.fish b/fish/.config/fish/conf.d/sponge.fish deleted file mode 100644 index e37fe384..00000000 --- a/fish/.config/fish/conf.d/sponge.fish +++ /dev/null @@ -1,52 +0,0 @@ -# Sponge version -set --global sponge_version 1.1.0 - -# Allow to repeat previous command by default -if not set --query --universal sponge_delay - set --universal sponge_delay 2 -end - -# Purge entries both after `sponge_delay` entries and on exit by default -if not set --query --universal sponge_purge_only_on_exit - set --universal sponge_purge_only_on_exit false -end - -# Add default filters -if not set --query --universal sponge_filters - set --universal sponge_filters sponge_filter_failed sponge_filter_matched -end - -# Don't filter out commands that already have been in the history by default -if not set --query --universal sponge_allow_previously_successful - set --universal sponge_allow_previously_successful true -end - -# Consider `0` the only successful exit code by default -if not set --query --universal sponge_successful_exit_codes - set --universal sponge_successful_exit_codes 0 -end - -# No active regex patterns by default -if not set --query --universal sponge_regex_patterns - set --universal sponge_regex_patterns -end - -# Attach event handlers -functions --query \ - _sponge_on_prompt \ - _sponge_on_preexec \ - _sponge_on_postexec \ - _sponge_on_exit - -# Initialize empty state for the first run -function _sponge_install --on-event sponge_install - set --global _sponge_current_command '' - set --global _sponge_current_command_exit_code 0 - set --global _sponge_current_command_previously_in_history false -end - -# Clean up variables -function _sponge_uninstall --on-event sponge_uninstall - _sponge_clear_state - set --erase sponge_version -end diff --git a/fish/.config/fish/conf.d/variables.fish b/fish/.config/fish/conf.d/variables.fish index e16a1ca1..1ce2c4a2 100644 --- a/fish/.config/fish/conf.d/variables.fish +++ b/fish/.config/fish/conf.d/variables.fish @@ -1,7 +1,9 @@ # set Visual Studio Code as default editor use code, code-insiders, subl or vim -set -x --global EDITOR code-insiders -w -# set -x --global EDITOR nvim -w +set -gx EDITOR code-insiders -w + string match -q "$TERM_PROGRAM" vscode and . (code --locate-shell-integration-path fish) -#set primary volume for workstation -set -x --global VOL xxx + +# Volumes +set -gx VOL xxx +set -gx DROPBOX $HOME/Library/CloudStorage/Dropbox-RDM diff --git a/fish/.config/fish/conf.d/zoxide.fish b/fish/.config/fish/conf.d/zoxide.fish deleted file mode 100644 index 169e2aff..00000000 --- a/fish/.config/fish/conf.d/zoxide.fish +++ /dev/null @@ -1,26 +0,0 @@ -if ! status is-interactive || - ! command --query zoxide - exit -end - -functions --query __zoxide_cd_internal || functions --copy cd __zoxide_cd_internal - -set --query zoxide_hook || set --local zoxide_hook --on-variable PWD -if test -n "$zoxide_hook" - function __zoxide_hook $zoxide_hook - test -z "$fish_private_mode" - and command zoxide add -- (__zoxide_pwd) - end -end - -set --query zoxide_cmd || set --local zoxide_cmd z -if test -n "$zoxide_cmd" - function $zoxide_cmd - __zoxide_z $argv - end - complete $zoxide_cmd --no-files -a '(__zoxide_z_complete)' - - function "$zoxide_cmd"i - __zoxide_zi $argv - end -end diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index d55e2641..9a64ef59 100755 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -7,7 +7,3 @@ source ~/.config/fish/conf.d/abbr.fish # Prompt - Starship starship init fish | source - -# 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/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins index 39e0b296..8afa4244 100644 --- a/fish/.config/fish/fish_plugins +++ b/fish/.config/fish/fish_plugins @@ -1,11 +1,11 @@ +jorgebucaran/fisher oh-my-fish/plugin-brew tuvistavie/fish-ssh-agent -jorgebucaran/fisher kidonng/zoxide.fish patrickf1/fzf.fish meaningful-ooo/sponge z11i/github-copilot-cli.fish -edheltzel/fisher-plugin-macos joseluisq/gitnow laughedelic/pisces james2doyle/omf-plugin-artisan +edheltzel/fisher-plugin-macos diff --git a/fish/.config/fish/functions/__gitnow_check_if_branch_exist.fish b/fish/.config/fish/functions/__gitnow_check_if_branch_exist.fish deleted file mode 100644 index a398c57e..00000000 --- a/fish/.config/fish/functions/__gitnow_check_if_branch_exist.fish +++ /dev/null @@ -1,20 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_check_if_branch_exist - set -l xfound 0 - - if test (count $argv) -eq 1 - set -l xbranch $argv[1] - set -l xbranch_list (__gitnow_current_branch_list) - - for b in $xbranch_list - if [ "$xbranch" = "$b" ] - set xfound 1 - break - end - end - end - - echo $xfound -end diff --git a/fish/.config/fish/functions/__gitnow_clone_msg.fish b/fish/.config/fish/functions/__gitnow_clone_msg.fish deleted file mode 100644 index 9e3eb78e..00000000 --- a/fish/.config/fish/functions/__gitnow_clone_msg.fish +++ /dev/null @@ -1,17 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_clone_msg - set -l msg $argv[1] - - echo "Repository name is required!" - echo "Example: $msg your-repo-name" - echo "Usages:" - echo " a) $msg username/repo-name" - echo " b) $msg username repo-name" - echo " c) $msg repo-name" - echo " For this, it's necessary to set your $msg username (login)" - echo " to global config before like: " - echo " git config --global user.$msg \"your-username\"" - echo -end diff --git a/fish/.config/fish/functions/__gitnow_clone_params.fish b/fish/.config/fish/functions/__gitnow_clone_params.fish deleted file mode 100644 index c308cfd6..00000000 --- a/fish/.config/fish/functions/__gitnow_clone_params.fish +++ /dev/null @@ -1,18 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_clone_params - set -l repo - - if count $argv >/dev/null - if test (count $argv) -gt 1 - set repo $argv[1]/$argv[2] - else if echo $argv | LC_ALL=C command grep -q -E '^([a-zA-Z0-9\_\-]+)\/([a-zA-Z0-9\_\-]+)$' - set repo $argv - else - set repo "%S/$argv" - end - end - - echo $repo -end diff --git a/fish/.config/fish/functions/__gitnow_clone_repo.fish b/fish/.config/fish/functions/__gitnow_clone_repo.fish deleted file mode 100644 index 5f5e4a09..00000000 --- a/fish/.config/fish/functions/__gitnow_clone_repo.fish +++ /dev/null @@ -1,41 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_clone_repo - set -l repo $argv[1] - set -l platform $argv[2] - - if test -n "$repo" - set -l ok 1 - - if echo $repo | LC_ALL=C command grep -q -E '^[\%S].+' - set -l user (command git config --global user.$platform) - - if test -n "$user" - set -l repor (echo $repo | LC_ALL=C command sed -e "s/^%S/$user/") - set repo $repor - else - set ok 0 - end - end - - if test $ok -eq 1 - if [ "$platform" = "github" ] - set url github.com - end - - if [ "$platform" = "bitbucket" ] - set url bitbucket.org - end - - set -l repo_url git@$url:$repo.git - - echo "📦 Remote repository: $repo_url" - command git clone $repo_url - else - __gitnow_clone_msg $platform - end - else - __gitnow_clone_msg $platform - end -end diff --git a/fish/.config/fish/functions/__gitnow_current_branch_list.fish b/fish/.config/fish/functions/__gitnow_current_branch_list.fish deleted file mode 100644 index 724861f6..00000000 --- a/fish/.config/fish/functions/__gitnow_current_branch_list.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_current_branch_list - command git branch --list --no-color | LC_ALL=C command sed -E "s/^(\*?[ \t]*)//g" 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_current_branch_name.fish b/fish/.config/fish/functions/__gitnow_current_branch_name.fish deleted file mode 100644 index e242c3ac..00000000 --- a/fish/.config/fish/functions/__gitnow_current_branch_name.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_current_branch_name - command git symbolic-ref --short HEAD 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_current_remote.fish b/fish/.config/fish/functions/__gitnow_current_remote.fish deleted file mode 100644 index 7b99a737..00000000 --- a/fish/.config/fish/functions/__gitnow_current_remote.fish +++ /dev/null @@ -1,7 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_current_remote - set -l branch_name (__gitnow_current_branch_name) - command git config "branch.$branch_name.remote" 2>/dev/null; or echo origin -end diff --git a/fish/.config/fish/functions/__gitnow_get_clip_program.fish b/fish/.config/fish/functions/__gitnow_get_clip_program.fish deleted file mode 100644 index fc522136..00000000 --- a/fish/.config/fish/functions/__gitnow_get_clip_program.fish +++ /dev/null @@ -1,18 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_get_clip_program -d "Gets the current clip installed program" - set -l v_paste - - if type -q xclip - set v_paste "xclip -selection clipboard -o" - else if type -q wl-clipboard - set v_paste "wl-paste" - else if type -q xsel - set v_paste "xsel --clipboard --output" - else if type -q pbpaste - set v_paste "pbpaste" - end - - echo -n $v_paste -end diff --git a/fish/.config/fish/functions/__gitnow_get_latest_semver_release_tag.fish b/fish/.config/fish/functions/__gitnow_get_latest_semver_release_tag.fish deleted file mode 100644 index cf0875f7..00000000 --- a/fish/.config/fish/functions/__gitnow_get_latest_semver_release_tag.fish +++ /dev/null @@ -1,11 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_get_latest_semver_release_tag - for tg in (__gitnow_get_tags_ordered) - if echo $tg | LC_ALL=C command grep -qE '^v?([0-9]+).([0-9]+).([0-9]+)$' - echo $tg 2>/dev/null - break - end - end -end diff --git a/fish/.config/fish/functions/__gitnow_get_latest_tag.fish b/fish/.config/fish/functions/__gitnow_get_latest_tag.fish deleted file mode 100644 index 76883371..00000000 --- a/fish/.config/fish/functions/__gitnow_get_latest_tag.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_get_latest_tag - command git tag --sort=-creatordate | head -n1 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_get_tags_ordered.fish b/fish/.config/fish/functions/__gitnow_get_tags_ordered.fish deleted file mode 100644 index 0d6a7565..00000000 --- a/fish/.config/fish/functions/__gitnow_get_tags_ordered.fish +++ /dev/null @@ -1,8 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -# lexicographic order and tag names treated as versions -# https://stackoverflow.com/a/52680984/2510591 -function __gitnow_get_tags_ordered - command git -c 'versionsort.suffix=-' tag --list --sort=-version:refname -end diff --git a/fish/.config/fish/functions/__gitnow_get_valid_semver_prerelease_value.fish b/fish/.config/fish/functions/__gitnow_get_valid_semver_prerelease_value.fish deleted file mode 100644 index ab6efc57..00000000 --- a/fish/.config/fish/functions/__gitnow_get_valid_semver_prerelease_value.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_get_valid_semver_prerelease_value -a tagv - command echo $tagv | LC_ALL=C command sed -n 's/^v\\{0,1\\}\([0-9].[0-9].[0-9]-[a-zA-Z0-9\-_.]*\)\([}]*\)/\1/p' 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_get_valid_semver_release_value.fish b/fish/.config/fish/functions/__gitnow_get_valid_semver_release_value.fish deleted file mode 100644 index 88e3ac35..00000000 --- a/fish/.config/fish/functions/__gitnow_get_valid_semver_release_value.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_get_valid_semver_release_value -a tagv - command echo $tagv | LC_ALL=C command sed -n 's/^v\\{0,1\\}\([0-9].[0-9].[0-9]*\)\([}]*\)/\1/p' 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_gitflow_branch.fish b/fish/.config/fish/functions/__gitnow_gitflow_branch.fish deleted file mode 100644 index cd808e7c..00000000 --- a/fish/.config/fish/functions/__gitnow_gitflow_branch.fish +++ /dev/null @@ -1,16 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_gitflow_branch -a xprefix -a xbranch - set xbranch (__gitnow_slugify $xbranch) - set -l xbranch_full "$xprefix/$xbranch" - set -l xfound (__gitnow_check_if_branch_exist $xbranch_full) - - if test $xfound -eq 1 - echo "Branch `$xbranch_full` already exists. Nothing to do." - else - command git stash - __gitnow_new_branch_switch "$xbranch_full" - command git stash pop - end -end diff --git a/fish/.config/fish/functions/__gitnow_has_uncommited_changes.fish b/fish/.config/fish/functions/__gitnow_has_uncommited_changes.fish deleted file mode 100644 index 310ae3d8..00000000 --- a/fish/.config/fish/functions/__gitnow_has_uncommited_changes.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_has_uncommited_changes - command git diff-index --quiet HEAD -- || echo "1" 2>&1 -end diff --git a/fish/.config/fish/functions/__gitnow_increment_number.fish b/fish/.config/fish/functions/__gitnow_increment_number.fish deleted file mode 100644 index 015463df..00000000 --- a/fish/.config/fish/functions/__gitnow_increment_number.fish +++ /dev/null @@ -1,12 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_increment_number -a strv - command echo $strv | LC_ALL=C command awk ' - function increment(val) { - if (val ~ /[0-9]+/) { return val + 1 } - return val - } - { print increment($0) } - ' 2>/dev/null -end diff --git a/fish/.config/fish/functions/__gitnow_is_git_repository.fish b/fish/.config/fish/functions/__gitnow_is_git_repository.fish deleted file mode 100644 index dae8c0ad..00000000 --- a/fish/.config/fish/functions/__gitnow_is_git_repository.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_is_git_repository - command git rev-parse --git-dir >/dev/null 2>&1 -end diff --git a/fish/.config/fish/functions/__gitnow_is_number.fish b/fish/.config/fish/functions/__gitnow_is_number.fish deleted file mode 100644 index afde0584..00000000 --- a/fish/.config/fish/functions/__gitnow_is_number.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_is_number -a strv - command echo -n $strv | LC_ALL=C command grep -qE '^([0-9]+)$' -end diff --git a/fish/.config/fish/functions/__gitnow_load_config.fish b/fish/.config/fish/functions/__gitnow_load_config.fish deleted file mode 100644 index 11a6e790..00000000 --- a/fish/.config/fish/functions/__gitnow_load_config.fish +++ /dev/null @@ -1,180 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_load_config -d "Reads the GitNow configuration file" - # Sets a clipboard program - set g_xpaste (__gitnow_get_clip_program) - - # Config file path used by default - set -l config_file "$fish_snippets/.gitnow" - - # Download the default `.gitnow` file. - # NOTE: this is only used as a workaround for Fisher. - # See https://github.com/jorgebucaran/fisher/pull/573 - if not test -e $config_file - curl -sSo $config_file https://raw.githubusercontent.com/joseluisq/gitnow/master/conf.d/.gitnow - end - - # Prefer custom config file if it exists - if test -e $GITNOW_CONFIG_FILE - set config_file $GITNOW_CONFIG_FILE - else if not test -e $config_file - # Otherwise checks if default `.gitnow` file exists, - # if doesn't exist then skip out file parsing - return - end - - # Parse `.gitnow` file content - - # 2 = keybindings - # 3 = options - set -l v_section 0 - - # Valid sections - set -l v_keybindings "keybindings" - set -l v_options "options" - - # Options set - set -l v_clipboard 0 - - # Loop every line - while read -la l - set -l v_str "" - set -l v_comment 0 - set -l v_command_sep 0 - set -l v_command_key "" - set -l v_command_val "" - - # Loop every char for current line - echo $l | while read -n 1 -la c; - switch $c - case '[' - if test $v_comment -eq 1; continue; end - - # if test $v_section -gt 0 - # set v_section 0 - # continue - # end - - # Start section - if test $v_section -eq 0; set v_section 1; end - case ']' - if test $v_comment -eq 1; continue; end - - # Check section name - if test $v_section -eq 1 - # options - if [ "$v_str" = "$v_options" ] - set v_section 3 - continue - end - - # keybindings - if [ "$v_str" = "$v_keybindings" ] - set v_section 2 - continue - end - end - - set v_section 0 - case ' ' - case '\n' - case '\t' - case '\r' - continue - case '#' - if test $v_comment -eq 0; set v_comment 1; end - continue - case '*' - if test $v_comment -eq 1; continue; end - - # If section has started then accumulate chars and continue - if test $v_section -eq 1 - set v_str "$v_str$c" - continue - end - - # A [ abcde ] section is found so proceed with chars handling - # NOTE: only alphabetic and hyphens chars are allowed - if test $v_section -eq 2; or test $v_section -eq 3 - switch $c - case 'a' 'b' 'c' 'd' 'e' 'f' 'g' 'h' 'i' 'j' 'k' 'l' 'm' 'n' 'o' 'p' 'q' 'r' 's' 't' 'u' 'v' 'w' 'x' 'y' 'z' '-' - if test $v_command_sep -eq 0 - set v_command_key "$v_command_key$c" - continue - end - - if test $v_command_sep -eq 2 - set v_command_val "$v_command_val$c" - continue - end - case \\ - if test $v_command_sep -eq 1 - set v_command_sep 2 - end - continue - case '=' - set v_command_sep 1 - if test $v_section -eq 3 - set v_command_sep 2 - continue - end - case '*' - continue - end - end - end - end - - # 1. Handle options set - if test $v_section -eq 3 - switch $v_command_key - # Clipboard option - case 'clipboard' - if [ "$v_command_val" = "true" ] - set v_clipboard 1 - end - # NOTE: handle future new options using a new case - case '*' - continue - end - # continue loop after current option processed - set v_section 0 - continue - end - - # 2. Handle keybindings set - if not [ "$v_command_key" = "" ]; and not [ "$v_command_val" = "" ] - set -l cmd - - switch $v_command_key - case 'release' 'hotfix' 'feature' 'bugfix' - # Read text from clipboard if there is a valid clipboard program - # and if the "clipboard" option is "true" - if test -n $g_xpaste; and test $v_clipboard -eq 1 - set cmd (echo -n "bind \\$v_command_val \"echo; if $v_command_key ($g_xpaste); commandline -f repaint; else ; end\"") - else - # Otherwise read text from standard input - set cmd (echo -n "bind \\$v_command_val \"echo; if $v_command_key (read); commandline -f repaint; else ; end\"") - end - case '*' - # Check command key against a list of valid commands - set -l v_valid 0 - for v in $gitnow_commands - if [ "$v" = "$v_command_key" ] - set v_valid 1 - break - end - end - - # If command key is not valid then just skip out - if test $v_valid -eq 0; continue; end - - set cmd (echo -n "bind \\$v_command_val \"echo; $v_command_key; commandline -f repaint;\"") - end - - eval $cmd - end - - end < $config_file -end diff --git a/fish/.config/fish/functions/__gitnow_load_git_functions.fish b/fish/.config/fish/functions/__gitnow_load_git_functions.fish deleted file mode 100644 index f7cbd2f0..00000000 --- a/fish/.config/fish/functions/__gitnow_load_git_functions.fish +++ /dev/null @@ -1,8 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_load_git_functions -d "Gitnow: Load fish git functions on demand" - if begin not type -q __fish_git_branches; or not type -q __fish_git_tags; end - source $__fish_data_dir/completions/git.fish - end -end diff --git a/fish/.config/fish/functions/__gitnow_manual.fish b/fish/.config/fish/functions/__gitnow_manual.fish deleted file mode 100644 index ec11d5c7..00000000 --- a/fish/.config/fish/functions/__gitnow_manual.fish +++ /dev/null @@ -1,115 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_manual -d "Gitnow: Manual page like" - echo (set_color --bold)"NAME"(set_color normal) - echo " GitNow — Speed up your Git workflow. 🐠" - echo - echo (set_color --bold)"VERSION"(set_color normal) - echo " $gitnow_version" - echo - echo (set_color --bold)"DESCRIPTION"(set_color normal) - echo " GitNow contains a rich command set that provides high-level operations on the top of Git(1)." - echo " A Fish Shell(2) alternative inspired by git-friendly(3)." - echo - echo " (1) https://git-scm.com/" - echo " (2) https://fishshell.com/" - echo " (3) https://github.com/jamiew/git-friendly" - echo - echo (set_color --bold)"COMMANDS"(set_color normal) - echo " "(set_color --bold)"state"(set_color normal) - echo " Show the working tree status in a compact way." - echo - echo " "(set_color --bold)"stage"(set_color normal) - echo " Stage files in the current working directory." - echo - echo " "(set_color --bold)"unstage"(set_color normal) - echo " Unstage files in the current working directory." - echo - echo " "(set_color --bold)"show"(set_color normal) - echo " Show commit detail objects." - echo - echo " "(set_color --bold)"untracked"(set_color normal) - echo " Check for untracked files and directories that could be removed." - echo - echo " "(set_color --bold)"commit"(set_color normal) - echo " Commit changes to the current repository." - echo - echo " "(set_color --bold)"commit-all"(set_color normal) - echo " Add and commit all changes to the current repository." - echo - echo " "(set_color --bold)"pull"(set_color normal) - echo " Pull changes from remote server but auto-stashing uncommitted changes." - echo - echo " "(set_color --bold)"push"(set_color normal) - echo " Push commit changes to the current remote repository." - echo - echo " "(set_color --bold)"upstream"(set_color normal) - echo " Commit all changes and push them to the current remote server." - echo - echo " "(set_color --bold)"move"(set_color normal) - echo " Switch from current branch to another but stashing uncommitted changes." - echo - echo " "(set_color --bold)"merge"(set_color normal) - echo " Merge given branch into the active one" - echo - echo " "(set_color --bold)"tag"(set_color normal) - echo " List and create release tag versions following Semver 2.0." - echo - echo " "(set_color --bold)"assume"(set_color normal) - echo " Ignore changes in certain files temporarily." - echo - echo " "(set_color --bold)"feature"(set_color normal) - echo " Create a new Gitflow feature branch from the current branch." - echo - echo " "(set_color --bold)"hotfix"(set_color normal) - echo " Create a new Gitflow hotfix branch from the current branch." - echo - echo " "(set_color --bold)"bugfix"(set_color normal) - echo " Create a new Gitflow bugfix branch from the current branch." - echo - echo " "(set_color --bold)"release"(set_color normal) - echo " Create a new Gitflow release branch from the current branch." - echo - echo " "(set_color --bold)"logs"(set_color normal) - echo " Show logs in a fancy way." - echo - echo " "(set_color --bold)"github"(set_color normal) - echo " Clone a GitHub repository over SSH." - echo - echo " "(set_color --bold)"bitbucket"(set_color normal) - echo " Clone a Bitbucket Cloud repository over SSH." - echo - echo (set_color --bold)"KEYBINDINGS"(set_color normal) - echo " state Alt + S" - echo " stage Alt + E" - echo " unstage Ctrl + E" - echo " show Alt + M" - echo " commit-all Alt + C" - echo " pull Alt + D" - echo " push Alt + P" - echo " upstream Alt + U" - echo " feature(1) Alt + F" - echo " hotfix(1) Alt + H" - echo " logs Alt + L" - echo - echo " (1) This command key binding will creates a new branch taking as name some text of the clipboard." - echo - echo (set_color --bold)"CONFIGURATION"(set_color normal) - echo " For a custom configuration (for example keybindings) place a "(set_color --bold)"~/.gitnow"(set_color normal)" file (1) in your home directory." - echo - echo " (1) An example file it can be found on "(set_color --bold)https://github.com/joseluisq/gitnow/tree/master/.gitnow(set_color normal) - echo - echo (set_color --bold)"FURTHER DOCUMENTATION"(set_color normal) - echo " For more details and examples check out "(set_color --bold)https://github.com/joseluisq/gitnow/blob/master/README.md(set_color normal) - echo - echo (set_color --bold)"CONTRIBUTIONS"(set_color normal) - echo " Send bug reports or pull requests to "(set_color --bold)https://github.com/joseluisq/gitnow(set_color normal) - echo - echo (set_color --bold)"LICENSE"(set_color normal) - echo " GitNow licensed under the MIT License "(set_color --bold)https://github.com/joseluisq/gitnow/blob/master/LICENSE.md(set_color normal) - echo - echo (set_color --bold)"AUTHOR"(set_color normal) - echo " (c) 2016-present Jose Quintana "(set_color --bold)"https://github.com/joseluisq"(set_color normal) - echo -end diff --git a/fish/.config/fish/functions/__gitnow_msg_not_valid_repository.fish b/fish/.config/fish/functions/__gitnow_msg_not_valid_repository.fish deleted file mode 100644 index 8eb755b4..00000000 --- a/fish/.config/fish/functions/__gitnow_msg_not_valid_repository.fish +++ /dev/null @@ -1,6 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_msg_not_valid_repository -a cmd - echo "Gitnow ($cmd): Current directory is not a valid Git repository." -end diff --git a/fish/.config/fish/functions/__gitnow_new_branch_switch.fish b/fish/.config/fish/functions/__gitnow_new_branch_switch.fish deleted file mode 100644 index 09850b2d..00000000 --- a/fish/.config/fish/functions/__gitnow_new_branch_switch.fish +++ /dev/null @@ -1,14 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -function __gitnow_new_branch_switch - set -l branch_name $argv[1] - - if test (count $argv) -eq 1 - set branch_name $branch_name - - command git checkout -b $branch_name - else - echo "Provide a branch name." - end -end diff --git a/fish/.config/fish/functions/__gitnow_slugify.fish b/fish/.config/fish/functions/__gitnow_slugify.fish deleted file mode 100644 index 6ca6dbe0..00000000 --- a/fish/.config/fish/functions/__gitnow_slugify.fish +++ /dev/null @@ -1,7 +0,0 @@ -# GitNow — Speed up your Git workflow. 🐠 -# https://github.com/joseluisq/gitnow - -# adapted from https://gist.github.com/oneohthree/f528c7ae1e701ad990e6 -function __gitnow_slugify - echo $argv | LC_ALL=C command iconv -t ascii//TRANSLIT | LC_ALL=C command sed -E 's/[^a-zA-Z0-9\-]+/_/g' | LC_ALL=C command sed -E 's/^(-|_)+|(-|_)+$//g' -end diff --git a/fish/.config/fish/functions/__ssh_agent_is_started.fish b/fish/.config/fish/functions/__ssh_agent_is_started.fish deleted file mode 100644 index 7d481ee0..00000000 --- a/fish/.config/fish/functions/__ssh_agent_is_started.fish +++ /dev/null @@ -1,14 +0,0 @@ -function __ssh_agent_is_started -d "check if ssh agent is already started" - if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end - source $SSH_ENV > /dev/null - end - - if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end - return 1 - end - - ssh-add -l > /dev/null 2>&1 - if test $status -eq 2 - return 1 - end -end diff --git a/fish/.config/fish/functions/__ssh_agent_start.fish b/fish/.config/fish/functions/__ssh_agent_start.fish deleted file mode 100644 index 3766fe49..00000000 --- a/fish/.config/fish/functions/__ssh_agent_start.fish +++ /dev/null @@ -1,5 +0,0 @@ -function __ssh_agent_start -d "start a new ssh agent" - ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV - chmod 600 $SSH_ENV - source $SSH_ENV > /dev/null -end diff --git a/fish/.config/fish/functions/__zoxide_cd.fish b/fish/.config/fish/functions/__zoxide_cd.fish deleted file mode 100644 index d5a8b2b5..00000000 --- a/fish/.config/fish/functions/__zoxide_cd.fish +++ /dev/null @@ -1,6 +0,0 @@ -function __zoxide_cd - __zoxide_cd_internal $argv - if test "$_ZO_ECHO" = 1 - __zoxide_pwd - end -end diff --git a/fish/.config/fish/functions/__zoxide_pwd.fish b/fish/.config/fish/functions/__zoxide_pwd.fish deleted file mode 100644 index 49f93572..00000000 --- a/fish/.config/fish/functions/__zoxide_pwd.fish +++ /dev/null @@ -1,7 +0,0 @@ -function __zoxide_pwd - if test "$_ZO_RESOLVE_SYMLINKS" = 1 - builtin pwd -P - else - builtin pwd -L - end -end diff --git a/fish/.config/fish/functions/__zoxide_z.fish b/fish/.config/fish/functions/__zoxide_z.fish deleted file mode 100644 index bb24f69a..00000000 --- a/fish/.config/fish/functions/__zoxide_z.fish +++ /dev/null @@ -1,13 +0,0 @@ -function __zoxide_z - set --local argc (count $argv) - if test $argc -eq 0 - __zoxide_cd $HOME - else if test "$argv" = - - __zoxide_cd - - else if test $argc -eq 1 -a -d $argv[1] - __zoxide_cd $argv[1] - else - set --local result (command zoxide query --exclude (__zoxide_pwd) -- $argv) - and __zoxide_cd $result - end -end diff --git a/fish/.config/fish/functions/__zoxide_z_complete.fish b/fish/.config/fish/functions/__zoxide_z_complete.fish deleted file mode 100644 index 9e6196f9..00000000 --- a/fish/.config/fish/functions/__zoxide_z_complete.fish +++ /dev/null @@ -1,15 +0,0 @@ -function __zoxide_z_complete - set --local tokens (commandline --current-process --tokenize) - set --local curr_tokens (commandline --cut-at-cursor --current-process --tokenize) - - if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1 - # If there are < 2 arguments, use `cd` completions. - __fish_complete_directories "$tokens[2]" '' - else if test (count $tokens) -eq (count $curr_tokens) - # If the last argument is empty, use interactive selection. - set --local query $tokens[2..-1] - set --local result (zoxide query --interactive -- $query) - commandline --current-process "$tokens[1] "(string escape $result) - commandline --function repaint - end -end diff --git a/fish/.config/fish/functions/__zoxide_zi.fish b/fish/.config/fish/functions/__zoxide_zi.fish deleted file mode 100644 index 35837ac7..00000000 --- a/fish/.config/fish/functions/__zoxide_zi.fish +++ /dev/null @@ -1,4 +0,0 @@ -function __zoxide_zi - set --local result (command zoxide query --interactive -- $argv) - and __zoxide_cd $result -end diff --git a/fish/.config/fish/functions/_aliases.fish b/fish/.config/fish/functions/_aliases.fish index 723e0c5e..01df75b1 100755 --- a/fish/.config/fish/functions/_aliases.fish +++ b/fish/.config/fish/functions/_aliases.fish @@ -133,7 +133,7 @@ end # Git and Repositiory shortcuts # Github PR checkout with search and preview -function ghpr +function ghprcheck set_color red if test (command -v git); and git rev-parse --is-inside-work-tree >/dev/null 2>&1 GH_FORCE_TTY=100% gh pr list | fzf --ansi --preview 'GH_FORCE_TTY=100% gh issue view {1}' --preview-window down --header-lines 3 | awk '{print $1}' | xargs gh pr checkout diff --git a/fish/.config/fish/functions/_fzf_configure_bindings_help.fish b/fish/.config/fish/functions/_fzf_configure_bindings_help.fish deleted file mode 100644 index ecfe68ec..00000000 --- a/fish/.config/fish/functions/_fzf_configure_bindings_help.fish +++ /dev/null @@ -1,43 +0,0 @@ -function _fzf_configure_bindings_help --description "Prints the help message for fzf_configure_bindings." - echo "\ -USAGE: - fzf_configure_bindings [--COMMAND=[KEY_SEQUENCE]...] - -DESCRIPTION - fzf_configure_bindings installs key bindings for fzf.fish's commands and erases any bindings it - previously installed. It installs bindings for both default and insert modes. fzf.fish executes - it without options on fish startup to install the out-of-the-box key bindings. - - By default, commands are bound to a mnemonic key sequence, shown below. Each command's binding - can be configured using a namesake corresponding option: - COMMAND | DEFAULT KEY SEQUENCE | CORRESPONDING OPTION - Search Directory | Ctrl+Alt+F (F for file) | --directory - Search Git Log | Ctrl+Alt+L (L for log) | --git_log - Search Git Status | Ctrl+Alt+S (S for status) | --git_status - Search History | Ctrl+R (R for reverse) | --history - Search Processes | Ctrl+Alt+P (P for process) | --processes - Search Variables | Ctrl+V (V for variable) | --variables - Override a command's binding by specifying its corresponding option with the desired key - sequence. Disable a command's binding by specifying its corresponding option with no value. - - Because fzf_configure_bindings erases bindings it previously installed, it can be cleanly - executed multiple times. Once the desired fzf_configure_bindings command has been found, add it - to your config.fish in order to persist the customized bindings. - - In terms of validation, fzf_configure_bindings fails if passed unknown options. It expects an - equals sign between an option's name and value. However, it does not validate key sequences. - - Pass -h or --help to print this help message and exit. - -EXAMPLES - Default bindings but bind Search Directory to Ctrl+F and Search Variables to Ctrl+Alt+V - \$ fzf_configure_bindings --directory=\cf --variables=\e\cv - Default bindings but disable Search History - \$ fzf_configure_bindings --history= - An agglomeration of different options - \$ fzf_configure_bindings --git_status=\cg --history=\ch --variables= --processes= - -SEE Also - To learn more about fish key bindings, see bind(1) and fish_key_reader(1). -" -end diff --git a/fish/.config/fish/functions/_fzf_extract_var_info.fish b/fish/.config/fish/functions/_fzf_extract_var_info.fish deleted file mode 100644 index dd4e9523..00000000 --- a/fish/.config/fish/functions/_fzf_extract_var_info.fish +++ /dev/null @@ -1,15 +0,0 @@ -# helper function for _fzf_search_variables -function _fzf_extract_var_info --argument-names variable_name set_show_output --description "Extract and reformat lines pertaining to \$variable_name from \$set_show_output." - # Extract only the lines about the variable, all of which begin with either - # $variable_name: ...or... $variable_name[ - string match --regex "^\\\$$variable_name(?::|\[).*" <$set_show_output | - - # Strip the variable name prefix, including ": " for scope info lines - string replace --regex "^\\\$$variable_name(?:: )?" '' | - - # Distill the lines of values, replacing... - # [1]: |value| - # ...with... - # [1] value - string replace --regex ": \|(.*)\|" ' $1' -end diff --git a/fish/.config/fish/functions/_fzf_preview_changed_file.fish b/fish/.config/fish/functions/_fzf_preview_changed_file.fish deleted file mode 100644 index 78dd5611..00000000 --- a/fish/.config/fish/functions/_fzf_preview_changed_file.fish +++ /dev/null @@ -1,49 +0,0 @@ -# helper for _fzf_search_git_status -# arg should be a line from git status --short, e.g. -# MM functions/_fzf_preview_changed_file.fish -# D README.md -# R LICENSE -> "New License" -function _fzf_preview_changed_file --argument-names path_status --description "Show the git diff of the given file." - # remove quotes because they'll be interpreted literally by git diff - # no need to requote when referencing $path because fish does not perform word splitting - # https://fishshell.com/docs/current/fish_for_bash_users.html - set -f path (string unescape (string sub --start 4 $path_status)) - # first letter of short format shows index, second letter shows working tree - # https://git-scm.com/docs/git-status/2.35.0#_short_format - set -f index_status (string sub --length 1 $path_status) - set -f working_tree_status (string sub --start 2 --length 1 $path_status) - - set -f diff_opts --color=always - - if test $index_status = '?' - _fzf_report_diff_type Untracked - _fzf_preview_file $path - else if contains {$index_status}$working_tree_status DD AU UD UA DU AA UU - # Unmerged statuses taken directly from git status help's short format table - # Unmerged statuses are mutually exclusive with other statuses, so if we see - # these, then safe to assume the path is unmerged - _fzf_report_diff_type Unmerged - git diff $diff_opts -- $path - else - if test $index_status != ' ' - _fzf_report_diff_type Staged - - # renames are only detected in the index, never working tree, so only need to test for it here - # https://stackoverflow.com/questions/73954214 - if test $index_status = R - # diff the post-rename path with the original path, otherwise the diff will show the entire file as being added - set -f orig_and_new_path (string split --max 1 -- ' -> ' $path) - git diff --staged $diff_opts -- $orig_and_new_path[1] $orig_and_new_path[2] - # path currently has the form of "original -> current", so we need to correct it before it's used below - set path $orig_and_new_path[2] - else - git diff --staged $diff_opts -- $path - end - end - - if test $working_tree_status != ' ' - _fzf_report_diff_type Unstaged - git diff $diff_opts -- $path - end - end -end diff --git a/fish/.config/fish/functions/_fzf_preview_file.fish b/fish/.config/fish/functions/_fzf_preview_file.fish deleted file mode 100644 index c9264756..00000000 --- a/fish/.config/fish/functions/_fzf_preview_file.fish +++ /dev/null @@ -1,43 +0,0 @@ -# helper function for _fzf_search_directory and _fzf_search_git_status -function _fzf_preview_file --description "Print a preview for the given file based on its file type." - # because there's no way to guarantee that _fzf_search_directory passes the path to _fzf_preview_file - # as one argument, we collect all the arguments into one single variable and treat that as the path - set -f file_path $argv - - if test -L "$file_path" # symlink - # notify user and recurse on the target of the symlink, which can be any of these file types - set -l target_path (realpath "$file_path") - - set_color yellow - echo "'$file_path' is a symlink to '$target_path'." - set_color normal - - _fzf_preview_file "$target_path" - else if test -f "$file_path" # regular file - if set --query fzf_preview_file_cmd - # need to escape quotes to make sure eval receives file_path as a single arg - eval "$fzf_preview_file_cmd '$file_path'" - else - bat --style=numbers --color=always "$file_path" - end - else if test -d "$file_path" # directory - if set --query fzf_preview_dir_cmd - # see above - eval "$fzf_preview_dir_cmd '$file_path'" - else - # -A list hidden files as well, except for . and .. - # -F helps classify files by appending symbols after the file name - command ls -A -F "$file_path" - end - else if test -c "$file_path" - _fzf_report_file_type "$file_path" "character device file" - else if test -b "$file_path" - _fzf_report_file_type "$file_path" "block device file" - else if test -S "$file_path" - _fzf_report_file_type "$file_path" socket - else if test -p "$file_path" - _fzf_report_file_type "$file_path" "named pipe" - else - echo "$file_path doesn't exist." >&2 - end -end diff --git a/fish/.config/fish/functions/_fzf_report_diff_type.fish b/fish/.config/fish/functions/_fzf_report_diff_type.fish deleted file mode 100644 index cc26fb35..00000000 --- a/fish/.config/fish/functions/_fzf_report_diff_type.fish +++ /dev/null @@ -1,18 +0,0 @@ -# helper for _fzf_preview_changed_file -# prints out something like -# ╭────────╮ -# │ Staged │ -# ╰────────╯ -function _fzf_report_diff_type --argument-names diff_type --description "Print a distinct colored header meant to preface a git patch." - # number of "-" to draw is the length of the string to box + 2 for padding - set -f repeat_count (math 2 + (string length $diff_type)) - set -f line (string repeat --count $repeat_count ─) - set -f top_border ╭$line╮ - set -f btm_border ╰$line╯ - - set_color yellow - echo $top_border - echo "│ $diff_type │" - echo $btm_border - set_color normal -end diff --git a/fish/.config/fish/functions/_fzf_report_file_type.fish b/fish/.config/fish/functions/_fzf_report_file_type.fish deleted file mode 100644 index 49e02e1c..00000000 --- a/fish/.config/fish/functions/_fzf_report_file_type.fish +++ /dev/null @@ -1,6 +0,0 @@ -# helper function for _fzf_preview_file -function _fzf_report_file_type --argument-names file_path file_type --description "Explain the file type for a file." - set_color red - echo "Cannot preview '$file_path': it is a $file_type." - set_color normal -end diff --git a/fish/.config/fish/functions/_fzf_search_directory.fish b/fish/.config/fish/functions/_fzf_search_directory.fish deleted file mode 100644 index 4541eec9..00000000 --- a/fish/.config/fish/functions/_fzf_search_directory.fish +++ /dev/null @@ -1,33 +0,0 @@ -function _fzf_search_directory --description "Search the current directory. Replace the current token with the selected file paths." - # Directly use fd binary to avoid output buffering delay caused by a fd alias, if any. - # Debian-based distros install fd as fdfind and the fd package is something else, so - # check for fdfind first. Fall back to "fd" for a clear error message. - set -f fd_cmd (command -v fdfind || command -v fd || echo "fd") - set -f --append fd_cmd --color=always $fzf_fd_opts - - set -f fzf_arguments --multi --ansi $fzf_directory_opts - set -f token (commandline --current-token) - # expand any variables or leading tilde (~) in the token - set -f expanded_token (eval echo -- $token) - # unescape token because it's already quoted so backslashes will mess up the path - set -f unescaped_exp_token (string unescape -- $expanded_token) - - # If the current token is a directory and has a trailing slash, - # then use it as fd's base directory. - if string match --quiet -- "*/" $unescaped_exp_token && test -d "$unescaped_exp_token" - set --append fd_cmd --base-directory=$unescaped_exp_token - # use the directory name as fzf's prompt to indicate the search is limited to that directory - set --prepend fzf_arguments --prompt="Directory $unescaped_exp_token> " --preview="_fzf_preview_file $expanded_token{}" - set -f file_paths_selected $unescaped_exp_token($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) - else - set --prepend fzf_arguments --prompt="Directory> " --query="$unescaped_exp_token" --preview='_fzf_preview_file {}' - set -f file_paths_selected ($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) - end - - - if test $status -eq 0 - commandline --current-token --replace -- (string escape -- $file_paths_selected | string join ' ') - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_search_git_log.fish b/fish/.config/fish/functions/_fzf_search_git_log.fish deleted file mode 100644 index aa54724d..00000000 --- a/fish/.config/fish/functions/_fzf_search_git_log.fish +++ /dev/null @@ -1,36 +0,0 @@ -function _fzf_search_git_log --description "Search the output of git log and preview commits. Replace the current token with the selected commit hash." - if not git rev-parse --git-dir >/dev/null 2>&1 - echo '_fzf_search_git_log: Not in a git repository.' >&2 - else - if not set --query fzf_git_log_format - # %h gives you the abbreviated commit hash, which is useful for saving screen space, but we will have to expand it later below - set -f fzf_git_log_format '%C(bold blue)%h%C(reset) - %C(cyan)%ad%C(reset) %C(yellow)%d%C(reset) %C(normal)%s%C(reset) %C(dim normal)[%an]%C(reset)' - end - - set -f preview_cmd 'git show --color=always --stat --patch {1}' - if set --query fzf_diff_highlighter - set preview_cmd "$preview_cmd | $fzf_diff_highlighter" - end - - set -f selected_log_lines ( - git log --no-show-signature --color=always --format=format:$fzf_git_log_format --date=short | \ - _fzf_wrapper --ansi \ - --multi \ - --scheme=history \ - --prompt="Git Log> " \ - --preview=$preview_cmd \ - --query=(commandline --current-token) \ - $fzf_git_log_opts - ) - if test $status -eq 0 - for line in $selected_log_lines - set -f abbreviated_commit_hash (string split --field 1 " " $line) - set -f full_commit_hash (git rev-parse $abbreviated_commit_hash) - set -f --append commit_hashes $full_commit_hash - end - commandline --current-token --replace (string join ' ' $commit_hashes) - end - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_search_git_status.fish b/fish/.config/fish/functions/_fzf_search_git_status.fish deleted file mode 100644 index 358f88c5..00000000 --- a/fish/.config/fish/functions/_fzf_search_git_status.fish +++ /dev/null @@ -1,41 +0,0 @@ -function _fzf_search_git_status --description "Search the output of git status. Replace the current token with the selected file paths." - if not git rev-parse --git-dir >/dev/null 2>&1 - echo '_fzf_search_git_status: Not in a git repository.' >&2 - else - set -f preview_cmd '_fzf_preview_changed_file {}' - if set --query fzf_diff_highlighter - set preview_cmd "$preview_cmd | $fzf_diff_highlighter" - end - - set -f selected_paths ( - # Pass configuration color.status=always to force status to use colors even though output is sent to a pipe - git -c color.status=always status --short | - _fzf_wrapper --ansi \ - --multi \ - --prompt="Git Status> " \ - --query=(commandline --current-token) \ - --preview=$preview_cmd \ - --nth="2.." \ - $fzf_git_status_opts - ) - if test $status -eq 0 - # git status --short automatically escapes the paths of most files for us so not going to bother trying to handle - # the few edges cases of weird file names that should be extremely rare (e.g. "this;needs;escaping") - set -f cleaned_paths - - for path in $selected_paths - if test (string sub --length 1 $path) = R - # path has been renamed and looks like "R LICENSE -> LICENSE.md" - # extract the path to use from after the arrow - set --append cleaned_paths (string split -- "-> " $path)[-1] - else - set --append cleaned_paths (string sub --start=4 $path) - end - end - - commandline --current-token --replace -- (string join ' ' $cleaned_paths) - end - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_search_history.fish b/fish/.config/fish/functions/_fzf_search_history.fish deleted file mode 100644 index cafbce98..00000000 --- a/fish/.config/fish/functions/_fzf_search_history.fish +++ /dev/null @@ -1,39 +0,0 @@ -function _fzf_search_history --description "Search command history. Replace the command line with the selected command." - # history merge incorporates history changes from other fish sessions - # it errors out if called in private mode - if test -z "$fish_private_mode" - builtin history merge - end - - if not set --query fzf_history_time_format - # Reference https://devhints.io/strftime to understand strftime format symbols - set -f fzf_history_time_format "%m-%d %H:%M:%S" - end - - # Delinate time from command in history entries using the vertical box drawing char (U+2502). - # Then, to get raw command from history entries, delete everything up to it. The ? on regex is - # necessary to make regex non-greedy so it won't match into commands containing the char. - set -f time_prefix_regex '^.*? │ ' - # Delinate commands throughout pipeline using null rather than newlines because commands can be multi-line - set -f commands_selected ( - builtin history --null --show-time="$fzf_history_time_format │ " | - _fzf_wrapper --read0 \ - --print0 \ - --multi \ - --scheme=history \ - --prompt="History> " \ - --query=(commandline) \ - --preview="string replace --regex '$time_prefix_regex' '' -- {} | fish_indent --ansi" \ - --preview-window="bottom:3:wrap" \ - $fzf_history_opts | - string split0 | - # remove timestamps from commands selected - string replace --regex $time_prefix_regex '' - ) - - if test $status -eq 0 - commandline --replace -- $commands_selected - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_search_processes.fish b/fish/.config/fish/functions/_fzf_search_processes.fish deleted file mode 100644 index 133a8806..00000000 --- a/fish/.config/fish/functions/_fzf_search_processes.fish +++ /dev/null @@ -1,32 +0,0 @@ -function _fzf_search_processes --description "Search all running processes. Replace the current token with the pid of the selected process." - # Directly use ps command because it is often aliased to a different command entirely - # or with options that dirty the search results and preview output - set -f ps_cmd (command -v ps || echo "ps") - # use all caps to be consistent with ps default format - # snake_case because ps doesn't seem to allow spaces in the field names - set -f ps_preview_fmt (string join ',' 'pid' 'ppid=PARENT' 'user' '%cpu' 'rss=RSS_IN_KB' 'start=START_TIME' 'command') - set -f processes_selected ( - $ps_cmd -A -opid,command | \ - _fzf_wrapper --multi \ - --prompt="Processes> " \ - --query (commandline --current-token) \ - --ansi \ - # first line outputted by ps is a header, so we need to mark it as so - --header-lines=1 \ - # ps uses exit code 1 if the process was not found, in which case show an message explaining so - --preview="$ps_cmd -o '$ps_preview_fmt' -p {1} || echo 'Cannot preview {1} because it exited.'" \ - --preview-window="bottom:4:wrap" \ - $fzf_processes_opts - ) - - if test $status -eq 0 - for process in $processes_selected - set -f --append pids_selected (string split --no-empty --field=1 -- " " $process) - end - - # string join to replace the newlines outputted by string split with spaces - commandline --current-token --replace -- (string join ' ' $pids_selected) - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_search_variables.fish b/fish/.config/fish/functions/_fzf_search_variables.fish deleted file mode 100644 index 52a7c701..00000000 --- a/fish/.config/fish/functions/_fzf_search_variables.fish +++ /dev/null @@ -1,47 +0,0 @@ -# This function expects the following two arguments: -# argument 1 = output of (set --show | psub), i.e. a file with the scope info and values of all variables -# argument 2 = output of (set --names | psub), i.e. a file with all variable names -function _fzf_search_variables --argument-names set_show_output set_names_output --description "Search and preview shell variables. Replace the current token with the selected variable." - if test -z "$set_names_output" - printf '%s\n' '_fzf_search_variables requires 2 arguments.' >&2 - - commandline --function repaint - return 22 # 22 means invalid argument in POSIX - end - - # Exclude the history variable from being piped into fzf because - # 1. it's not included in $set_names_output - # 2. it tends to be a very large value => increases computation time - # 3._fzf_search_history is a much better way to examine history anyway - set -f all_variable_names (string match --invert history <$set_names_output) - - set -f current_token (commandline --current-token) - # Use the current token to pre-populate fzf's query. If the current token begins - # with a $, remove it from the query so that it will better match the variable names - set -f cleaned_curr_token (string replace -- '$' '' $current_token) - - set -f variable_names_selected ( - printf '%s\n' $all_variable_names | - _fzf_wrapper --preview "_fzf_extract_var_info {} $set_show_output" \ - --prompt="Variables> " \ - --preview-window="wrap" \ - --multi \ - --query=$cleaned_curr_token \ - $fzf_variables_opts - ) - - if test $status -eq 0 - # If the current token begins with a $, do not overwrite the $ when - # replacing the current token with the selected variable. - # Uses brace expansion to prepend $ to each variable name. - commandline --current-token --replace ( - if string match --quiet -- '$*' $current_token - string join " " \${$variable_names_selected} - else - string join " " $variable_names_selected - end - ) - end - - commandline --function repaint -end diff --git a/fish/.config/fish/functions/_fzf_wrapper.fish b/fish/.config/fish/functions/_fzf_wrapper.fish deleted file mode 100644 index 45556ce6..00000000 --- a/fish/.config/fish/functions/_fzf_wrapper.fish +++ /dev/null @@ -1,20 +0,0 @@ -function _fzf_wrapper --description "Prepares some environment variables before executing fzf." - # Make sure fzf uses fish to execute preview commands, some of which - # are autoloaded fish functions so don't exist in other shells. - # Use --function so that it doesn't clobber SHELL outside this function. - set -f --export SHELL (command --search fish) - - # If FZF_DEFAULT_OPTS is not set, then set some sane defaults. - # See https://github.com/junegunn/fzf#environment-variables - if not set --query FZF_DEFAULT_OPTS - # cycle allows jumping between the first and last results, making scrolling faster - # layout=reverse lists results top to bottom, mimicking the familiar layouts of git log, history, and env - # border shows where the fzf window begins and ends - # height=90% leaves space to see the current command and some scrollback, maintaining context of work - # preview-window=wrap wraps long lines in the preview window, making reading easier - # marker=* makes the multi-select marker more distinguishable from the pointer (since both default to >) - set --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' - end - - fzf $argv -end diff --git a/fish/.config/fish/functions/_pisces_append.fish b/fish/.config/fish/functions/_pisces_append.fish deleted file mode 100644 index 60e002fc..00000000 --- a/fish/.config/fish/functions/_pisces_append.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _pisces_append -a text -d "Inserts a pair of strings (left-right) and puts the cursor between them" - - commandline --insert -- $text - and _pisces_jump -(string length -- $text) -end diff --git a/fish/.config/fish/functions/_pisces_backspace.fish b/fish/.config/fish/functions/_pisces_backspace.fish deleted file mode 100644 index 02576104..00000000 --- a/fish/.config/fish/functions/_pisces_backspace.fish +++ /dev/null @@ -1,17 +0,0 @@ -function _pisces_backspace -d "Overrides backspace to handle empty pairs removal" - - set -l line (commandline | string join \n) - set -l index (commandline -C) - if [ $index -ge 1 ] - set -l char (string sub -s $index -l 1 -- "$line") - for pair in $pisces_pairs - set -l var (string split -- ',' $pair) - if [ $var[1] = $char ] - _pisces_remove $var - and return 0 - end - end - end - - commandline -f backward-delete-char -end diff --git a/fish/.config/fish/functions/_pisces_bind_pair.fish b/fish/.config/fish/functions/_pisces_bind_pair.fish deleted file mode 100644 index 1557db0e..00000000 --- a/fish/.config/fish/functions/_pisces_bind_pair.fish +++ /dev/null @@ -1,20 +0,0 @@ -function _pisces_bind_pair -a mode left right -d "Creates bindings for the given pair: autoclose and skip closing symbol" - - test -n $mode - or set mode default - - set l $left - set r $right - - set left (string escape -n -- $left) - set right (string escape -n -- $right) - - if [ $left = $right ] - - bind -M $mode $r "_pisces_insert_identical $right" - else - - bind -M $mode $l "_pisces_insert_left $left $right" - bind -M $mode $r "_pisces_insert_right $right" - end -end diff --git a/fish/.config/fish/functions/_pisces_complete.fish b/fish/.config/fish/functions/_pisces_complete.fish deleted file mode 100644 index 44a87c9a..00000000 --- a/fish/.config/fish/functions/_pisces_complete.fish +++ /dev/null @@ -1,13 +0,0 @@ -function _pisces_complete -d "Invokes complete with modification for vars before a closing double quote" - - if commandline --paging-mode - down-or-search - else - set token (commandline -t) - # checking that the current token ends on a $var + '"' - if [ (string match -r '\$.*"$' -- "$token") ] - commandline -f delete-char # which is '"' - end - commandline -f complete - end -end diff --git a/fish/.config/fish/functions/_pisces_insert_identical.fish b/fish/.config/fish/functions/_pisces_insert_identical.fish deleted file mode 100644 index de121994..00000000 --- a/fish/.config/fish/functions/_pisces_insert_identical.fish +++ /dev/null @@ -1,8 +0,0 @@ -function _pisces_insert_identical -a text -d "The binding command for a pair where the left and right delimiters are identical" - if _pisces_should_insert $text - _pisces_skip $text - or _pisces_append $text - else - commandline -i -- $text - end -end diff --git a/fish/.config/fish/functions/_pisces_insert_left.fish b/fish/.config/fish/functions/_pisces_insert_left.fish deleted file mode 100644 index 9dbfe990..00000000 --- a/fish/.config/fish/functions/_pisces_insert_left.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _pisces_insert_left -a left right -d "The binding command to insert the left delimiter" - commandline -i -- $left - and _pisces_should_insert $right - and _pisces_append $right -end diff --git a/fish/.config/fish/functions/_pisces_insert_right.fish b/fish/.config/fish/functions/_pisces_insert_right.fish deleted file mode 100644 index a847b097..00000000 --- a/fish/.config/fish/functions/_pisces_insert_right.fish +++ /dev/null @@ -1,7 +0,0 @@ -function _pisces_insert_right -a right -d "The binding command to insert the right delimiter" - if _pisces_should_insert $right - _pisces_skip $right - else - commandline -i -- $right - end -end diff --git a/fish/.config/fish/functions/_pisces_jump.fish b/fish/.config/fish/functions/_pisces_jump.fish deleted file mode 100644 index eacde935..00000000 --- a/fish/.config/fish/functions/_pisces_jump.fish +++ /dev/null @@ -1,8 +0,0 @@ -function _pisces_jump -a n -d "Moves cursor by n/-n characters" - - test -z $n - and set n 0 - - set current (commandline -C) - commandline -C (math "$current + $n") -end diff --git a/fish/.config/fish/functions/_pisces_lookup.fish b/fish/.config/fish/functions/_pisces_lookup.fish deleted file mode 100644 index 5c8f7fb9..00000000 --- a/fish/.config/fish/functions/_pisces_lookup.fish +++ /dev/null @@ -1,14 +0,0 @@ -function _pisces_lookup -a pos len -d "Returns the text at the given position relative to the cursor" - - test -z $pos - and set pos 0 - test -z $len - and set len 1 - - set cur (commandline -C) - set input (commandline -b) - - # NOTE: it's important to quote $input, because it may have newlines - string sub --start (math "$cur + $pos + 1") --length $len -- "$input" 2>/dev/null - or echo '' # if it's out of bounds (probably better to return cut part) -end diff --git a/fish/.config/fish/functions/_pisces_remove.fish b/fish/.config/fish/functions/_pisces_remove.fish deleted file mode 100644 index cd15a03b..00000000 --- a/fish/.config/fish/functions/_pisces_remove.fish +++ /dev/null @@ -1,18 +0,0 @@ -function _pisces_remove -a left right -d "Removes an empty pair (left-right) or returns false" - - set left_len (string length $left) - set right_len (string length $right) - set length (math "$left_len + $right_len") - - if [ (_pisces_lookup -$left_len $length) = "$left$right" ] - - _pisces_jump $right_len - for i in (seq 1 $length) - commandline -f backward-delete-char - end - - return 0 - end - - return 1 -end diff --git a/fish/.config/fish/functions/_pisces_should_insert.fish b/fish/.config/fish/functions/_pisces_should_insert.fish deleted file mode 100644 index 517be791..00000000 --- a/fish/.config/fish/functions/_pisces_should_insert.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _pisces_should_insert -a insert -d "Determines if we should insert text" - # If $pisces_only_insert_at_eol is unset, return true - # Otherwise, return true if the cursor is at the end of the line OR - # if the cursor is before a copy of $insert (i.e. a delimiter) at the end - # of the line. - set cmd_to_cursor (commandline -c) - set cmd (commandline) - test -z "$pisces_only_insert_at_eol" \ - -o "$cmd_to_cursor" = "$cmd" \ - -o "$cmd_to_cursor$insert" = "$cmd" -end diff --git a/fish/.config/fish/functions/_pisces_skip.fish b/fish/.config/fish/functions/_pisces_skip.fish deleted file mode 100644 index 1651b346..00000000 --- a/fish/.config/fish/functions/_pisces_skip.fish +++ /dev/null @@ -1,12 +0,0 @@ -function _pisces_skip -a text -d "Skips given text if it's already under the cursor" - - set length (string length -- $text) - - if test (_pisces_lookup 0 $length) = "$text" - _pisces_jump $length - return 0 - else - commandline -i -- $text - return 1 - end -end diff --git a/fish/.config/fish/functions/_sponge_clear_state.fish b/fish/.config/fish/functions/_sponge_clear_state.fish deleted file mode 100644 index c6a07da7..00000000 --- a/fish/.config/fish/functions/_sponge_clear_state.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _sponge_clear_state - set --erase --global _sponge_current_command - set --erase --global _sponge_current_command_exit_code - set --erase --global _sponge_current_command_previously_in_history -end diff --git a/fish/.config/fish/functions/_sponge_on_exit.fish b/fish/.config/fish/functions/_sponge_on_exit.fish deleted file mode 100644 index 0c6cc190..00000000 --- a/fish/.config/fish/functions/_sponge_on_exit.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _sponge_on_exit --on-event fish_exit - sponge_delay=0 _sponge_remove_from_history -end diff --git a/fish/.config/fish/functions/_sponge_on_postexec.fish b/fish/.config/fish/functions/_sponge_on_postexec.fish deleted file mode 100644 index 1d679354..00000000 --- a/fish/.config/fish/functions/_sponge_on_postexec.fish +++ /dev/null @@ -1,24 +0,0 @@ -function _sponge_on_postexec --on-event fish_postexec - set --global _sponge_current_command_exit_code $status - - # Remove command from the queue if it's been added previously - if set --local index (contains --index -- $_sponge_current_command $_sponge_queue) - set --erase _sponge_queue[$index] - end - - # Ignore empty commands - if test -n $_sponge_current_command - set --local command '' - # Run filters - for filter in $sponge_filters - if $filter \ - $_sponge_current_command \ - $_sponge_current_command_exit_code \ - $_sponge_current_command_previously_in_history - set command $_sponge_current_command - break - end - end - set --prepend --global _sponge_queue $command - end -end diff --git a/fish/.config/fish/functions/_sponge_on_preexec.fish b/fish/.config/fish/functions/_sponge_on_preexec.fish deleted file mode 100644 index a8664911..00000000 --- a/fish/.config/fish/functions/_sponge_on_preexec.fish +++ /dev/null @@ -1,16 +0,0 @@ -function _sponge_on_preexec --on-event fish_preexec \ - --argument-names command - _sponge_clear_state - - set --global _sponge_current_command $command - - builtin history search --case-sensitive --exact --max=1 --null $command \ - | read --local --null found_entries - - # If a command is in the history and in the queue, ignore it, like if it wasn’t in the history - if test (count $found_entries) -ne 0; and not contains $command $_sponge_queue - set --global _sponge_current_command_previously_in_history true - else - set --global _sponge_current_command_previously_in_history false - end -end diff --git a/fish/.config/fish/functions/_sponge_on_prompt.fish b/fish/.config/fish/functions/_sponge_on_prompt.fish deleted file mode 100644 index 03e989a2..00000000 --- a/fish/.config/fish/functions/_sponge_on_prompt.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _sponge_on_prompt --on-event fish_prompt - if test $sponge_purge_only_on_exit = false - _sponge_remove_from_history - end -end diff --git a/fish/.config/fish/functions/_sponge_remove_from_history.fish b/fish/.config/fish/functions/_sponge_remove_from_history.fish deleted file mode 100644 index 4d4f8277..00000000 --- a/fish/.config/fish/functions/_sponge_remove_from_history.fish +++ /dev/null @@ -1,9 +0,0 @@ -function _sponge_remove_from_history - - while test (count $_sponge_queue) -gt $sponge_delay - builtin history delete --case-sensitive --exact -- $_sponge_queue[-1] - set --erase _sponge_queue[-1] - end - - builtin history save -end diff --git a/fish/.config/fish/functions/artisan.fish b/fish/.config/fish/functions/artisan.fish deleted file mode 100755 index bcf7e0d0..00000000 --- a/fish/.config/fish/functions/artisan.fish +++ /dev/null @@ -1,3 +0,0 @@ -function artisan -d "Laravel artisan" - php artisan $argv -end diff --git a/fish/.config/fish/functions/cdf.fish b/fish/.config/fish/functions/cdf.fish deleted file mode 100644 index ae6b1dba..00000000 --- a/fish/.config/fish/functions/cdf.fish +++ /dev/null @@ -1,3 +0,0 @@ -function cdf -d "cd to the current Finder directory" - cd (pfd) -end diff --git a/fish/.config/fish/functions/fisher.fish b/fish/.config/fish/functions/fisher.fish deleted file mode 100644 index b1513d3b..00000000 --- a/fish/.config/fish/functions/fisher.fish +++ /dev/null @@ -1,240 +0,0 @@ -function fisher --argument-names cmd --description "A plugin manager for Fish" - set --query fisher_path || set --local fisher_path $__fish_config_dir - set --local fisher_version 4.4.4 - set --local fish_plugins $__fish_config_dir/fish_plugins - - switch "$cmd" - case -v --version - echo "fisher, version $fisher_version" - case "" -h --help - echo "Usage: fisher install Install plugins" - echo " fisher remove Remove installed plugins" - echo " fisher update Update installed plugins" - echo " fisher update Update all installed plugins" - echo " fisher list [] List installed plugins matching regex" - echo "Options:" - echo " -v, --version Print version" - echo " -h, --help Print this help message" - echo "Variables:" - echo " \$fisher_path Plugin installation path. Default: $__fish_config_dir" | string replace --regex -- $HOME \~ - case ls list - string match --entire --regex -- "$argv[2]" $_fisher_plugins - case install update remove - isatty || read --local --null --array stdin && set --append argv $stdin - - set --local install_plugins - set --local update_plugins - set --local remove_plugins - set --local arg_plugins $argv[2..-1] - set --local old_plugins $_fisher_plugins - set --local new_plugins - - test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins) - - if ! set --query argv[2] - if test "$cmd" != update - echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1 - else if ! set --query file_plugins - echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1 - end - set arg_plugins $file_plugins - end - - for plugin in $arg_plugins - set plugin (test -e "$plugin" && realpath $plugin || string lower -- $plugin) - contains -- "$plugin" $new_plugins || set --append new_plugins $plugin - end - - if set --query argv[2] - for plugin in $new_plugins - if contains -- "$plugin" $old_plugins - test "$cmd" = remove && - set --append remove_plugins $plugin || - set --append update_plugins $plugin - else if test "$cmd" = install - set --append install_plugins $plugin - else - echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1 - end - end - else - for plugin in $new_plugins - contains -- "$plugin" $old_plugins && - set --append update_plugins $plugin || - set --append install_plugins $plugin - end - - for plugin in $old_plugins - contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin - end - end - - set --local pid_list - set --local source_plugins - set --local fetch_plugins $update_plugins $install_plugins - set --local fish_path (status fish-path) - - echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal) - - for plugin in $fetch_plugins - set --local source (command mktemp -d) - set --append source_plugins $source - - command mkdir -p $source/{completions,conf.d,themes,functions} - - $fish_path --command " - if test -e $plugin - command cp -Rf $plugin/* $source - else - set temp (command mktemp -d) - set repo (string split -- \@ $plugin) || set repo[2] HEAD - - if set path (string replace --regex -- '^(https://)?gitlab.com/' '' \$repo[1]) - set name (string split -- / \$path)[-1] - set url https://gitlab.com/\$path/-/archive/\$repo[2]/\$name-\$repo[2].tar.gz - else - set url https://api.github.com/repos/\$repo[1]/tarball/\$repo[2] - end - - echo Fetching (set_color --underline)\$url(set_color normal) - - if command curl -q --silent -L \$url | command tar -xzC \$temp -f - 2>/dev/null - command cp -Rf \$temp/*/* $source - else - echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2 - command rm -rf $source - end - - command rm -rf \$temp - end - - set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files - " & - - set --append pid_list (jobs --last --pid) - end - - wait $pid_list 2>/dev/null - - for plugin in $fetch_plugins - if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source - if set --local index (contains --index -- "$plugin" $install_plugins) - set --erase install_plugins[$index] - else - set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)] - end - end - end - - for plugin in $update_plugins $remove_plugins - if set --local index (contains --index -- "$plugin" $_fisher_plugins) - set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files - - if contains -- "$plugin" $remove_plugins - for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var) - emit {$name}_uninstall - end - printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ - set --erase _fisher_plugins[$index] - end - - command rm -rf (string replace -- \~ ~ $$plugin_files_var) - - functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var) - - for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var) - complete --erase --command $name - end - - set --erase $plugin_files_var - end - end - - if set --query update_plugins[1] || set --query install_plugins[1] - command mkdir -p $fisher_path/{functions,themes,conf.d,completions} - end - - for plugin in $update_plugins $install_plugins - set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] - set --local files $source/{functions,themes,conf.d,completions}/* - - if set --local index (contains --index -- $plugin $install_plugins) - set --local user_files $fisher_path/{functions,themes,conf.d,completions}/* - set --local conflict_files - - for file in (string replace -- $source/ $fisher_path/ $files) - contains -- $file $user_files && set --append conflict_files $file - end - - if set --query conflict_files[1] && set --erase install_plugins[$index] - echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n" "$conflict_files >&2 - continue - end - end - - for file in (string replace -- $source/ "" $files) - command cp -RLf $source/$file $fisher_path/$file - end - - set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files - - set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files | string replace -- ~ \~) - - contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin - contains -- $plugin $install_plugins && set --local event install || set --local event update - - printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ - - for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var | string replace -- \~ ~) - source $file - if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file) - emit {$name}_$event - end - end - end - - command rm -rf $source_plugins - - if set --query _fisher_plugins[1] - set --local commit_plugins - - for plugin in $file_plugins - contains -- (string lower -- $plugin) (string lower -- $_fisher_plugins) && set --append commit_plugins $plugin - end - - for plugin in $_fisher_plugins - contains -- (string lower -- $plugin) (string lower -- $commit_plugins) || set --append commit_plugins $plugin - end - - printf "%s\n" $commit_plugins >$fish_plugins - else - set --erase _fisher_plugins - command rm -f $fish_plugins - end - - set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins) - - test "$total" != "0 0 0" && echo (string join ", " ( - test $total[1] = 0 || echo "Installed $total[1]") ( - test $total[2] = 0 || echo "Updated $total[2]") ( - test $total[3] = 0 || echo "Removed $total[3]") - ) plugin/s - case \* - echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1 - end -end - -if ! set --query _fisher_upgraded_to_4_4 - set --universal _fisher_upgraded_to_4_4 - if functions --query _fisher_list - set --query XDG_DATA_HOME[1] || set --local XDG_DATA_HOME ~/.local/share - command rm -rf $XDG_DATA_HOME/fisher - functions --erase _fisher_{list,plugin_parse} - fisher update >/dev/null 2>/dev/null - else - for var in (set --names | string match --entire --regex '^_fisher_.+_files$') - set $var (string replace -- ~ \~ $$var) - end - functions --erase _fisher_fish_postexec - end -end diff --git a/fish/.config/fish/functions/flashEthernet.fish b/fish/.config/fish/functions/flashEthernet.fish index 359e96c6..c5612842 100755 --- a/fish/.config/fish/functions/flashEthernet.fish +++ b/fish/.config/fish/functions/flashEthernet.fish @@ -4,7 +4,7 @@ function flashEthernet --description 'Disable and re-enable the Ethernet network set -l interface Ethernet set result (echo $sudo_pass | sudo -S networksetup -setnetworkserviceenabled $interface off; and sleep 1; echo $sudo_pass | sudo -S networksetup -setnetworkserviceenabled $interface on) if test $status -eq 0 - echo "$interface successfully disabled and with re-enabled shortly." + echo "$interface successfully disabled and will re-enabled shortly." else echo "Failed to disable and re-enable $interface." end diff --git a/fish/.config/fish/functions/flushdns.fish b/fish/.config/fish/functions/flushdns.fish deleted file mode 100644 index a4b989a9..00000000 --- a/fish/.config/fish/functions/flushdns.fish +++ /dev/null @@ -1,3 +0,0 @@ -function flushdns -d "Flushes macOS DNS cache" - sudo dscacheutil -flushcache; sudo killall -HUP mDNSResponder -end diff --git a/fish/.config/fish/functions/freespace.fish b/fish/.config/fish/functions/freespace.fish deleted file mode 100644 index c40411cc..00000000 --- a/fish/.config/fish/functions/freespace.fish +++ /dev/null @@ -1,22 +0,0 @@ -function freespace -d "Erases purgeable disk space with 0s on the selected disk" - if test -z $argv[1] - echo "Usage: freespace " - echo "Example: freespace /dev/disk1s1" - echo - echo "Possible disks:" - df -h | awk 'NR == 1 || /^\/dev\/disk/' - return 1 - end - - echo "Cleaning purgeable files from disk: $argv[1] ...." - diskutil secureErase freespace 0 $argv[1] -end - -function _freespace - set -l disks (string split "\n" (df | awk '/^\/dev\/disk/{ printf $1 ":"; for (i=9; i<=NF; i++) printf $i FS; print "" }')) - for disk in $disks - echo $disk - end -end - -complete -f -c freespace -n _freespace diff --git a/fish/.config/fish/functions/fzf_configure_bindings.fish b/fish/.config/fish/functions/fzf_configure_bindings.fish deleted file mode 100644 index 4b4e7a2b..00000000 --- a/fish/.config/fish/functions/fzf_configure_bindings.fish +++ /dev/null @@ -1,46 +0,0 @@ -# Always installs bindings for insert and default mode for simplicity and b/c it has almost no side-effect -# https://gitter.im/fish-shell/fish-shell?at=60a55915ee77a74d685fa6b1 -function fzf_configure_bindings --description "Installs the default key bindings for fzf.fish with user overrides passed as options." - # no need to install bindings if not in interactive mode or running tests - status is-interactive || test "$CI" = true; or return - - set -f options_spec h/help 'directory=?' 'git_log=?' 'git_status=?' 'history=?' 'processes=?' 'variables=?' - argparse --max-args=0 --ignore-unknown $options_spec -- $argv 2>/dev/null - if test $status -ne 0 - echo "Invalid option or a positional argument was provided." >&2 - _fzf_configure_bindings_help - return 22 - else if set --query _flag_help - _fzf_configure_bindings_help - return - else - # Initialize with default key sequences and then override or disable them based on flags - # index 1 = directory, 2 = git_log, 3 = git_status, 4 = history, 5 = processes, 6 = variables - set -f key_sequences \e\cf \e\cl \e\cs \cr \e\cp \cv # \c = control, \e = escape - set --query _flag_directory && set key_sequences[1] "$_flag_directory" - set --query _flag_git_log && set key_sequences[2] "$_flag_git_log" - set --query _flag_git_status && set key_sequences[3] "$_flag_git_status" - set --query _flag_history && set key_sequences[4] "$_flag_history" - set --query _flag_processes && set key_sequences[5] "$_flag_processes" - set --query _flag_variables && set key_sequences[6] "$_flag_variables" - - # If fzf bindings already exists, uninstall it first for a clean slate - if functions --query _fzf_uninstall_bindings - _fzf_uninstall_bindings - end - - for mode in default insert - test -n $key_sequences[1] && bind --mode $mode $key_sequences[1] _fzf_search_directory - test -n $key_sequences[2] && bind --mode $mode $key_sequences[2] _fzf_search_git_log - test -n $key_sequences[3] && bind --mode $mode $key_sequences[3] _fzf_search_git_status - test -n $key_sequences[4] && bind --mode $mode $key_sequences[4] _fzf_search_history - test -n $key_sequences[5] && bind --mode $mode $key_sequences[5] _fzf_search_processes - test -n $key_sequences[6] && bind --mode $mode $key_sequences[6] "$_fzf_search_vars_command" - end - - function _fzf_uninstall_bindings --inherit-variable key_sequences - bind --erase -- $key_sequences - bind --erase --mode insert -- $key_sequences - end - end -end diff --git a/fish/.config/fish/functions/manp.fish b/fish/.config/fish/functions/manp.fish deleted file mode 100644 index 8cc83d07..00000000 --- a/fish/.config/fish/functions/manp.fish +++ /dev/null @@ -1,7 +0,0 @@ -function manp -d "Open a specified man page in Preview" - if [ (count $argv) -gt 0 ] - mandoc -T pdf (man -w $argv) | open -fa Preview - else - echo "No arguments given" - end -end diff --git a/fish/.config/fish/functions/music.fish b/fish/.config/fish/functions/music.fish deleted file mode 100644 index f463c18f..00000000 --- a/fish/.config/fish/functions/music.fish +++ /dev/null @@ -1,31 +0,0 @@ -function music -d "Control Music. Use -h or --help for a more detailed description." - if [ (count $argv) -gt 0 ] - set -l opt $argv[1] - switch $opt - case launch play pause stop rewind resume quit - case mute - set opt "set mute to true" - case unmute - set opt "set mute to false" - case next previous - set opt "$opt track" - case vol volume - set opt "set sound volume to $argv[2]" - case "" -h --help - echo "Usage: music