summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2020-10-22 06:00:39 -0400
committerKjetil Orbekk <kj@orbekk.com>2020-10-22 06:00:39 -0400
commit354923f337c17127503dcbd209d090d978e0ecff (patch)
treea0f1411832cdee22bb934192765e77404e0f1ffc
parent7cfd18ea5b00c316d23706d5a42b54705105fbf2 (diff)
Add zoxide and fzf configs
-rw-r--r--nix-home-config/my-env.nix2
-rwxr-xr-xsetup.sh1
-rw-r--r--zsh/.zshrc22
3 files changed, 24 insertions, 1 deletions
diff --git a/nix-home-config/my-env.nix b/nix-home-config/my-env.nix
index 62211a6..73ed0e7 100644
--- a/nix-home-config/my-env.nix
+++ b/nix-home-config/my-env.nix
@@ -38,6 +38,8 @@
exa
fzf
zoxide
+ bat
+ most
ripgrep
coreutils
diff --git a/setup.sh b/setup.sh
index 95d2ce8..16d76da 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,6 +8,7 @@ git submodule update --init --recursive
$STOW common
$STOW zsh
+touch $HOME/.zshrc.local
source $HOME/.zshenv
if which xmonad >/dev/null; then
diff --git a/zsh/.zshrc b/zsh/.zshrc
index cb0a9da..f8d6f65 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -30,10 +30,30 @@ prompt pure
alias ls="ls --color"
+(( $+commands[exa] )) && alias ls="exa"
+(( $+commands[bat] )) && alias cat="bat"
+# if (( $+commands[most] )); then
+# alias less="most"
+# export PAGER="most"
+# fi
+if (( $+commands[fzf] )); then
+ if (( $+commands[fzf-share] )); then
+ # Nixos
+ source "$(fzf-share)/completion.zsh"
+ source "$(fzf-share)/key-bindings.zsh"
+ else
+ echo "Configure fzf!"
+ fi
+fi
+
+if (( $+commands[zoxide] )); then
+ eval "$(zoxide init zsh)"
+fi
+
source ~/.zsh/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
if [[ ! -f ~/.zsh/fast-syntax-highlighting/current_theme.zsh ]]; then
fpath+=$HOME/.zsh/fast-syntax-highlighting
fast-theme clean
fi
-[[ -f ~/.zshrc.local ]] && source ~/.zshrc.local
+source ~/.zshrc.local