From 8e97cff50b77a5c381447e675ea448865aa69d74 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Thu, 27 May 2021 21:11:39 +0200
Subject: Bug fix in PATH export, added some of Luke's scripts

---
 .config/zsh/.zshrc        |  7 +++++++
 .config/zsh/aliases.zsh   | 44 --------------------------------------------
 .config/zsh/functions.zsh |  4 ++--
 3 files changed, 9 insertions(+), 46 deletions(-)
 create mode 100644 .config/zsh/.zshrc

(limited to '.config/zsh')

diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..af98c0e
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,7 @@
+# ZSH config
+# Load plugins first
+[ -f $HOME/.config/zsh/plugins.zsh ] && source $HOME/.config/zsh/plugins.zsh
+[ -f $HOME/.config/zsh/exports.zsh ] && source $HOME/.config/zsh/exports.zsh
+[ -f $HOME/.config/zsh/functions.zsh ] && source $HOME/.config/zsh/functions.zsh
+[ -f $HOME/.config/zsh/keybindings.zsh ] && source $HOME/.config/zsh/keybindings.zsh
+[ -f $HOME/.config/zsh/aliases.zsh ] && source $HOME/.config/zsh/aliases.zsh
diff --git a/.config/zsh/aliases.zsh b/.config/zsh/aliases.zsh
index 894d9f2..23db311 100644
--- a/.config/zsh/aliases.zsh
+++ b/.config/zsh/aliases.zsh
@@ -9,47 +9,3 @@ alias vi='nvim'
 alias vim='nvim'
 alias config='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME'
 alias tmux='tmux -f $HOME/.config/tmux/.tmux.conf'
-
-# Rust CLI programs
-if command -v exa > /dev/null; then
-  alias ls='exa -al --color=always --group-directories-first' # my preferred listing
-  alias la='exa -a --color=always --group-directories-first'  # all files and dirs
-  alias ll='exa -l --color=always --group-directories-first'  # long format
-  alias lt='exa -aT --color=always --group-directories-first' # tree listing
-  alias l.='exa -a | egrep "^\."'
-else
-  echo "install exa"
-fi
-
-if command -v bat > /dev/null; then
-  alias cat='bat'
-else
-  echo "install bat"
-fi
-
-if command -v rg > /dev/null; then
-  alias grep='rg'
-else
-  echo "install ripgrep"
-fi
-
-if command -v fd > /dev/null; then
-  alias find='fd'
-else
-  echo "install fd"
-fi
-
-if ! command -v tokei > /dev/null; then
-  echo "install tokei"
-fi
-
-if command -v procs > /dev/null; then
-  alias ps='procs'
-else
-  echo "install procs"
-fi
-
-if ! command -v btm > /dev/null; then
-  echo "install bottom"
-fi
-
diff --git a/.config/zsh/functions.zsh b/.config/zsh/functions.zsh
index 967a2d4..303e91c 100644
--- a/.config/zsh/functions.zsh
+++ b/.config/zsh/functions.zsh
@@ -15,7 +15,7 @@ function zle-keymap-select {
 
 # Prompt called purs
 function zle-line-init zle-keymap-select {
-  PROMPT=`$HOME/purs/target/release/purs prompt -k "$KEYMAP" -r "$?" --venv "${${VIRTUAL_ENV:t}%-*}"`
+  PROMPT=`$HOME/.local/src/purs/target/release/purs prompt -k "$KEYMAP" -r "$?" --venv "${${VIRTUAL_ENV:t}%-*}"`
   zle reset-prompt
 }
 zle -N zle-line-init
@@ -24,6 +24,6 @@ zle -N zle-keymap-select
 autoload -Uz add-zsh-hook
 
 function _prompt_purs_precmd() {
-  /$HOME/purs/target/release/purs precmd
+  /$HOME/.local/src/purs/target/release/purs precmd
 }
 add-zsh-hook precmd _prompt_purs_precmd
-- 
cgit v1.2.3-70-g09d2