From 3f8f80dbe459b805c297feaf7d0ccba157bee85a Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Wed, 24 Mar 2021 01:30:25 +0400
Subject: [PATCH] Updated dotfiles and install.sh.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
dotfiles/.zfunc/run_pg | 14 ++++++++++++++
dotfiles/.zfunc/run_redis | 14 ++++++++++++++
dotfiles/.zshenv | 1 +
dotfiles/.zshrc | 2 ++
install.sh | 1 +
5 files changed, 32 insertions(+)
create mode 100755 dotfiles/.zfunc/run_pg
create mode 100755 dotfiles/.zfunc/run_redis
diff --git a/dotfiles/.zfunc/run_pg b/dotfiles/.zfunc/run_pg
new file mode 100755
index 0000000..4b3a12f
--- /dev/null
+++ b/dotfiles/.zfunc/run_pg
@@ -0,0 +1,14 @@
+#!/bin/zsh
+zparseopts -E -A opts -user:: -db:: -password:: -port::
+
+db_name="${opts[--db]:-db}"
+
+docker run \
+ --rm \
+ -d \
+ -p "${opts[--port]:-5432}:5432" \
+ --name="${db_name}-pg" \
+ -e POSTGRES_PASSWORD="${opts[--password]:-password}" \
+ -e POSTGRES_USER="${opts[--user]:-user}" \
+ -e POSTGRES_DB="${db_name}" \
+ postgres
\ No newline at end of file
diff --git a/dotfiles/.zfunc/run_redis b/dotfiles/.zfunc/run_redis
new file mode 100755
index 0000000..f01a0a0
--- /dev/null
+++ b/dotfiles/.zfunc/run_redis
@@ -0,0 +1,14 @@
+#!/bin/zsh
+zparseopts -E -A opts -port:: -name::
+
+dargs=(
+ "--rm"
+ "-d"
+ "-p="${opts[--port]:-6379}:6379""
+)
+
+if [[ -v opts[--name] ]]; then
+ dargs+="--name=${opts[--name]}"
+fi
+
+docker run ${dargs[*]} redis
\ No newline at end of file
diff --git a/dotfiles/.zshenv b/dotfiles/.zshenv
index 73b6e5f..491715b 100644
--- a/dotfiles/.zshenv
+++ b/dotfiles/.zshenv
@@ -3,3 +3,4 @@ PYENV_ROOT=~/.pyenv/
EDITOR=/bin/vim
LC_ALL="$LANG"
path=($path[@] ~/.poetry/bin/ ~/.local/bin/ ~/.pyenv/bin ~/.cargo/bin/)
+fpath=($fpath[@] ~/.zfunc)
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index df64dc9..d23a72c 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -131,7 +131,9 @@ unset __conda_setup
compinit
autoload -U +X bashcompinit && bashcompinit
+autoload -U ~/.zfunc/*
complete -o nospace -C /usr/bin/terraform terraform
+
eval "$(pyenv init -)"
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/install.sh b/install.sh
index 7b1567a..37a364a 100644
--- a/install.sh
+++ b/install.sh
@@ -40,6 +40,7 @@ function copy_dotfiles(){
mkdir -p "$HOME/.local/bin/"
sed "s#{{dwm_dir}}#$(pwd)/dwm#g" ./update_desktop.sh > "$HOME/.local/bin/update_desktop"
chmod 777 "$HOME/.local/bin/update_desktop"
+ cp -vr ./dotfiles/.zfunc "$HOME"
cp -v ./dotfiles/.zshrc "$HOME"
cp -v ./dotfiles/.zshenv "$HOME"
cp -v ./dotfiles/.zshenv "$HOME"
--
GitLab