diff --git a/dotfiles/.zfunc/run_pg b/dotfiles/.zfunc/run_pg
index 4b3a12f514fc0c1995dd572d66660bb539ba62bc..b6d249685b1449dcf7149c5c4c36889e148f428e 100755
--- a/dotfiles/.zfunc/run_pg
+++ b/dotfiles/.zfunc/run_pg
@@ -1,5 +1,5 @@
 #!/bin/zsh
-zparseopts -E -A opts -user:: -db:: -password:: -port::
+zparseopts -E -A opts -db:: -port::
 
 db_name="${opts[--db]:-db}"
 
@@ -8,7 +8,8 @@ docker run \
     -d \
     -p "${opts[--port]:-5432}:5432" \
     --name="${db_name}-pg" \
-    -e POSTGRES_PASSWORD="${opts[--password]:-password}" \
-    -e POSTGRES_USER="${opts[--user]:-user}" \
+    -v "${db_name}_pg_db:/var/lib/postgresql/data" \
+    -e POSTGRES_PASSWORD="${db_name}" \
+    -e POSTGRES_USER="${db_name}" \
     -e POSTGRES_DB="${db_name}" \
-    postgres
\ No newline at end of file
+    postgres
diff --git a/dotfiles/.zfunc/run_rmq b/dotfiles/.zfunc/run_rmq
new file mode 100755
index 0000000000000000000000000000000000000000..24331ab0e5581c88351e2e82d7a723a89c0d5019
--- /dev/null
+++ b/dotfiles/.zfunc/run_rmq
@@ -0,0 +1,16 @@
+#!/bin/zsh
+zparseopts -E -A opts -user:: -pass:: -port:: --name::
+
+port="${opts[--port]:-5672}"
+
+
+docker run \
+    --rm \
+    -it \
+    -d \
+    -p "${port}:5672" \
+    -p "1${port}:15672" \
+    --env "RABBITMQ_DEFAULT_USER=${opts[--user]:-guest}" \
+    --env "RABBITMQ_DEFAULT_PASS=${opts[--pass]:-guest}" \
+    --env "RABBITMQ_DEFAULT_VHOST=/" \
+    rabbitmq:3.8
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index d23a72ca50ea5df9070fb3d7527a81c4e868f0f3..f737eb5845152964c69c11f3a9f7a13ac73c4d3e 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -69,7 +69,7 @@ COMPLETION_WAITING_DOTS="true"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git git-flow-completion sudo docker autojump)
+plugins=(git git-flow-completion sudo docker autojump minikube)
 
 source $ZSH/oh-my-zsh.sh
 alias ls=lsd
@@ -86,6 +86,8 @@ alias dex="docker exec -it"
 alias dps="docker ps -a"
 alias dpsq="docker ps -aq"
 alias poop='git push origin "$(git branch | grep "\*" | cut -d " " -f2)"'
+alias vommit='git commit -sS'
+alias eat_shit='git pull origin "$(git branch | grep "\*" | cut -d " " -f2)"'
 alias big_poop="git push --all"
 alias cat="bat"
 # User configuration
@@ -137,3 +139,4 @@ 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
+eval "$(starship init zsh)"
diff --git a/dwm/config.def.h b/dwm/config.def.h
index 7e2d6099e8635c5cd5c957dba0f4c5ff6761c818..6ad8057330ff8b40b9888b0ce9f10622dbe89527 100644
--- a/dwm/config.def.h
+++ b/dwm/config.def.h
@@ -10,7 +10,7 @@ static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display
 static const int showsystray        = 1;     /* 0 means no systray */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-static const char *fonts[]          = { "FiraMono Nerd Font:size=10" };
+static const char *fonts[]          = { "FiraCode Nerd Font:size=10" };
 static const char dmenufont[]       = "monospace:size=10";
 static const char color_purple[]    = "#4B4DF5";
 static const char color_black[]     = "#000000";
@@ -64,7 +64,7 @@ static const Layout layouts[] = {
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", color_black, "-nf", color_white, "-sb", color_purple, "-sf", color_black, NULL };
-static const char *termcmd[]  = { "konsole", NULL };
+static const char *termcmd[]  = { "kitty", NULL };
 
 #include "movestack.c"
 static Key keys[] = {
diff --git a/pacman.deps b/pacman.deps
index 78c6a831a44c6fab7d62bbf6a18f5ea6787b9078..f03a02b2a1975a98fba48dfefe6573c9ea1149f6 100644
--- a/pacman.deps
+++ b/pacman.deps
@@ -3,12 +3,13 @@ alsa-utils
 asp
 base-devel
 bat
+community/kitty
+community/starship
 dmenu
 dunst
 firefox
 gnome-keyring 
 gobject-introspection
-konsole
 libldac
 libsecret
 lsd