aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2022-01-13 16:17:11 -0600
committerToby Vincent <tobyv13@gmail.com>2022-01-13 16:17:11 -0600
commit1cd7dffc27b86c8c5cee23b36ced564ce8ca03de (patch)
treedf24b508cdd45eae9ad0838f836c0372327c4e74
parentfea9ad15f04484702084e9dfdf353cb68aedb83a (diff)
feat: updated configs
-rw-r--r--install.conf.yaml23
-rwxr-xr-xinstallers/docker-compose.sh10
-rw-r--r--starship.toml1
-rw-r--r--wt.json14
-rw-r--r--zsh/zshrc14
5 files changed, 58 insertions, 4 deletions
diff --git a/install.conf.yaml b/install.conf.yaml
index 014ce4e..c1d6b98 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -49,6 +49,9 @@
curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/completion.zsh >~/.local/share/zsh/site-functions/_fzf;
curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.bash >~/.bash/fzf-key-bindings.sh;
curl -sL https://raw.githubusercontent.com/junegunn/fzf/master/shell/key-bindings.zsh >~/.zsh/fzf-key-bindings.zsh;
+ curl -sL https://gist.github.com/junegunn/8b572b8d4b5eddd8b85e5f4d40f17236/raw/6e5d520bfc96d6b3e42571a54cb4d1ebc8e2dd84/functions.sh | tee -a ~/.zsh/fzf-key-bindings.zsh ~/.bash/fzf-key-bindings.sh;
+ curl -sL https://gist.github.com/junegunn/8b572b8d4b5eddd8b85e5f4d40f17236/raw/6e5d520bfc96d6b3e42571a54cb4d1ebc8e2dd84/key-binding.bash >>~/.bash/fzf-key-bindings.sh;
+ curl -sL https://gist.github.com/junegunn/8b572b8d4b5eddd8b85e5f4d40f17236/raw/6e5d520bfc96d6b3e42571a54cb4d1ebc8e2dd84/key-binding.zsh >>~/.bash/fzf-key-bindings.sh;
)
- description: Installing bat
@@ -56,6 +59,16 @@
target=$(rustc -Vv | grep host | cut -d' ' -f2 | sed s/armv7/arm/) &&
scripts/install-crate.sh --git sharkdp/bat --target $target --completion-bash --completion-zsh
+ - description: Installing fd
+ command:
+ target=$(rustc -Vv | grep host | cut -d' ' -f2 | sed s/armv7/arm/) &&
+ scripts/install-crate.sh --git sharkdp/fd --target $target --completion-bash --completion-zsh
+
+ - description: Installing ripgrep
+ command:
+ target=$(rustc -Vv | grep host | cut -d' ' -f2 | sed s/gnu/musl/ | sed s/armv7/arm/) &&
+ scripts/install-crate.sh --git BurntSushi/ripgrep --target $target --completion-bash --completion-zsh
+
- description: Installing cheat.sh
command: curl https://cht.sh/:cht.sh >~/.local/bin/cht.sh &&
chmod +x ~/.local/bin/cht.sh && (
@@ -115,6 +128,16 @@
target=~/.zsh/zsh-syntax-highlighting &&
git clone $repo $target ||
git -C $target pull
+
+ - description: Installing zsh-syntax-highlighting
+ command: repo=https://github.com/nvm-sh/nvm.git
+ target=~/.nvm &&
+ git clone $repo $target ||
+ git -C $target pull;
+ ln -sf $target/nvm.sh .bash/nvm.sh &&
+ ln -sf $target/nvm.sh .zsh/nvm.sh &&
+ ln -sf $target/bash_completion ~/.local/share/bash-completion/completions/nvm &&
+ ln -sf $target/bash_completion .zsh/nvm_completion.sh
- link:
diff --git a/installers/docker-compose.sh b/installers/docker-compose.sh
new file mode 100755
index 0000000..ff8e0f6
--- /dev/null
+++ b/installers/docker-compose.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+arch="$(uname -m | sed s/armv7l/armv7/)"
+url="https://github.com/docker/compose/releases/latest/download/docker-compose-linux-${arch}"
+td=$(mktemp -d)
+curl -sL $url -o $td/docker-compose
+install -Dm 755 $td/docker-compose ~/.docker/cli-plugins/docker-compose
+rm -rf $td
diff --git a/starship.toml b/starship.toml
index 16a4efa..1613b82 100644
--- a/starship.toml
+++ b/starship.toml
@@ -32,6 +32,7 @@ read_only = " "
# truncation_length = 2
fish_style_pwd_dir_length = 1
truncate_to_repo = false
+repo_root_style = "bold purple"
[directory.substitutions]
"~/win" = " ~"
diff --git a/wt.json b/wt.json
index fc06031..7e3e54b 100644
--- a/wt.json
+++ b/wt.json
@@ -26,12 +26,10 @@
"command":
{
"action": "newTab"
- },
- "keys": "ctrl+t"
+ }
},
{
- "command": "find",
- "keys": "ctrl+f"
+ "command": "find"
},
{
"command":
@@ -54,6 +52,14 @@
"action": "commandPalette"
},
"keys": "f1"
+ },
+ {
+ "command": "unbound",
+ "keys": "ctrl+f"
+ },
+ {
+ "command": "unbound",
+ "keys": "ctrl+t"
}
],
"alwaysShowNotificationIcon": true,
diff --git a/zsh/zshrc b/zsh/zshrc
index 935eb7c..f784fff 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -26,6 +26,20 @@ fpath=(~/.local/share/zsh/site-functions "${fpath[@]}")
source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
for f in ~/.zsh/*.*sh; do source $f; done
+
+# fzf settings
+export FZF_DEFAULT_COMMAND='fd --type f'
+export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+
+_fzf_compgen_path() {
+ fd --hidden --follow --exclude ".git" . "$1"
+}
+
+_fzf_compgen_dir() {
+ fd --type d --hidden --follow --exclude ".git" . "$1"
+}
+
+# starship prompt
eval "$(starship init zsh)"
function set_win_title() {