Merge branch 'master' of git.nixy.moe:nixy/dotfiles

.gitmodules

@@ -58,3 +58,6 @@
 [submodule "vim/.vim/bundle/vim-gitgutter"]
 	path = vim/.vim/bundle/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter.git
+[submodule "vim/.vim/nvim-bundle/zk-nvim"]
+	path = vim/.vim/nvim-bundle/zk-nvim
+	url = https://github.com/zk-org/zk-nvim.git

bash/.bashrc

@@ -24,10 +24,24 @@ fi
 export PS1="${green}"'\$'"${no_color} "
 export DIRENV_PS1="${red}"'\$'"${no_color} "
 export NIX_SHELL_PS1="${blue}"'λ'"${no_color} "
-if [ "${HOSTNAME}" != "crypt" ] && [ "${HOSTNAME}" != "tomb" ] || [ "${SSH_TTY}" != "" ]; then
+if [ "${HOSTNAME}" != "crypt" ] && [ "${HOSTNAME}" != "tomb" ] || [ "${CONTAINER_ID}" != "" ] || [ "${SSH_TTY}" != "" ]; then
+  if [ "${CONTAINER_ID}" ]; then
+    OLD_HOSTNAME="${HOSTNAME}"
+    HOSTNAME="${CONTAINER_ID}"
+  fi
+
   DIRENV_PS1="${DIRENV_PS1}${blue}${HOSTNAME} ${DIRENV_PS1}"
   NIX_SHELL_PS1="${NIX_SHELL_PS1}${green}${HOSTNAME} ${NIX_SHELL_PS1}"
-  PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
+
+  if [ "${CONTAINER_ID}" ]; then
+    PS1="${PS1}${magenta}${HOSTNAME} ${PS1}"
+  else
+    PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
+  fi
+
+  if [ "${CONTAINER_ID}" ]; then
+    HOSTNAME="${OLD_HOSTNAME}"
+  fi
 fi
 export ORIG_PS1=${PS1}
 

vim/.config/nvim/init.vim

@@ -18,7 +18,7 @@ end
 require('user.lspconfig')
 require('user.indentblanklines')
 require('user.luasnip')
-
+require('user.zk')
 EOF
 
 nnoremap <leader>ib <cmd>IBLToggle<cr>

vim/.config/nvim/lua/user/zk.lua

@@ -0,0 +1,4 @@
+-- Configure the zk neovim plugin
+require("zk").setup({
+  picker = "fzf"
+})

vim/.vim/nvim-bundle/zk-nvim

@@ -0,0 +1 @@
+Subproject commit 10089c398df925b8db51fd659501d2cb044003b9