From e45a4ea8da2b0692d3d44ca327e47d70da29f5df Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 16 Feb 2024 14:09:45 +0100 Subject: [PATCH 1/3] Cleanup. Add zoxide and starship zsh plugins --- dot_oh-my-zsh/custom/plugins/fzf-z/LICENSE | 21 --- dot_oh-my-zsh/custom/plugins/fzf-z/README.md | 135 -------------- .../custom/plugins/fzf-z/dot_git/FETCH_HEAD | 1 - .../custom/plugins/fzf-z/dot_git/HEAD | 1 - .../custom/plugins/fzf-z/dot_git/ORIG_HEAD | 1 - .../custom/plugins/fzf-z/dot_git/config | 13 -- .../custom/plugins/fzf-z/dot_git/description | 1 - .../hooks/executable_applypatch-msg.sample | 15 -- .../hooks/executable_commit-msg.sample | 24 --- .../executable_fsmonitor-watchman.sample | 114 ------------ .../hooks/executable_post-update.sample | 8 - .../hooks/executable_pre-applypatch.sample | 14 -- .../hooks/executable_pre-commit.sample | 49 ----- .../hooks/executable_pre-merge-commit.sample | 13 -- .../dot_git/hooks/executable_pre-push.sample | 53 ------ .../hooks/executable_pre-rebase.sample | 169 ------------------ .../hooks/executable_pre-receive.sample | 24 --- .../executable_prepare-commit-msg.sample | 42 ----- .../dot_git/hooks/executable_update.sample | 128 ------------- .../custom/plugins/fzf-z/dot_git/index | Bin 521 -> 0 bytes .../custom/plugins/fzf-z/dot_git/info/exclude | 6 - .../custom/plugins/fzf-z/dot_git/logs/HEAD | 1 - .../fzf-z/dot_git/logs/refs/heads/master | 1 - .../dot_git/logs/refs/remotes/origin/HEAD | 1 - .../plugins/fzf-z/dot_git/objects/info/.keep | 0 ...62ae81459aa11c57ea6eb45be94b5916135001.idx | Bin 7372 -> 0 bytes ...2ae81459aa11c57ea6eb45be94b5916135001.pack | Bin 44791 -> 0 bytes .../custom/plugins/fzf-z/dot_git/packed-refs | 2 - .../plugins/fzf-z/dot_git/refs/heads/master | 1 - .../fzf-z/dot_git/refs/remotes/origin/HEAD | 1 - .../plugins/fzf-z/dot_git/refs/tags/.keep | 0 .../custom/plugins/fzf-z/dot_gitignore | 1 - .../custom/plugins/fzf-z/executable_fzfz | 81 --------- .../plugins/fzf-z/executable_recentdirs.sh | 30 ---- .../custom/plugins/fzf-z/fzf-z.plugin.zsh | 42 ----- .../custom/plugins/zsh-aliases-exa/LICENSE | 21 --- .../custom/plugins/zsh-aliases-exa/README.md | 59 ------ .../plugins/zsh-aliases-exa/dot_git/HEAD | 1 - .../plugins/zsh-aliases-exa/dot_git/config | 13 -- .../zsh-aliases-exa/dot_git/description | 1 - .../hooks/executable_applypatch-msg.sample | 15 -- .../hooks/executable_commit-msg.sample | 24 --- .../executable_fsmonitor-watchman.sample | 114 ------------ .../hooks/executable_post-update.sample | 8 - .../hooks/executable_pre-applypatch.sample | 14 -- .../hooks/executable_pre-commit.sample | 49 ----- .../dot_git/hooks/executable_pre-push.sample | 53 ------ .../hooks/executable_pre-rebase.sample | 169 ------------------ .../hooks/executable_pre-receive.sample | 24 --- .../executable_prepare-commit-msg.sample | 42 ----- .../dot_git/hooks/executable_update.sample | 128 ------------- .../plugins/zsh-aliases-exa/dot_git/index | Bin 385 -> 0 bytes .../zsh-aliases-exa/dot_git/info/exclude | 6 - .../plugins/zsh-aliases-exa/dot_git/logs/HEAD | 1 - .../dot_git/logs/refs/heads/master | 1 - .../dot_git/logs/refs/remotes/origin/HEAD | 1 - ...nly_521a5088713e176654533b6f0e3beba2a0255e | 2 - ...nly_0bddb876e66147be74ffb46a4ae1fc69dd2c6b | Bin 380 -> 0 bytes ...nly_627e7b188f54d2c1d9e0b2c858207b498c5be0 | Bin 941 -> 0 bytes ...nly_cb4fd19e4cd571bead6d2c734591007823a73d | 2 - ...nly_12c8f6b46433bf859f1b98ac8176afbcac23c6 | Bin 134 -> 0 bytes ...nly_ac7dcd7ea571a675db920e19bb2a717a4f764a | Bin 181 -> 0 bytes ...nly_d0ab58b14c41d1dccd9b5adb21b6c93f01d0e6 | Bin 85 -> 0 bytes ...nly_b611529be6a7226c496f8efa583def849d047f | Bin 309 -> 0 bytes ...nly_29e297a9dadb76abfed7e380bef18b9e0df3c8 | Bin 930 -> 0 bytes ...nly_eac5bcc614ababaeaf5010455ddbd1c1da8632 | Bin 134 -> 0 bytes ...nly_5b4e667272b832cc1fc75b2bc61c26f2730276 | Bin 134 -> 0 bytes ...nly_addfe3fa5e60d673153a7bd5065bbf01e648be | Bin 1016 -> 0 bytes ...nly_5276d9dafc9ae28d0341271a91923b00df7984 | Bin 170 -> 0 bytes ...nly_f7860619d2427392c101f071184d172fd69b2f | Bin 383 -> 0 bytes ...nly_f99ce1ed5a815f30da1c6bc75501d280387056 | Bin 169 -> 0 bytes ...nly_e5273849ffee146d89c3225bc569b63be41eb2 | Bin 654 -> 0 bytes ...nly_bf56dac3a41405d02bbdaf4d65cd23376fc2c4 | Bin 178 -> 0 bytes ...nly_ac5627e276180a363e9fb47ea87dc15b81eb89 | Bin 516 -> 0 bytes ...nly_9ec60cddac48f1d4f29aebd699725d04b73920 | Bin 178 -> 0 bytes ...nly_26ad18374959f11f1d51d556ada3d53353a7e1 | Bin 308 -> 0 bytes ...nly_e4df591aeffbe83ed2d2e98cdd1149b14a61f3 | 1 - ...nly_b8a17a9b8779a68b1365f51d8755368ec31048 | 3 - ...nly_e7aa64a87a469abdaf60243de703deade5c358 | Bin 359 -> 0 bytes ...nly_f49cd26ac8eedc1196d0c63ba5490385baf37e | 2 - ...nly_b72da193f03911009cb95e3e2e18e48b918833 | 1 - ...nly_f4f23227c329424b1c0a07a04e6827be0c8b62 | Bin 883 -> 0 bytes .../dot_git/objects/info/.keep | 0 .../dot_git/objects/pack/.keep | 0 .../zsh-aliases-exa/dot_git/packed-refs | 2 - .../zsh-aliases-exa/dot_git/refs/heads/master | 1 - .../dot_git/refs/remotes/origin/HEAD | 1 - .../zsh-aliases-exa/dot_git/refs/tags/.keep | 0 .../plugins/zsh-aliases-exa/dot_gitignore | 33 ---- .../zsh-aliases-exa.plugin.zsh | 21 --- 90 files changed, 1806 deletions(-) delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/LICENSE delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/README.md delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/FETCH_HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/ORIG_HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/config delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/description delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_applypatch-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_commit-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_fsmonitor-watchman.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_post-update.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-applypatch.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-commit.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-merge-commit.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-push.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-rebase.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-receive.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_prepare-commit-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_update.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/index delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/info/exclude delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/heads/master delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/remotes/origin/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/info/.keep delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.idx delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.pack delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/packed-refs delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/heads/master delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/remotes/origin/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/tags/.keep delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/dot_gitignore delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/executable_fzfz delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/executable_recentdirs.sh delete mode 100644 dot_oh-my-zsh/custom/plugins/fzf-z/fzf-z.plugin.zsh delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/LICENSE delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/README.md delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/config delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/description delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_applypatch-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_commit-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_fsmonitor-watchman.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_post-update.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-applypatch.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-commit.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-push.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-rebase.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-receive.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_prepare-commit-msg.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_update.sample delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/index delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/info/exclude delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/heads/master delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/remotes/origin/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/20/readonly_521a5088713e176654533b6f0e3beba2a0255e delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2c/readonly_0bddb876e66147be74ffb46a4ae1fc69dd2c6b delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2f/readonly_627e7b188f54d2c1d9e0b2c858207b498c5be0 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/30/readonly_cb4fd19e4cd571bead6d2c734591007823a73d delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/31/readonly_12c8f6b46433bf859f1b98ac8176afbcac23c6 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/48/readonly_ac7dcd7ea571a675db920e19bb2a717a4f764a delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/5f/readonly_d0ab58b14c41d1dccd9b5adb21b6c93f01d0e6 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6a/readonly_b611529be6a7226c496f8efa583def849d047f delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6f/readonly_29e297a9dadb76abfed7e380bef18b9e0df3c8 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6f/readonly_eac5bcc614ababaeaf5010455ddbd1c1da8632 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/84/readonly_5b4e667272b832cc1fc75b2bc61c26f2730276 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/88/readonly_addfe3fa5e60d673153a7bd5065bbf01e648be delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8a/readonly_5276d9dafc9ae28d0341271a91923b00df7984 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8b/readonly_f7860619d2427392c101f071184d172fd69b2f delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8c/readonly_f99ce1ed5a815f30da1c6bc75501d280387056 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/97/readonly_e5273849ffee146d89c3225bc569b63be41eb2 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/9c/readonly_bf56dac3a41405d02bbdaf4d65cd23376fc2c4 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/9f/readonly_ac5627e276180a363e9fb47ea87dc15b81eb89 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/a9/readonly_9ec60cddac48f1d4f29aebd699725d04b73920 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ab/readonly_26ad18374959f11f1d51d556ada3d53353a7e1 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ac/readonly_e4df591aeffbe83ed2d2e98cdd1149b14a61f3 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/c0/readonly_b8a17a9b8779a68b1365f51d8755368ec31048 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/d6/readonly_e7aa64a87a469abdaf60243de703deade5c358 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ee/readonly_f49cd26ac8eedc1196d0c63ba5490385baf37e delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/f6/readonly_b72da193f03911009cb95e3e2e18e48b918833 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/fb/readonly_f4f23227c329424b1c0a07a04e6827be0c8b62 delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/info/.keep delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/pack/.keep delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/packed-refs delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/heads/master delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/remotes/origin/HEAD delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/tags/.keep delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_gitignore delete mode 100644 dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/zsh-aliases-exa.plugin.zsh diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/LICENSE b/dot_oh-my-zsh/custom/plugins/fzf-z/LICENSE deleted file mode 100644 index 60823ed..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Andrew Ferrier - -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. diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/README.md b/dot_oh-my-zsh/custom/plugins/fzf-z/README.md deleted file mode 100644 index d36ff62..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/README.md +++ /dev/null @@ -1,135 +0,0 @@ -# fzf-z - -**Note**: Personally I am no longer using this plugin actively, so I have archived it. -If you're interested in taking it over, please let me know. - ---- - -This plugin was originally inspired as a mashup between -[fzf](https://github.com/junegunn/fzf), and oh-my-zsh's [z -plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/z), -which allows you to track recently and commonly used directories. The *z* -plugin does a great job of allowing you to switch between frequently-used -directories just by typing `z *somedirectorysubstring*`, but it doesn't really -easily allow you to browse those directories, with partial-string search. This -plugin was invented to solve that problem, using `fzf` as a front-end. Since -then, it's been extended to support [fasd](https://github.com/clvv/fasd) and -[autojump](https://github.com/wting/autojump), other 'frecency' plugins, as -alternatives to `z`. - -## Installation - -You can install `fzf-z` like any other `zsh` plugin. If you're not familiar -with `zsh` plugins, using a plugin manager is the easiest way to install one. -You can find information on some popular choices -[here](https://wiki.archlinux.org/index.php/Zsh#Plugin_managers). `oh-my-zsh` -and other configuration frameworks do not by themselves allow you to add custom -plugins such as `fzf-z`; you'll likely need a plugin manager in addition. - -### Pre-requisites - -You must have one of these installed: - -* The [z -plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/z). - -* The [fasd](https://github.com/clvv/fasd) tool (my personal choice, and recommended -if you are not already using one of these tools). - -* The [autojump](https://github.com/wting/autojump) tool. - -These tools must be in your `$PATH`. These have to be installed irrespective -of how you use `fzf-z`. - -You must also have [fzf](https://github.com/junegunn/fzf) installed. You can -set the full path to `fzf` binary with environment variable `FZF_BIN_PATH`, or -it uses the one found in your `$PATH`. - -*Note*: When you first use `fzf-z`, if you have configured -`FZFZ_RECENT_DIRS_TOOL` to use `z` (which is the default), it will dynamically -download `z.sh` for its own internal use. You still need to have the [z -plugin](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/z) -installed anyway. - -## Sources of information - -Since the original version, I've extended `fzf-z` to support other sources of -information about the directories you might be interested in, which are all -mixed into the same list delivered through `fzf`. In priority order (the order -in which they are shown in `fzf`, first to last): - -1. Directories *under* the current directory. The number of these shown in - `fzf` is limited by the `FZFZ_SUBDIR_LIMIT` environment variable, which - defaults to 50. If you don't want those to be shown, simply set this to - `0`. - -1. Recently used dirs. By default, these are provided by the `z` command from - the z plugin (the original purpose of this plugin). The order shown is the - order given by `z -l`. However, if you want to use `fasd` (preferred) or - `autojump` instead, set `FZFZ_RECENT_DIRS_TOOL` to `fasd` or `autojump` - respectively. - -1. All subdirectories in all directories listed in the `FZFZ_EXTRA_DIRS` - environment variables. These directories are space-separated, so for - example: - - `export FZFZ_EXTRA_DIRS="~/MyDocuments '~/Desktop/Some Other Stuff'"` - -## Ways to use fzf-z - -### As a zsh plugin - -Treat this plugin like any other zsh plugin and install using a [zsh plugin -manager](https://github.com/unixorn/awesome-zsh-plugins#frameworks). For -example: - -Once the plugin is installed, simply hit `` on the zsh command-line, -and it will bring up a list of directories according to the sources of -information listed above. Select one, perhaps typing to filter the list, and -hit Enter - the path to the selected directory will be inserted into the -command line. If you started with an empty command line, and you have the -`AUTO_CD` zsh option turned on you'll change to that directory instantly. - -This is similar to the default **Ctrl-T** binding already provided by the -[fzf zsh key-bindings -file](https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh). At -the moment, this plugin doesn't allow the **Ctrl-G** keybinding to be -customized, but you can change by simply forking the plugin and editing the -file if you want. - -### As a command - -*New*: this plugin repository also now includes `fzfz` as a standalone command -(although it depends on the provided script `recentdirs.sh` also). You can run this -as an alternative to using this as a plugin, and it will print the selected -directory to stdout, which you can use to embed this in other tools. - -## Customizing and Options - -If you set the `FZFZ_EXCLUDE_PATTERN` environment variable to a regex (matched -with `egrep`) it will exclude any directory which matches it from appearing in -the subdirectory results (it isn't applied to the `z`/`fasd`/`autojump` -results, since it's assumed any directory you've navigated to before is one -you might be interested in). By default this variable is set to filter out -anything in a `.git` directory. - -You can also set `FZFZ_EXTRA_OPTS` to add any additional options you like to -the `fzf` command - for example, `-e` will turn exact matching on by default. - -By default, fzf-z will filter out duplicates in its list so directories found -via multiple methods don't appear twice; however, this does slow it down. If -you don't care about that and want to speed it up, set -`FZFZ_UNIQUIFIER="cat"`. - -If you want to change the preview command used by fzfz (currently `tree` by -default if it's installed, or `ls` if not), set `FZFZ_PREVIEW_COMMAND` to -something like `ls {}` (`{}` is replaced with the directory currently -selected). - -## Performance - -If it's installed and in your `PATH`, `fzf-z` will use -[fd](https://github.com/sharkdp/fd). If not, it'll fall back to `find`, which -is slower. The behaviour is slightly differently also; `fd` will exclude files -ignored by `.gitignore` or similar, which `find` will not do, so you will get -less results. Generally, this is what you want, though. diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/FETCH_HEAD b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/FETCH_HEAD deleted file mode 100644 index 5935ab5..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -37c655b2b3f488b88281cda4538292ffab6fd1e7 branch 'master' of https://github.com/andrewferrier/fzf-z diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/HEAD b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/ORIG_HEAD b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/ORIG_HEAD deleted file mode 100644 index 757513f..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -37c655b2b3f488b88281cda4538292ffab6fd1e7 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/config b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/config deleted file mode 100644 index 2e47ed1..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = https://github.com/andrewferrier/fzf-z.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/description b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/description deleted file mode 100644 index 498b267..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_applypatch-msg.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_applypatch-msg.sample deleted file mode 100644 index a5d7b84..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_commit-msg.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_commit-msg.sample deleted file mode 100644 index b58d118..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_fsmonitor-watchman.sample deleted file mode 100644 index e673bb3..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_fsmonitor-watchman.sample +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_post-update.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_post-update.sample deleted file mode 100644 index ec17ec1..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-applypatch.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-applypatch.sample deleted file mode 100644 index 4142082..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-commit.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-commit.sample deleted file mode 100644 index 6a75641..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-merge-commit.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-merge-commit.sample deleted file mode 100644 index 399eab1..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git merge" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message to -# stderr if it wants to stop the merge commit. -# -# To enable this hook, rename this file to "pre-merge-commit". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" -: diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-push.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-push.sample deleted file mode 100644 index 6187dbf..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-rebase.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-rebase.sample deleted file mode 100644 index 6cbef5c..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-receive.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-receive.sample deleted file mode 100644 index a1fd29e..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_prepare-commit-msg.sample deleted file mode 100644 index 10fa14c..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_update.sample b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_update.sample deleted file mode 100644 index 80ba941..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/hooks/executable_update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/index b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/index deleted file mode 100644 index 7b315b814013f89f312c7d21321a55f3b62bda5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmZ?q402{*U|<4bwghGg6^&1ES79_G1A_pA^r`I(42??|7#P0-)rbHw>u#x(z>odA z6T;7&xYYM*XT`5lso4x%dg+-Zndy1?MX5kFU;sAf%VZB24K;5Es(CDy2~Bo)xLzKZ zD9S4koV(=nt_ut7FEOzDcsjfK1-k-G0_*=_U<;$6=Ilf@M}p~c{x{u+ozY?rM;3={ z`{cTLe&>>Z44gr(jxN5gdbueObAB21gUtcbP;+*nn#263RkbOq^xF+JyU=6n{~tJW z(Wt#=2ZKObRhn*Z!R7&JsCm1A=DkIP7w60TQiTKGg&(IJ zv^* 1610815524 +0100 clone: from https://github.com/andrewferrier/fzf-z.git diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/heads/master b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/heads/master deleted file mode 100644 index fedae1e..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 37c655b2b3f488b88281cda4538292ffab6fd1e7 Jan Eitzinger 1610815524 +0100 clone: from https://github.com/andrewferrier/fzf-z.git diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/remotes/origin/HEAD b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/remotes/origin/HEAD deleted file mode 100644 index fedae1e..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 37c655b2b3f488b88281cda4538292ffab6fd1e7 Jan Eitzinger 1610815524 +0100 clone: from https://github.com/andrewferrier/fzf-z.git diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/info/.keep b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/info/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.idx b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.idx deleted file mode 100644 index a416daad2cda463a3d2e363471f2d6e44f5168d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7372 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 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.pack b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/objects/pack/readonly_pack-5962ae81459aa11c57ea6eb45be94b5916135001.pack deleted file mode 100644 index 4edb4b2008dc81dd8610a28a8f131fefeb399462..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44791 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 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/packed-refs b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/packed-refs deleted file mode 100644 index 1a58031..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -37c655b2b3f488b88281cda4538292ffab6fd1e7 refs/remotes/origin/master diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/heads/master b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/heads/master deleted file mode 100644 index 757513f..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -37c655b2b3f488b88281cda4538292ffab6fd1e7 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/remotes/origin/HEAD b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28f..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/tags/.keep b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_git/refs/tags/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_gitignore b/dot_oh-my-zsh/custom/plugins/fzf-z/dot_gitignore deleted file mode 100644 index bb1a645..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/dot_gitignore +++ /dev/null @@ -1 +0,0 @@ -z.sh diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/executable_fzfz b/dot_oh-my-zsh/custom/plugins/fzf-z/executable_fzfz deleted file mode 100644 index 6f7520c..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/executable_fzfz +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env zsh -# -# These options are intended to be user-customizable if needed; you can -# override them by exporting them from your ~/.zshrc. See README for more -# details. - -FZF_BIN_PATH=${FZF_BIN_PATH:="fzf"} -FZFZ_EXCLUDE_PATTERN=${FZFZ_EXCLUDE_PATTERN:="\/.git"} -FZFZ_EXTRA_OPTS=${FZFZ_EXTRA_OPTS:=""} -FZFZ_UNIQUIFIER=${FZFZ_UNIQUIFIER:="awk '!seen[\$0]++' 2>&1"} -FZFZ_SUBDIR_LIMIT=${FZFZ_SUBDIR_LIMIT:=50} - -if ! (( ${+FZFZ_PREVIEW_COMMAND} )); then - command -v exa >/dev/null 2>&1 - if [ $? -eq 0 ]; then - FZFZ_PREVIEW_COMMAND='exa --level 2 --tree --color=always --group-directories-first {}' - else - command -v tree >/dev/null 2>&1 - if [ $? -eq 0 ]; then - FZFZ_PREVIEW_COMMAND='tree -C -L 2 -x --noreport --dirsfirst {}' - else - FZFZ_PREVIEW_COMMAND='ls -1 -R {}' - fi - fi -fi - -# ***** - -SCRIPT_PATH="${0:A:h}" - -if [[ $OSTYPE == darwin* && -z $(whence tac) ]]; then - REVERSER='tail -r' -else - REVERSER='tac' -fi - -if type fd &>/dev/null; then - FIND_PREFIX="fd --color=never --hidden . " - FIND_POSTFIX=" --type directory" - FIND_REMOVE_SURPLUS="cat" -else - FIND_PREFIX="find " - FIND_POSTFIX=" -type d" - # find includes the current directory, so we remove the first line from - # the output. - FIND_REMOVE_SURPLUS="tail -n +2" -fi - -if (($+FZFZ_EXCLUDE_PATTERN)); then - if type gegrep &>/dev/null; then - EXCLUDER="gegrep -v '$FZFZ_EXCLUDE_PATTERN'" - else - EXCLUDER="egrep -v '$FZFZ_EXCLUDE_PATTERN'" - fi -else - EXCLUDER="cat" -fi - -# EXCLUDER is applied directly only to searches that need it (i.e. not -# `z`). That improvements performance, and makes sure that the -# FZFZ_SUBDIR_LIMIT is applied on the post-excluded list. - -if (($+FZFZ_EXTRA_DIRS)); then - EXTRA_DIRS="{ $FIND_PREFIX $FZFZ_EXTRA_DIRS $FIND_POSTFIX && $FIND_PID=${!} | ($EXCLUDER; kill -9 $FIND_PID) } 2> /dev/null" -else - EXTRA_DIRS="{ true }" -fi - -if (($FZFZ_SUBDIR_LIMIT == 0)); then - SUBDIRS="{ true }" -else - SUBDIRS="{ $FIND_PREFIX '$PWD' $FIND_POSTFIX | $EXCLUDER | head -n $(($FZFZ_SUBDIR_LIMIT+1)) | $FIND_REMOVE_SURPLUS }" -fi - -RECENT_DIRS="{ $SCRIPT_PATH/recentdirs.sh }" -RECENTLY_USED_DIRS="{ $RECENT_DIRS | $REVERSER | sed 's/^[[:digit:].]*[[:space:]]*//' }" - -FZF_COMMAND="${FZF_BIN_PATH} --height ${FZF_TMUX_HEIGHT:-40%} ${FZFZ_EXTRA_OPTS} --no-sort --tiebreak=end,index -m --preview='$FZFZ_PREVIEW_COMMAND | head -\$LINES'" - -COMMAND="{ $RECENTLY_USED_DIRS ; $SUBDIRS ; $EXTRA_DIRS; } | $FZFZ_UNIQUIFIER | $FZF_COMMAND" -eval $COMMAND diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/executable_recentdirs.sh b/dot_oh-my-zsh/custom/plugins/fzf-z/executable_recentdirs.sh deleted file mode 100644 index b387f02..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/executable_recentdirs.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail - -FZFZ_RECENT_DIRS_TOOL=${FZFZ_RECENT_DIRS_TOOL:="z"} - -SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -if [[ $FZFZ_RECENT_DIRS_TOOL == "z" ]]; then - if [ ! -f "$SCRIPT_PATH/z.sh" ]; then - >&2 echo "Locally-cached copy of z.sh not found, downloading..." - curl https://raw.githubusercontent.com/rupa/z/master/z.sh > "$SCRIPT_PATH/z.sh" - fi - - source "$SCRIPT_PATH/z.sh" - _z -l 2>&1 && exit 0 || exit 0 -elif [[ $FZFZ_RECENT_DIRS_TOOL == "autojump" ]]; then - if [[ $OSTYPE == darwin* && -z $(whence tac) ]]; then - REVERSER='tail -r' - else - REVERSER='tac' - fi - autojump -s | $REVERSER | tail +8 | $REVERSER | awk '{print $2}' -elif [[ $FZFZ_RECENT_DIRS_TOOL == "fasd" ]]; then - fasd -dl 2>&1 && exit 0 || exit 0 -else - echo "Unrecognized recent dirs tool '$FZFZ_RECENT_DIRS_TOOL', please set \$FZFZ_RECENT_DIRS_TOOL correctly." - exit 1 -fi diff --git a/dot_oh-my-zsh/custom/plugins/fzf-z/fzf-z.plugin.zsh b/dot_oh-my-zsh/custom/plugins/fzf-z/fzf-z.plugin.zsh deleted file mode 100644 index 8525825..0000000 --- a/dot_oh-my-zsh/custom/plugins/fzf-z/fzf-z.plugin.zsh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env zsh -# -# Based on https://github.com/junegunn/fzf/blob/master/shell/key-bindings.zsh -# (MIT licensed, as of 2016-05-05). - -FZFZ_SCRIPT_PATH=${0:a:h} - -__fzfz() { - $FZFZ_SCRIPT_PATH/fzfz | while read item; do - printf '%q ' "$item" - done - echo -} - -fzfz-dir-widget() { - local shouldAccept=$(should-accept-line) - LBUFFER="${LBUFFER}$(__fzfz)" - local ret=$? - zle redisplay - typeset -f zle-line-init >/dev/null && zle zle-line-init - if [[ $ret -eq 0 && -n "$BUFFER" && -n "$shouldAccept" ]]; then - zle .accept-line - fi - return $ret -} - -# Accept the line if the buffer was empty before invoking the file widget, and -# the `auto_cd` option is set. -should-accept-line() { - if [[ ${#${(z)BUFFER}} -eq 0 && -o auto_cd ]]; then - echo "true"; - fi -} - -zle -N fzfz-dir-widget -bindkey -M viins -r '^G' -bindkey -M vicmd -r '^G' -bindkey -M emacs -r '^G' - -bindkey -M viins '^G' fzfz-dir-widget -bindkey -M vicmd '^G' fzfz-dir-widget -bindkey -M emacs '^G' fzfz-dir-widget diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/LICENSE b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/LICENSE deleted file mode 100644 index 97e5273..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Darrin Tisdale - -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. diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/README.md b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/README.md deleted file mode 100644 index 88addfe..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# zsh-aliases-exa - -## Purpose - -This zsh plugin enables a number of aliases extending `exa`, the modern replacement for `ls`. - -## Use - -To use it, you should first install [`exa`](https://the.exa.website). You can do so easily using [Homebrew](https://brew.sh) on the Mac: - -```bash -brew install exa -``` - -Next, download this repo into your custom plugins directory. For my installation using [Oh My Zsh](https://ohmyz.sh/), I cloned the repo to `~/.oh-my-zsh/custom/plugins`. - -Lastly, add `zsh-aliases-exa` to the plugins array of your zshrc file: - -```bash -plugins=(... zsh-aliases-exa) -``` - -Restart your zsh session, and the aliases will be available. - -## Aliases - -```bash -# general use -alias ls='exa' # ls -alias l='exa -lbF --git' # list, size, type, git -alias ll='exa -lbGF --git' # long list -alias llm='exa -lbGd --git --sort=modified' # long list, modified date sort -alias la='exa -lbhHigUmuSa --time-style=long-iso --git --color-scale' # all list -alias lx='exa -lbhHigUmuSa@ --time-style=long-iso --git --color-scale' # all + extended list - -# specialty views -alias lS='exa -1' # one column, just names -alias lt='exa --tree --level=2' # tree - -``` - -*Note:* the `-d` option removes the display of files, filtering it to only show directories. I cannot identify a time when I want that, so I have not included it. - -## Next Steps - -* Add in zshrc options to configure options - 1. color - 2. date format - 3. alias profiles - 4. including git column -* Create function to configure different profiles of aliases, so that different alias groups can be enabled. For example, one profile may be for replacing `ls`, another may leave those commands alone and use ones based on `exa` only. - -## Thanks - -Big thanks to Oh My Zsh, Homebrew, and Exa for these terrific tools. They have made the command line fun again. - -## Contributors - -* [Darrin Tisdale](https://github.com/darrintisdale) diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/HEAD b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/config b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/config deleted file mode 100644 index bc0dde9..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = https://github.com/DarrinTisdale/zsh-aliases-exa.git - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/description b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/description deleted file mode 100644 index 498b267..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_applypatch-msg.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_applypatch-msg.sample deleted file mode 100644 index a5d7b84..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_commit-msg.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_commit-msg.sample deleted file mode 100644 index b58d118..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_fsmonitor-watchman.sample deleted file mode 100644 index e673bb3..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_fsmonitor-watchman.sample +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $time) = @ARGV; - -# Check the hook interface version - -if ($version == 1) { - # convert nanoseconds to seconds - $time = int $time / 1000000000; -} else { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree; -if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $git_work_tree = Win32::GetCwd(); - $git_work_tree =~ tr/\\/\//; -} else { - require Cwd; - $git_work_tree = Cwd::cwd(); -} - -my $retry = 1; - -launch_watchman(); - -sub launch_watchman { - - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $time but were not transient (ie created after - # $time but no longer exist). - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - # - # The category of transient files that we want to ignore will have a - # creation clock (cclock) newer than $time_t value and will also not - # currently exist. - - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $time, - "fields": ["name"], - "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] - }] - END - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; }; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - my $json_pkg; - eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; - } or do { - require JSON::PP; - $json_pkg = "JSON::PP"; - }; - - my $o = $json_pkg->new->utf8->decode($response); - - if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { - print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; - $retry--; - qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - print "/\0"; - eval { launch_watchman() }; - exit 0; - } - - die "Watchman: $o->{error}.\n" . - "Falling back to scanning...\n" if $o->{error}; - - binmode STDOUT, ":utf8"; - local $, = "\0"; - print @{$o->{files}}; -} diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_post-update.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_post-update.sample deleted file mode 100644 index ec17ec1..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-applypatch.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-applypatch.sample deleted file mode 100644 index 4142082..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-commit.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-commit.sample deleted file mode 100644 index 6a75641..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-push.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-push.sample deleted file mode 100644 index 6187dbf..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-rebase.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-rebase.sample deleted file mode 100644 index 6cbef5c..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-receive.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-receive.sample deleted file mode 100644 index a1fd29e..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_prepare-commit-msg.sample deleted file mode 100644 index 10fa14c..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_update.sample b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_update.sample deleted file mode 100644 index 80ba941..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/hooks/executable_update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/index b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/index deleted file mode 100644 index 7aad5b97ee8fe950510001597e8d2125bca39854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmZ?q402{*U|<4bmN?bRy_TZ0Ho<5{pcuo5v<48Z2d-FJr3Q1c{F&12D@{#4z<^Zz@M z+|I*F(ML14SwE56#K7+3>Fnwk>ydM6^ zysMMVAXQbIp_`bKnOK}!teaYqs8^6vnx2`b2NZ^Smmws`735q=1``DXE`!tl7w7q0 oE!?*@SEtx@B147pa$CWd`$cOn&)f5B_xYyqb(`(qhfh=m0G0-S8vp 1579537293 +0100 clone: from https://github.com/DarrinTisdale/zsh-aliases-exa.git diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/heads/master b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/heads/master deleted file mode 100644 index 5708fe1..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f6b72da193f03911009cb95e3e2e18e48b918833 Jan Eitzinger 1579537293 +0100 clone: from https://github.com/DarrinTisdale/zsh-aliases-exa.git diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/remotes/origin/HEAD b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 5708fe1..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f6b72da193f03911009cb95e3e2e18e48b918833 Jan Eitzinger 1579537293 +0100 clone: from https://github.com/DarrinTisdale/zsh-aliases-exa.git diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/20/readonly_521a5088713e176654533b6f0e3beba2a0255e b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/20/readonly_521a5088713e176654533b6f0e3beba2a0255e deleted file mode 100644 index c9c8577..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/20/readonly_521a5088713e176654533b6f0e3beba2a0255e +++ /dev/null @@ -1,2 +0,0 @@ -x]Rj@}@^b%m(-4m)Ck -:Iܞ(IN yfgfg <୐lsqoc:1[ pGPm EaCG<)E$:@1 MYnaByG1I2|lCnur>u]+}BՑZV~hg#z0ȊKQ9M>iWɓ~;c7L^ ]HE=Uk0m4"[/Xl%i h^ܷ6%;;;(:u|%eUU/1I"Wmۥ}еV}wwQreD>.:cN5g1fݍEzms{Vu?CX \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2c/readonly_0bddb876e66147be74ffb46a4ae1fc69dd2c6b b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2c/readonly_0bddb876e66147be74ffb46a4ae1fc69dd2c6b deleted file mode 100644 index aa2e3475715db935d43704777719640d1df7ef0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYW{0iBZ1PQpMC#=X*~n4|{|c99m0v`G_f-&jOsj&Ye98xnZP;&{TL8mSOq>1}fM89@_NpK0#vT77CIiHf> zOxSah7OV8jkRu-g?y!nAnV@n0@VKzLPTb&d|1A2G?gQQF4&zSAd*_=WVKeE}&= z87fGdhId&OuOj=*%NeIMR^-Tx-AarrV@w#;^o?Soq|(eJG<`DQ0+;f@_~w{+e-5%C zUIT6{7Ad9;oL0oFFcGvHb_;8P-`#9y`-FbK*Xy0XC@!c1fvPI=!h>aLEEGJ)4sZ8( aW;G%eB5{o}4o)`zz=aFdOXmk7RrW^c9JO5l diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2f/readonly_627e7b188f54d2c1d9e0b2c858207b498c5be0 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/2f/readonly_627e7b188f54d2c1d9e0b2c858207b498c5be0 deleted file mode 100644 index 80c47c34f22da5bed9306b80e8f797cfe1be452c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 941 zcmV;e15*5W0i9J%Z`(!??bZAh1L)wW6)89=S~P%wCTZLhXwsr~4y{puOL9bRvmeCn z(lUL>Z_nE$MaO9nz|ldVsNFYjX5PH1l&$FOryqa#W<|HY%Y~A{v(NcPWZ7y(e-5s< zp0n(-lRloHUJb1@#70z#Jqa>{uGo>?(|nouCa`IwX{iKGxuMW8Y1^SoyURlkR+y&wf<(xf*B>3d9_b(7 z-4U~$9&f>HyWY@mR4Z#Z2IMIoqLuHrh3#@Z=4j1!3cH;;gtBJY@4^Q)Zb&o@m7nyt zBmhLP`8)~d#2EXSa=>Xx~f_fa7S zi8fYD;#x=*g#@lp+p|f1S%j;E@3IxOY}g4EMUkc3r2Os_y*Q<>{;Ys;1WQumF=Dg7ET|q4crGH*k*lY6|#1Y3ZP1U`U?OQ!u2*e3ebMC{aco(VV5+jyshws`d>vCTU#bB_4 zC8&GUZ$1P0^FuHv$nR#4!8oMCKq$WFT0$XVq-)8CrNI|-#Iw_rlaq%_W(8AVLRy1{ zj{n18lM$L1_%Org!7(Ed#n-HMkH1*{dn{HIZzjp78Hn~m7lC`9W#7^>3@+Su8b;ek zzwmKxYisth9URmAG9x-GB2Vk^__&z535V4p;Kh?-a%bwDjWg}>?)w7JwHlIBL$Y(0 zi2A~D)WUu+b#kbC0il*XyXfCXtdG1Oa}Z5M1eo6O*fh4SvqSHbD`W7d_0dd*h-ucn z!ra7C&!D8?MK~CD#I!TgKEbw#ZernEFj5>*EUp<5v82FXYd8&-Qgq5>I&qia*%Ryp zVu9PH-GK)MH%}aY0*Sp3o8f}oKR8{t&nCiycgC4C#wO=0St1w`UNJ8eqT!8V1({A0ov0IRe=n* PO*#^$6YJ~)-v4P*rRCaH diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/30/readonly_cb4fd19e4cd571bead6d2c734591007823a73d b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/30/readonly_cb4fd19e4cd571bead6d2c734591007823a73d deleted file mode 100644 index dc0c75e..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/30/readonly_cb4fd19e4cd571bead6d2c734591007823a73d +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU043a040031QK,L/Je|Uʊ*Y{'>g*OgW`WO-<<}4sMP%A.z) k?pXԪ*[~g3ts2SuS+ -rJ3 :ww=KtWK?wuE \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/31/readonly_12c8f6b46433bf859f1b98ac8176afbcac23c6 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/31/readonly_12c8f6b46433bf859f1b98ac8176afbcac23c6 deleted file mode 100644 index 96670e17b23020143228c6abb673e0a26b5c39d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmV;10D1p-0V^p=O;s>7GGj0_FfcPQQSk9}cJ&K(Wtjd{-NN(#JCWSZ!%ERdGq+hk zk=q1S66EUW;_IrHo5G+FBo)w6XeXW)5^SB%XZ?E70@XOEqN?Hy-Nc;C#NyOq-PDRi oy@H(5^vpaxpfE$$Ho>6T&z39Yc;@&0im-j(GMA+u0MR}#ziGTi!TwmU>>+EE(rPX$L{`M#dM zp6sRM27SPXR?Q&Fl9HG=C61n!0hPUkStcU%+D9DXgcRJJt8ER;mNAL;fhC%$c%Ooz zgkfeH(<#%;%P^Va@AkDAVlXr?Ff%bx@bPqZ^$T`onEq7V!t?(-k=)M1O3_C%w^=`t r+XPh-#CQV!f;^6!m8QrmCL$?Q@_f#hnn>r7VrQ7OCKFt)!{2f diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6a/readonly_b611529be6a7226c496f8efa583def849d047f b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6a/readonly_b611529be6a7226c496f8efa583def849d047f deleted file mode 100644 index 70e195cf2c959b780c9bb466c8e0738f66f5a82b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y(0dz;&i9>TdAk? znda^+a*u*Wvm{-xWX94A(nX$J<=Hjqw|ie1+mP8l^#F|6zqY?5=HjFdG zBA+FsKM3iE5mD5J2DKbhYG7(rjN8nAuNahcegaM&k?zWTfL0D{_`fW^(;I{DF$ zKHyY`EmpL~px3W0vUxf$ke4oIIv$Ni5QEX!_8NTy H1Ej`sEHIZS diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6f/readonly_29e297a9dadb76abfed7e380bef18b9e0df3c8 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/6f/readonly_29e297a9dadb76abfed7e380bef18b9e0df3c8 deleted file mode 100644 index 4aa8c93f106dfcad5c5f9418369a563ce93a9e84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 930 zcmV;T16}-h0i9LLj@vdA?OI=P0WT7_mW)ZVNdNU9|B2@ zN3+Pc=a7^&le9>icwxvgdCs}7a~owFI(z!`@i!~F^?fOn6rO#_H=-z3D|$P+!Fn!= z%U=3;f(A7nq#-tO8Fj;s?4IV!#5aLWC(VIs;M5xmJ(IQ_J422KC0f>O0`0A% zTKT$4RPPdvrO`9Vu%XG0Bbr#f=uW#Dy1 zzvF5v40V>gB^F+)3Aj!ym%5x1UBpdv^R&+2~d>CHrc z`2J3w?e%mEecSbhexg=c!;z3PAK2>m+sgK(o=Vhbn`yVXOewcN3m??9A<=bIe^TU{ z01(0E^CX-TQ!HkR0jFJy^eeuXk@@KEVO3S1HqAPx=Ql>FTv$K|J>?N5M3^l8)GJ4c ziZ)E*T1XXJDmTN6+=q8%SkZwEJE3BK6zMi8zk7g+JfN@stblO>OITE@=A6p%Aj22K z0!(^zg_pOCo}UJM1LuUV7J?toyRV@DzC{N|k_A)$6BN+iy0F8*$-U(6vvJ(R+{6)0 zH>eYVF*$DG5ht3i>0iskJ3U?q@C2#3^kGuGi_%JoX-m1ocWae(rEi5|C|JQ9)JM{9 z{sr>+mtbbd?`F5bOr*pVEAj)kQm8P|wdCVc-;0^>?6V2^?^asDCzuf4sL{`VVamw} z%?nSMdCK6J5s>0*R=Y?4pLIp?W@`OpjL~c8BJkjg;#+!wDTe>%$+SZ>4nq2xC-$Rh zlU;p8h_2bQi;jN6y0;B557A*nfCHY6H4GpxlrFm?rdkgQ^Al4&gOY|Z z;b7bvd5feCgZ&X*#lpnksyL!pTr(K4wxC~YI1biSw9RBbalPQ#6Wkq51M5xe1P^M; z-gDUt^EYz+QXZmkJjeVl&b*=13dwHv!;MIqAOO&Tox>2dxMG#B=(6XD`lv{YF3MU& zpoKQ7GGj0_FfcPQQSk9}cJ&K(Wtjd{-NN(#JCWSZ!%ERdGq+hk zk=q1S66EUW;_IrHo5Jw>%O@lC!!wyD o>J{Xarf25q0fiZ|wh0E!ezsgG$1}h0SA^~RmbonT05woB`Bnf!7GGj0_FfcPQQSk9}cJ&K(Wtjd{-NN(#JCWSZ!%ERdGq+hk zk=q1S66EUW;_IrHo5G+FBo)w6XeXW)5^SB%XZ?E70@XOEqN?Hy-Nc;C#NyOq-PDRi oy@H(5^vpaxpfJN~wY3uFo{=BrWdpBhkO7U##fC_oYx$c=jdVi=tSq=$FwA)^kzZ z_R_}_G^lYe4Y3i8Vo!q1s2g@4E}nv0eS_V>d1|kfiEih z4Od%XsI%lPvG7t&z>N{zy|$Vg$H(*i_^a~$1zD3KeIwfIqNwY-5xy_t+l4xo1uu%? zEpl7~|7esI9j>7|NX_D8urYK;?dXHmbGOITE@<`tFYUWQMG z1(@`h3NIfRGd~S@0_TLU7J?r>ivjQ!0~|RPNPWiaa@2Tw>%tc6CU=s%k7n@*avc{m z-Jnhc#@@JvMl3A-Yq@`?#~T5fAT^ghOp3QLuu@{xQsMAyt+KB4tx${rR!|1@Uf}ot zM*QYeAT#2Zv(jK6QdNo-`GH$0RG8=>`MC7`-$V@~%cLq?^ElN67R7Dg%GW%8>&`q!vXpJGmbn&sq3_=(38nv<_dd zsyuh_1T6yocwS{cp~2ad8UFjK0(4}L*V?-63IckH6$oUk6b zRZ1`BiSnF|WqH{2?Qz|UYFGys-p*m{f^@>gOWxYa4@=BcDdw$@VBUX7R`d{ z?@MA&GQ^(2nb{_x!s+y_O5H6*)BZOrw)?S=UZwfu@};0?w8gCCz}yQ mmb!iS9Sj5QzLmbivY%ZG-RZ}sLV}wv9SQlwMez?tNTo#_)dNZZ diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8a/readonly_5276d9dafc9ae28d0341271a91923b00df7984 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8a/readonly_5276d9dafc9ae28d0341271a91923b00df7984 deleted file mode 100644 index 1e83e8331f97ab82828ea95313ce4680fe3bf449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmV;b09F5Z0V^p=O;s>7Ghr|^FfcPQQP4}zEXhpI%P&f0xb}Qi%8DwtS$o$fsMtPd zzPI-2;RvWIA5UjjzhGB}=}*-yJpaEF$?ZI>6n!*voAnd9O;9C4u8uCgu6nsC4EdUm zrmwtpyKMEp>yI1uee9mc`}qV^QB`qSrK_8&3$5GO?r0o!Rde49@ zqJ#u`ahB|FzyCk&nJP1dQ9QT`+5x;0y@e`s zseAOB_B~qU9tCZU`r(N6V-`jbj*|Xe5)DazDE-XXiuA;-l^Q;z6I>xltXlMaGeUmJ zim^isSQtZen}ow8ib;PK(jP~(NzGBCNjt@Fnv0HYD8t+LQvn3v9j<^?u* dzsECg5vdV{OH^re^7;=_1W=u9{{Z%=_!9$ux&r_J diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8c/readonly_f99ce1ed5a815f30da1c6bc75501d280387056 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/8c/readonly_f99ce1ed5a815f30da1c6bc75501d280387056 deleted file mode 100644 index 6defc997da7895e104ff332eab09462c91fbc10c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmV;a09OBa0V^p=O;s>7Ghr|^FfcPQQP4}zEXhpI%P&f0xb}Qi%8DwtS$o$fsMtPd zzPI-2;RvWIA5UjjzhGB}=}*-yJpaEF$?ZI>6n!*voAnd9O;9C4u8uCgu6nsC4EjlR z)e`+7mk!>1u<1mELbYd4^aH4(s^SdY#GK5;;?!c@)QUvCf}GOy%sf4yFhlqEHa5vi XPQ{ZBGJYtO@DO0?%BU$#A#QGw!6Jl?ad@+u^N)dF-ti*i6O2+jBKZ9|9!^+ zwrV9L9ga?oL3arpoYr6u(Duq5bppYH8sFipoyP^+1Z74u9zj8iR0JnO zk1*aI!bLfa!yPE^ZEFJ6qAF{K^clhyyjTfjVH;M+ zCuGGMus3`_y{35{sR-SodJ*+OT2_0(U)K`WWu7rCE*UDL%bZ=Q&{UdJzDXdX8~Pg6 z2`CXokT`Z#2fHC&GzP~5Q5dv>hZ&4KY zZEF*3G;ec=fHTH&sxkZMoy#=^tR`b3PG*TzGZS0KQ9WqLK7kO0qvleGeX6GTYLO(D zh`88Lw9kt}s}()xS08YvG1?9v?Yqz_a4Elho_~D(+^DT*?%O+<5P~s2VuF+QTC3wd gQm6b&qHcW*;VA|BW46A-v2}$XIqgNg0H57eJN)EQWB>pF diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/9f/readonly_ac5627e276180a363e9fb47ea87dc15b81eb89 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/9f/readonly_ac5627e276180a363e9fb47ea87dc15b81eb89 deleted file mode 100644 index 0bee3ab518b75cd7abd12e58e336a73ae09d9785..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmV+f0{i`V0d-Q#a-u*0+%sP>cPnuaX2hywE1-yD2=er?H(tU3G75u$U!QDp-R)a< zRabXacg!vq$^k~`7jM!OpmPGl2q}>$$Fi7+NgOAO2!%;B6C)fiq%#x~m|`L9c+MKI z3Y&)3z^82zRw;N%zWFo%;cwX`q}6lGF28|@5E8|igfMu5GK9jH`W4O71{joYx(K|~ ztVyrc_?A(gchP@r*)?lv2A=*x(+y$)+pvL03`_L`SO3-pAb`HrVog=GrK&obvyEHN zD3`AGKFHWTf8)YZ9!N zEi)QjcBalXHpYZ;vp16%2RD)zJV1NemwmPq=h9<$t&Rc+y6xCL)OntJtryp;?KNQQ zkhIF#oa_S}OC8Sp{iY)K9M#u~S_gKxjnGxH8V2<{7l1$N1IatlUYRPvX|fHw)7<%hiU4w$$%^f?H?qlCxMfH8>=u)WN^&uU z_)@?*UmPCO5#DiE29IJ%j{SD*^qYSe_g(oafLBM-2H|Hj-CF&7F@e;S)35?R$M^&S GBhZ(yMg7nK diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/a9/readonly_9ec60cddac48f1d4f29aebd699725d04b73920 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/a9/readonly_9ec60cddac48f1d4f29aebd699725d04b73920 deleted file mode 100644 index 046b33b256dba9dda68c8648fd71b1c81d8365af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmV;j08RgR0i}-1X+tp(0CQFq+klP!s|O~;kP^~>v|2d}dLLxD|2&csa-2B~L;JeQ z1RLGk9L$h>D4t_Pi?$?ZiA*C5#TJT&Y-|>twiwls2X7OWmMKJwd^(eKcG2^gO#mBBEBt4EENjH^r}<`6w>Klzoj8U#iZ:"|eUgG;M} V \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/c0/readonly_b8a17a9b8779a68b1365f51d8755368ec31048 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/c0/readonly_b8a17a9b8779a68b1365f51d8755368ec31048 deleted file mode 100644 index 154b045..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/c0/readonly_b8a17a9b8779a68b1365f51d8755368ec31048 +++ /dev/null @@ -1,3 +0,0 @@ -x-1 -0 FanIm4[A<K 2xI8.b -~6,Gctw L \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/d6/readonly_e7aa64a87a469abdaf60243de703deade5c358 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/d6/readonly_e7aa64a87a469abdaf60243de703deade5c358 deleted file mode 100644 index afe975393f8f48324cd7604009357ff5a3645c10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=H0gY0@N&_(v^&IdY26_`rRnUVVQmqw1RNUf8DB0a9^JLp7Gxg3xCzPBq9T1C!iiN`L{IJkz3&fm2p z;Nwn{91AltX*dQZ+S?;iBVsyxrG zbg0GKC+FbKQWF(uI9N5{(Fz6BC_0L0TaGL#V^RLW^OQ0+8V9L!l~R;+2aeuKODP7uplIGHEZi1HdfEy0X^i`o46g}q^yS}N;7`c9M8IR5bgJ^(ad F!dr7uwEh49 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ee/readonly_f49cd26ac8eedc1196d0c63ba5490385baf37e b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ee/readonly_f49cd26ac8eedc1196d0c63ba5490385baf37e deleted file mode 100644 index 10a9a01..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/ee/readonly_f49cd26ac8eedc1196d0c63ba5490385baf37e +++ /dev/null @@ -1,2 +0,0 @@ -xN0D9+iBTj\?]['0z#hxѠ?UUY11G(mR "I<{}n)c⁂) Yax{T8Qc M -;Le~ޣxpnK"*@HM=ؕT~4ӵ-~>Op[}a \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/f6/readonly_b72da193f03911009cb95e3e2e18e48b918833 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/f6/readonly_b72da193f03911009cb95e3e2e18e48b918833 deleted file mode 100644 index 1ace15e..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/f6/readonly_b72da193f03911009cb95e3e2e18e48b918833 +++ /dev/null @@ -1 +0,0 @@ -x]jB1F}*fJ&?&>Ԁ4^%|>N "`u^\aL2`OuR4d@YMH†]ZU>Bc>7CĿ|ը>3!&Ĩaj[):QWi- =ߠ?g^Qg \ No newline at end of file diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/fb/readonly_f4f23227c329424b1c0a07a04e6827be0c8b62 b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/fb/readonly_f4f23227c329424b1c0a07a04e6827be0c8b62 deleted file mode 100644 index 5fbdce4b7742cc1e98e1e007fc69c26eb3b3c7aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmV-(1C0E50c})GkJ~m7?ODHK03Q+;wv259v`h=F44NLkc{B6owc53G_0x-=zgy8`kXxaZ2pqQjMO4*lMSqTdaDl7p zPO6Y1Xwc(9Sz;?%&4C2j(X{Nz?P-2Y{3WvOl|4`coMuB&G8xyix8!-yqGQ80(%yM$ zbZBbIxjyAQj>f>G;)W(SQjl)cJ?)hbk(3QlXifJS_VaTY;}Bl%c7U&us6KKVROEF{ zf8l8-EcK3pBNjpF3Al;U{cp~2>-l(opMKRruF2U<^{wb$R!!4X>5o&^)RJ`h4&`lt ze6-q$9uLqMROJvDT_WwN8$)zvZdIUOdG4a~Q%$!h*-Q(jhzcoZUhgHno#^i%&%~TG z(<7Me)*JerI_)f{gk16=Tl3$pc5-W`Ek?5|X?JBpXlqsdAwtyChD6^}^UZu40zd+r z<4JfgrZmS~1EPJ0#%nIUn4_+r*LD4^RMxpM)d$9Wd_27;C@G*q+mn>5deqffoR=AoRE5 zG6Vn|)G?!^_d**7(Lr!e0COc$^*!4K+t1h^Zb5MyoR8Pgy4ox5=Ts+h_zweYr?dO$+DWLz5Z zai)27A-qg)g-zq!>#|WUGL$HaBP2;iWf=Ovz9!)dGw%rhJE{kv;T_>@9$7hQDd}V6 zAyn1(^cr%9M->UXA#GVmYVVxgtHbD-=F5ucs>Zc;9>*W*JdXrzM8w69b@4PByi1!9 zfc?fZW=8wbc6ochg2hz#?31@GFP`{fnn5Y^999H=@NOJJb}TGKvDUtr1%z(~4Pm5? z&7fqkrwB~`S^PA6Eu1uMnnMF&G6>Nu9#Ugr;Hc3UY#|Igxkw&$@>!e%Vb!1vI8pXh z95kFNxAjg6`wv=rqYjBV&Z&(jr`phBre(!{#g-;gU;ymM-b3Xbo;V$9x|2MSOq7i1 z6R#61NCBMCQW6KDY%zm3&PK1=5ylAyTe|-R28F5KsnA0MXO}#vD95%&g}Xk7#1gTt J{s&U-NACGTuu=d3 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/info/.keep b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/info/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/pack/.keep b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/objects/pack/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/packed-refs b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/packed-refs deleted file mode 100644 index 457f9bd..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f6b72da193f03911009cb95e3e2e18e48b918833 refs/remotes/origin/master diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/heads/master b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/heads/master deleted file mode 100644 index 9c72ad8..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -f6b72da193f03911009cb95e3e2e18e48b918833 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/remotes/origin/HEAD b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28f..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/tags/.keep b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_git/refs/tags/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_gitignore b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_gitignore deleted file mode 100644 index d6e7aa6..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/dot_gitignore +++ /dev/null @@ -1,33 +0,0 @@ - -# Created by https://www.gitignore.io/api/macos -# Edit at https://www.gitignore.io/?templates=macos - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# End of https://www.gitignore.io/api/macos diff --git a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/zsh-aliases-exa.plugin.zsh b/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/zsh-aliases-exa.plugin.zsh deleted file mode 100644 index 7aa1571..0000000 --- a/dot_oh-my-zsh/custom/plugins/zsh-aliases-exa/zsh-aliases-exa.plugin.zsh +++ /dev/null @@ -1,21 +0,0 @@ -# -# Project: zsh-aliases-exa -# File: /zsh-aliases-exa.plugin.zsh -# Created: 2019-04-12 19:07:28 -# Author: Darrin Tisdale -# ----- -# Modified: 2019-05-14 23:18:24 -# Editor: Darrin Tisdale -# - -# general use -alias ls='exa' # ls -alias l='exa -lbF ' # list, size, type, git -alias ll='exa -lbGF' # long list -alias llm='exa -lbGF --git --sort=modified' # long list, modified date sort -alias la='exa -lbhHigUmuSa --time-style=long-iso --git --color-scale' # all list -alias lx='exa -lbhHigUmuSa@ --time-style=long-iso --git --color-scale' # all + extended list - -# speciality views -alias lS='exa -1' # one column, just names -alias lt='exa --tree --level=2' # tree From 674ea2016f09cd2bcffc120507c841fd6cfedc0a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 16 Feb 2024 14:17:59 +0100 Subject: [PATCH 2/3] Add new lazy nvim plugins --- dot_config/nvim/lua/plugins/coding.lua | 16 ++++++++++++++++ dot_config/nvim/lua/plugins/disabled.lua | 3 +++ dot_config/nvim/lua/plugins/test.lua | 13 +++++++++++++ dot_ssh/config | 2 +- dot_zshrc.tmpl | 4 ---- 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 dot_config/nvim/lua/plugins/coding.lua create mode 100644 dot_config/nvim/lua/plugins/disabled.lua create mode 100644 dot_config/nvim/lua/plugins/test.lua diff --git a/dot_config/nvim/lua/plugins/coding.lua b/dot_config/nvim/lua/plugins/coding.lua new file mode 100644 index 0000000..3e89044 --- /dev/null +++ b/dot_config/nvim/lua/plugins/coding.lua @@ -0,0 +1,16 @@ +return { + { + "hrsh7th/nvim-cmp", + opts = function(_, opts) + local cmp = require("cmp") + opts.sources = cmp.config.sources(vim.list_extend(opts.sources, { { name = "neorg" } })) + end, + }, + { + "windwp/nvim-autopairs", + event = "InsertEnter", + opts = { + fast_wrap = {}, + }, + }, +} diff --git a/dot_config/nvim/lua/plugins/disabled.lua b/dot_config/nvim/lua/plugins/disabled.lua new file mode 100644 index 0000000..076912a --- /dev/null +++ b/dot_config/nvim/lua/plugins/disabled.lua @@ -0,0 +1,3 @@ +return { + { "echasnovski/mini.pairs", enabled = false }, +} diff --git a/dot_config/nvim/lua/plugins/test.lua b/dot_config/nvim/lua/plugins/test.lua new file mode 100644 index 0000000..aef9b15 --- /dev/null +++ b/dot_config/nvim/lua/plugins/test.lua @@ -0,0 +1,13 @@ +return { + { + "nvim-neotest/neotest", + opts = { + adapters = { + ["neotest-go"] = { + -- Here we can set options for neotest-go, e.g. + -- args = { "-tags=integration" } + }, + }, + }, + }, +} diff --git a/dot_ssh/config b/dot_ssh/config index bffca0d..b2e1a08 100644 --- a/dot_ssh/config +++ b/dot_ssh/config @@ -59,7 +59,7 @@ User unrz254 ProxyJump cshpc Host gondor -Hostname 192.168.178.60 +Hostname 192.168.1.130 ForwardAgent no Host rohan diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 33b1a6a..c97e965 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -12,7 +12,6 @@ COMPLETION_WAITING_DOTS="false" export FZF_DEFAULT_COMMAND="fd --type file --color=always" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_DEFAULT_OPTS="--ansi" -export BAT_THEME="gruvbox-dark" zle -N zle-line-init zle -N zle-keymap-select @@ -39,6 +38,3 @@ source $HOME/perl5/perlbrew/etc/bashrc export PATH=/opt/homebrew/bin:$PATH {{ end }} {{ end }} - -eval "$(zoxide init zsh)" -eval "$(starship init zsh)" From 13c23dfa1cc200c41b73c22816e7559a15c9c9a0 Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Fri, 16 Feb 2024 14:20:24 +0100 Subject: [PATCH 3/3] cleanup --- dot_config/nvim/after/ftplugin/tex.lua | 26 --- dot_config/nvim/after/plugin/cmp.lua | 85 -------- dot_config/nvim/after/plugin/lsp.lua.tmpl | 220 -------------------- dot_config/nvim/after/plugin/telekasten.lua | 76 ------- dot_config/nvim/after/plugin/telescope.lua | 34 --- dot_config/nvim/after/plugin/treesitter.lua | 94 --------- dot_tmux.conf.tmpl | 3 +- 7 files changed, 1 insertion(+), 537 deletions(-) delete mode 100644 dot_config/nvim/after/ftplugin/tex.lua delete mode 100644 dot_config/nvim/after/plugin/cmp.lua delete mode 100644 dot_config/nvim/after/plugin/lsp.lua.tmpl delete mode 100644 dot_config/nvim/after/plugin/telekasten.lua delete mode 100644 dot_config/nvim/after/plugin/telescope.lua delete mode 100644 dot_config/nvim/after/plugin/treesitter.lua diff --git a/dot_config/nvim/after/ftplugin/tex.lua b/dot_config/nvim/after/ftplugin/tex.lua deleted file mode 100644 index aca76a7..0000000 --- a/dot_config/nvim/after/ftplugin/tex.lua +++ /dev/null @@ -1,26 +0,0 @@ -vim.g.tex_flavor = "latex" - -vim.opt_local.conceallevel = 2 --- vim.opt_local.spell = true -vim.opt_local.wrap = true - -require("nvim-surround").buffer_setup({ - surrounds = { - ['"'] = { - add = { "``", "''" }, - find = "``.-''", - delete = "^(``)().-('')()$", - }, - ["$"] = { - add = { "\\(", "\\)" }, - find = "\\%(.-\\%)", - delete = "^(\\%()().-(\\%))()$", - change = { - target = "^\\(%()().-(\\%))()$", - replacement = function() - return { { "[", "\t" }, { "", "\\]" } } - end, - }, - }, - }, -}) diff --git a/dot_config/nvim/after/plugin/cmp.lua b/dot_config/nvim/after/plugin/cmp.lua deleted file mode 100644 index 01f483e..0000000 --- a/dot_config/nvim/after/plugin/cmp.lua +++ /dev/null @@ -1,85 +0,0 @@ -local ok, cmp = pcall(require, 'cmp') -if not ok then - return -end - -require('luasnip.loaders.from_vscode').lazy_load() - -local luasnip = require('luasnip') -local lspkind = require('lspkind') -local select_opts = {behavior = cmp.SelectBehavior.Select} - -cmp.setup({ - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end - }, - sources = { - {name = 'path'}, - {name = 'nvim_lsp', keyword_length = 1}, - {name = 'buffer', keyword_length = 3}, - {name = 'luasnip', keyword_length = 2}, - }, - window = { - documentation = cmp.config.window.bordered() - }, - formatting = { - format = lspkind.cmp_format({ - mode = 'symbol_text', -- show only symbol annotations - maxwidth = 50, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters) - }) - }, - mapping = { - [''] = cmp.mapping.select_prev_item(select_opts), - [''] = cmp.mapping.select_next_item(select_opts), - - [''] = cmp.mapping.select_prev_item(select_opts), - [''] = cmp.mapping.select_next_item(select_opts), - - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({select = true}), - [''] = cmp.mapping.confirm({select = false}), - - [''] = cmp.mapping(function(fallback) - if luasnip.jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, {'i', 's'}), - - [''] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, {'i', 's'}), - - [''] = cmp.mapping(function(fallback) - local col = vim.fn.col('.') - 1 - - if cmp.visible() then - cmp.select_next_item(select_opts) - elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then - fallback() - else - cmp.complete() - end - end, {'i', 's'}), - - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item(select_opts) - else - fallback() - end - end, {'i', 's'}), - }, -}) - - diff --git a/dot_config/nvim/after/plugin/lsp.lua.tmpl b/dot_config/nvim/after/plugin/lsp.lua.tmpl deleted file mode 100644 index 769c630..0000000 --- a/dot_config/nvim/after/plugin/lsp.lua.tmpl +++ /dev/null @@ -1,220 +0,0 @@ -local ok, lsp = pcall(require, 'lspconfig') -if not ok then - return -end - -{{- if ne .chezmoi.os "openbsd" }} --- See :help mason-settings -require('mason').setup({ - ui = { border = 'rounded' } -}) - --- See :help mason-lspconfig-settings -require('mason-lspconfig').setup({ - ensure_installed = { - 'clangd', - 'gopls', - 'ltex', - 'marksman', - 'svelte', - 'tsserver', - 'eslint', - 'html', - 'cssls', - 'lua_ls' - } -}) -{{- end }} - -local lsp_defaults = lsp.util.default_config - -lsp_defaults.capabilities = vim.tbl_deep_extend( - 'force', - lsp_defaults.capabilities, - require('cmp_nvim_lsp').default_capabilities() -) - -local sign = function(opts) - -- See :help sign_define() - vim.fn.sign_define(opts.name, { - texthl = opts.name, - text = opts.text, - numhl = '' - }) -end - -sign({ name = 'DiagnosticSignError', text = '✘' }) -sign({ name = 'DiagnosticSignWarn', text = '▲' }) -sign({ name = 'DiagnosticSignHint', text = '⚑' }) -sign({ name = 'DiagnosticSignInfo', text = '' }) - -vim.diagnostic.config({ - virtual_text = false, - severity_sort = true, - float = { - border = 'rounded', - source = 'always', - header = '', - prefix = '', - }, -}) - -vim.lsp.handlers['textDocument/hover'] = vim.lsp.with( - vim.lsp.handlers.hover, - { border = 'rounded' } -) - -vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with( - vim.lsp.handlers.signature_help, - { border = 'rounded' } -) - -vim.lsp.handlers["workspace/diagnostic/refresh"] = function(_, _, ctx) - local ns = vim.lsp.diagnostic.get_namespace(ctx.client_id) - pcall(vim.diagnostic.reset, ns) - return true -end - -vim.api.nvim_create_autocmd('BufWritePre', { - pattern = '*.go', - callback = function() - vim.lsp.buf.code_action({ context = { only = { 'source.organizeImports' } }, apply = true }) - end -}) - -require("lsp-format").setup { - html = { - exclude = { "html" } - }, - svelte = { - exclude = { "svelte" } - } -} - -{{- if ne .chezmoi.os "openbsd" }} -local group = vim.api.nvim_create_augroup('lsp_cmds', { clear = true }) - -vim.api.nvim_create_autocmd('LspAttach', { - group = group, - desc = 'LSP actions', - callback = function(args) - local bufmap = function(mode, lhs, rhs) - local opts = { buffer = true } - vim.keymap.set(mode, lhs, rhs, opts) - end - local client = vim.lsp.get_client_by_id(args.data.client_id) - require("lsp-format").on_attach(client) - - bufmap('n', 'K', 'lua vim.lsp.buf.hover()') - bufmap('n', 'gd', 'lua vim.lsp.buf.definition()') - bufmap('n', 'gD', 'lua vim.lsp.buf.declaration()') - bufmap('n', 'go', 'lua vim.lsp.buf.type_definition()') - bufmap('n', 'gs', 'lua vim.lsp.buf.signature_help()') - bufmap('n', 'gA', 'Telescope diagnostics') - bufmap('n', 'gr', 'Telescope lsp_references') - bufmap('n', 'gi', 'Telescope lsp_implementations') - bufmap('n', '', 'lua vim.lsp.buf.rename()') - bufmap('n', '', 'lua vim.lsp.buf.format({async = true})') - bufmap('n', '', 'lua vim.lsp.buf.code_action()') - bufmap('x', '', 'lua vim.lsp.buf.range_code_action()') - bufmap('n', 'gl', 'lua vim.diagnostic.open_float()') - bufmap('n', '[d', 'lua vim.diagnostic.goto_prev()') - bufmap('n', ']d', 'lua vim.diagnostic.goto_next()') - end -}) - -require('mason-lspconfig').setup_handlers({ - function(server) - lsp[server].setup({}) - end, - ['tsserver'] = function() - lsp.tsserver.setup({ - settings = { - completions = { - completeFunctionCalls = true - } - } - }) - end, - ['lua_ls'] = function() - lsp.lua_ls.setup({ - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - }, - } - } - }) - end, - ['gopls'] = function() - lsp.gopls.setup({ - settings = { - gopls = { - analyses = { - unusedparams = true, - unusedvariable = true, - shadow = true - }, - staticcheck = true, - }, - } - }) - end, -}) -{{- else }} -local on_attach = function(client) - local bufmap = function(mode, lhs, rhs) - local opts = {buffer = true} - vim.keymap.set(mode, lhs, rhs, opts) - end - require("lsp-format").on_attach(client) - - bufmap('n', 'K', 'lua vim.lsp.buf.hover()') - bufmap('n', 'gd', 'lua vim.lsp.buf.definition()') - bufmap('n', 'gD', 'lua vim.lsp.buf.declaration()') - bufmap('n', 'go', 'lua vim.lsp.buf.type_definition()') - bufmap('n', 'gs', 'lua vim.lsp.buf.signature_help()') - bufmap('n', 'gA', 'Telescope diagnostics') - bufmap('n', 'gr', 'Telescope lsp_references') - bufmap('n', 'gi', 'Telescope lsp_implementations') - bufmap('n', '', 'lua vim.lsp.buf.rename()') - bufmap('n', '', 'lua vim.lsp.buf.format({async = true})') - bufmap('n', '', 'lua vim.lsp.buf.code_action()') - bufmap('x', '', 'lua vim.lsp.buf.range_code_action()') - bufmap('n', 'gl', 'lua vim.diagnostic.open_float()') - bufmap('n', '[d', 'lua vim.diagnostic.goto_prev()') - bufmap('n', ']d', 'lua vim.diagnostic.goto_next()') -end - -lsp.gopls.setup { - settings = { - gopls = { - analyses = { - unusedparams = true, - unusedvariable = true, - shadow = true - }, - staticcheck = true, - }, - }, - on_attach = on_attach -} -lsp.clangd.setup { on_attach = on_attach } -lsp.ltex.setup { - on_attach = on_attach, - filetypes = { "latex", "tex", "bib", "mkd", "gitcommit", "text" }, - } -lsp.svelte.setup { on_attach = on_attach } -lsp.tsserver.setup { on_attach = on_attach } -lsp.lua_ls.setup { - settings = { - Lua = { - diagnostics = { - globals = { 'vim' } - }, - } - }, - on_attach = on_attach -} -{{- end }} diff --git a/dot_config/nvim/after/plugin/telekasten.lua b/dot_config/nvim/after/plugin/telekasten.lua deleted file mode 100644 index b8d1955..0000000 --- a/dot_config/nvim/after/plugin/telekasten.lua +++ /dev/null @@ -1,76 +0,0 @@ -local ok, telekasten = pcall(require, 'telekasten') -local home = vim.fn.expand("~/doc/zettelkasten") - -telekasten.setup { - home = home, - take_over_my_home = true, - auto_set_filetype = true, - dailies = home .. '/' .. 'daily', - weeklies = home .. '/' .. 'weekly', - templates = home .. '/' .. 'templates', - image_subdir = "img", - extension = ".md", - new_note_filename = "uuid-title", - uuid_type = "%Y%m%d%H%M", - uuid_sep = "-", - follow_creates_nonexisting = true, - dailies_create_nonexisting = true, - weeklies_create_nonexisting = true, - journal_auto_open = false, - - -- template for new notes (new_note, follow_link) - -- set to `nil` or do not specify if you do not want a template - template_new_note = home .. '/' .. 'templates/new_note.md', - - -- template for newly created daily notes (goto_today) - -- set to `nil` or do not specify if you do not want a template - template_new_daily = home .. '/' .. 'templates/daily.md', - - -- template for newly created weekly notes (goto_thisweek) - -- set to `nil` or do not specify if you do not want a template - template_new_weekly= home .. '/' .. 'templates/weekly.md', - - -- image link style - -- wiki: ![[image name]] - -- markdown: ![](image_subdir/xxxxx.png) - image_link_style = "wiki", - - -- default sort option: 'filename', 'modified' - sort = "filename", - - -- integrate with calendar-vim - plug_into_calendar = true, - calendar_opts = { - weeknm = 4, - calendar_monday = 1, - calendar_mark = 'left-fit', - }, - - close_after_yanking = false, - insert_after_inserting = true, - tag_notation = "#tag", - command_palette_theme = "dropdown", - show_tags_theme = "ivy", - subdirs_in_links = true, - template_handling = "smart", - new_note_location = "smart", - rename_update_links = true, - follow_url_fallback = nil, -} - -local map = vim.keymap.set -map('n',"zf", "Telekasten find_notes") -map('n',"zd", "Telekasten find_daily_notes") -map('n',"zg", "Telekasten search_notes") -map('n',"zz", "Telekasten follow_link") -map('n',"zn", "Telekasten new_note") -map('n',"zr", "Telekasten rename_note") -map('n',"zc", "Telekasten show_calendar") -map('n',"#", "Telekasten show_tags") - -map('n',"z", "Telekasten panel") - -vim.api.nvim_set_hl(0, "tklink", { fg = "#689d6a", bg = "" }) -vim.api.nvim_set_hl(0, "tkBrackets", { fg = "gray", bg = "gray" }) - - diff --git a/dot_config/nvim/after/plugin/telescope.lua b/dot_config/nvim/after/plugin/telescope.lua deleted file mode 100644 index 8ed8247..0000000 --- a/dot_config/nvim/after/plugin/telescope.lua +++ /dev/null @@ -1,34 +0,0 @@ -local ok, telescope = pcall(require, 'telescope') -if not ok then - return -end - -telescope.setup { - defaults = { - prompt_prefix = '❯ ', - selection_caret = '❯ ', - layout_config = { horizontal = { preview_width = 0.5 } }, - file_ignore_patterns = { 'node_modules/.*' }, - }, - extensions = { - fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "smart_case", -- or "ignore_case" or "respect_case" - } - } -} - -telescope.load_extension('fzf') -telescope.load_extension('file_browser') - -local map = vim.keymap.set -map('n', "", "Telescope file_browser") -map('n', "", "Telescope current_buffer_tags") - -map('n', "e", "Telescope find_files") -map('n', "f", "Telescope live_grep") -map('n', "b", "Telescope buffers") -map('n', "h", "Telescope help_tags") -map('n', "z=", "Telescope spell_suggest") diff --git a/dot_config/nvim/after/plugin/treesitter.lua b/dot_config/nvim/after/plugin/treesitter.lua deleted file mode 100644 index 78b6ff8..0000000 --- a/dot_config/nvim/after/plugin/treesitter.lua +++ /dev/null @@ -1,94 +0,0 @@ -local ok, treesitter = pcall(require, 'nvim-treesitter.configs') -if not ok then - return -end - - -treesitter.setup { - incremental_selection = { - enable = true, - keymaps = { - -- mappings for incremental selection (visual mappings) - init_selection = "gnn", -- maps in normal mode to init the node/scope selection - node_incremental = "grn", -- increment to the upper named parent - scope_incremental = "grc", -- increment to the upper scope (as defined in locals.scm) - node_decremental = "grm" -- decrement to the previous node - } - }, - textobjects = { - -- syntax-aware textobjects - enable = true, - lsp_interop = { - enable = true, - peek_definition_code = { - ["DF"] = "@function.outer", - } - }, - keymaps = { - ["iL"] = { - -- you can define your own textobjects directly here - go = "(function_definition) @function", - }, - -- or you use the queries from supported languages with textobjects.scm - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["aC"] = "@class.outer", - ["iC"] = "@class.inner", - ["ac"] = "@conditional.outer", - ["ic"] = "@conditional.inner", - ["ae"] = "@block.outer", - ["ie"] = "@block.inner", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - ["is"] = "@statement.inner", - ["as"] = "@statement.outer", - ["ad"] = "@comment.outer", - ["am"] = "@call.outer", - ["im"] = "@call.inner" - }, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - ["]]"] = "@function.outer", - ["]c"] = { query = "@class.outer", desc = "Next class start" }, - -- - -- You can use regex matching and/or pass a list in a "query" key to group multiple queires. - ["]o"] = "@loop.*", - -- ["]o"] = { query = { "@loop.inner", "@loop.outer" } } - -- - -- You can pass a query group to use query from `queries//.scm file in your runtime path. - -- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm. - ["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" }, - ["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" }, - }, - goto_next_end = { - ["]["] = "@function.outer", - ["]C"] = "@class.outer", - }, - goto_previous_start = { - ["[["] = "@function.outer", - ["[c"] = "@class.outer", - }, - goto_previous_end = { - ["[]"] = "@function.outer", - ["[C"] = "@class.outer", - } - } - }, - ensure_installed = { - 'javascript', - 'typescript', - 'css', - 'json', - 'c', - 'lua', - 'go' - }, - sync_install = false, - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, -} diff --git a/dot_tmux.conf.tmpl b/dot_tmux.conf.tmpl index 3e8fa84..5ee92ce 100644 --- a/dot_tmux.conf.tmpl +++ b/dot_tmux.conf.tmpl @@ -68,9 +68,8 @@ set -g @catppuccin_status_right_separator_inverse "no" set -g @catppuccin_status_fill "icon" set -g @catppuccin_status_connect_separator "no" -set -g @catppuccin_directory_text "#{pane_current_path}" -set -g @catppuccin_host_text "#{host_short}" set -g @catppuccin_directory_icon " " +set -g @catppuccin_host_text "#{host_short}" set -g @catppuccin_user_icon " " set -g @catppuccin_host_icon " " set -g @catppuccin_date_time_icon " "